May 2004 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main mencoder.c, 1.247, 1.248 cfg-mencoder.h, 1.86, 1.87
by syncmail＠mplayerhq.hu 30 Aug '04

30 Aug '04

CVS change done by Richard Felker CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv28706 Modified Files: mencoder.c cfg-mencoder.h Log Message: more lame options Index: mencoder.c =================================================================== RCS file: /cvsroot/mplayer/main/mencoder.c,v retrieving revision 1.247 retrieving revision 1.248 diff -u -r1.247 -r1.248 --- mencoder.c 30 Apr 2004 20:05:54 -0000 1.247 +++ mencoder.c 19 May 2004 04:33:00 -0000 1.248 @@ -224,6 +224,9 @@ float lame_param_scale=-1; // unset int lame_param_lowpassfreq = 0; //auto int lame_param_highpassfreq = 0; //auto +int lame_param_free_format = 0; //disabled +int lame_param_br_min = 0; //not specified +int lame_param_br_max = 0; //not specified #if HAVE_MP3LAME >= 392 int lame_param_fast=0; // unset @@ -1007,10 +1010,13 @@ lame_set_num_channels(lame,mux_a->wf->nChannels); lame_set_out_samplerate(lame,mux_a->wf->nSamplesPerSec); lame_set_quality(lame,lame_param_algqual); // 0 = best q +if(lame_param_free_format) lame_set_free_format(lame,1); if(lame_param_vbr){ // VBR: lame_set_VBR(lame,lame_param_vbr); // vbr mode lame_set_VBR_q(lame,lame_param_quality); // 0 = best vbr q 5=~128k if(lame_param_br>0) lame_set_VBR_mean_bitrate_kbps(lame,lame_param_br); + if(lame_param_br_min>0) lame_set_VBR_min_bitrate_kbps(lame,lame_param_br_min); + if(lame_param_br_max>0) lame_set_VBR_max_bitrate_kbps(lame,lame_param_br_max); } else { // CBR: if(lame_param_br>0) lame_set_brate(lame,lame_param_br); } Index: cfg-mencoder.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- cfg-mencoder.h 3 May 2004 13:19:04 -0000 1.86 +++ cfg-mencoder.h 19 May 2004 04:33:00 -0000 1.87 @@ -35,6 +35,10 @@ {"vol", &lame_param_scale, CONF_TYPE_FLOAT, CONF_RANGE, 0, 10, NULL}, {"lowpassfreq",&lame_param_lowpassfreq, CONF_TYPE_INT, CONF_RANGE, -1, 48000,0}, {"highpassfreq",&lame_param_highpassfreq, CONF_TYPE_INT, CONF_RANGE, -1, 48000,0}, + {"nofree", &lame_param_free_format, CONF_TYPE_FLAG, 0, 0, 0, NULL}, + {"free", &lame_param_free_format, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"br_min", &lame_param_br_min, CONF_TYPE_INT, CONF_RANGE, 0, 1024, NULL}, + {"br_max", &lame_param_br_max, CONF_TYPE_INT, CONF_RANGE, 0, 1024, NULL}, #if HAVE_MP3LAME >= 392 {"fast", &lame_param_fast, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"preset", &lame_param_preset, CONF_TYPE_STRING, 0, 0, 0, NULL},

2 2

CVS: main cfg-mencoder.h,1.82,1.83
by syncmail＠mplayerhq.hu 30 Aug '04

30 Aug '04

CVS change done by Richard Felker CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv27829 Modified Files: cfg-mencoder.h Log Message: oops, forgot this with the softskip patch Index: cfg-mencoder.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- cfg-mencoder.h 24 Mar 2004 15:16:36 -0000 1.82 +++ cfg-mencoder.h 30 Apr 2004 10:07:52 -0000 1.83 @@ -207,6 +207,9 @@ {"autoexpand", &auto_expand, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"noautoexpand", &auto_expand, CONF_TYPE_FLAG, 0, 1, 0, NULL}, + {"encodedups", &encode_duplicates, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"noencodedups", &encode_duplicates, CONF_TYPE_FLAG, 0, 1, 0, NULL}, + // info header strings {"info", info_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},

2 2

[Mplayer-cvslog] CVS: main/libmpdemux cddb.c, 1.14, 1.15 demux_avi.c, 1.58, 1.59 network.c, 1.89, 1.90 network.h, 1.18, 1.19 stream.c, 1.70, 1.71 stream.h, 1.66, 1.67
by syncmail＠mplayerhq.hu 04 Aug '04

04 Aug '04

CVS change done by Attila Kinali CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv2821/libmpdemux Modified Files: cddb.c demux_avi.c network.c network.h stream.c stream.h Log Message: enable seeking in http streams patch by Valentine Zaretsky <valik+mplayerdev(a)email.dp.ua> Index: cddb.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/cddb.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- cddb.c 17 May 2003 12:24:01 -0000 1.14 +++ cddb.c 17 Feb 2004 12:30:44 -0000 1.15 @@ -204,7 +204,7 @@ return -1; } - fd = http_send_request(url); + fd = http_send_request(url,0); if( fd<0 ) { printf("failed to send the http request\n"); return -1; Index: demux_avi.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_avi.c,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- demux_avi.c 22 Oct 2003 19:01:37 -0000 1.58 +++ demux_avi.c 17 Feb 2004 12:30:44 -0000 1.59 @@ -214,7 +214,7 @@ } pos = priv->idx_offset + (unsigned long)idx->dwChunkOffset; - if((pos<demux->movi_start || pos>=demux->movi_end) && (demux->movi_end>demux->movi_start) && (demux->stream->type!=STREAMTYPE_STREAM)){ + if((pos<demux->movi_start || pos>=demux->movi_end) && (demux->movi_end>demux->movi_start) && (demux->stream->flags & STREAM_SEEK)){ mp_msg(MSGT_DEMUX,MSGL_V,"ChunkOffset out of range! idx=0x%X \n",pos); continue; } @@ -246,7 +246,7 @@ if(!(idx->dwFlags&AVIIF_KEYFRAME)) flags=0; } else { demux->filepos=stream_tell(demux->stream); - if(demux->filepos>=demux->movi_end && demux->movi_end>demux->movi_start && (demux->stream->type!=STREAMTYPE_STREAM)){ + if(demux->filepos>=demux->movi_end && demux->movi_end>demux->movi_start && (demux->stream->flags & STREAM_SEEK)){ demux->stream->eof=1; return 0; } @@ -449,7 +449,7 @@ demuxer->priv=(void*)priv; //---- AVI header: - read_avi_header(demuxer,(demuxer->stream->type!=STREAMTYPE_STREAM)?index_mode:-2); + read_avi_header(demuxer,(demuxer->stream->flags & STREAM_SEEK)?index_mode:-2); if(demuxer->audio->id>=0 && !demuxer->a_streams[demuxer->audio->id]){ mp_msg(MSGT_DEMUX,MSGL_WARN,"AVI: invalid audio stream ID: %d - ignoring (nosound)\n",demuxer->audio->id); Index: network.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/network.c,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- network.c 8 Dec 2003 13:25:32 -0000 1.89 +++ network.c 17 Feb 2004 12:30:44 -0000 1.90 @@ -428,7 +428,7 @@ } int -http_send_request( URL_t *url ) { +http_send_request( URL_t *url, off_t pos ) { HTTP_header_t *http_hdr; URL_t *server_url; char str[256]; @@ -455,6 +455,12 @@ } else http_set_field( http_hdr, "User-Agent: MPlayer/"VERSION); + + if(pos>0) { + // Extend http_send_request with possibility to do partial content retrieval + snprintf(str, 256, "Range: bytes=%d-", pos); + http_set_field(http_hdr, str); + } if (network_cookies_enabled) cookies_set( http_hdr, server_url->hostname, server_url->url ); @@ -572,6 +578,50 @@ return 0; } +int +http_seek( stream_t *stream, off_t pos ) { + HTTP_header_t *http_hdr = NULL; + int fd; + if( stream==NULL ) return 0; + + if( stream->fd>0 ) closesocket(stream->fd); // need to reconnect to seek in http-stream + fd = http_send_request( stream->streaming_ctrl->url, pos ); + if( fd<0 ) return 0; + + http_hdr = http_read_response( fd ); + + if( http_hdr==NULL ) return 0; + + switch( http_hdr->status_code ) { + case 200: + case 206: // OK + mp_msg(MSGT_NETWORK,MSGL_V,"Content-Type: [%s]\n", http_get_field(http_hdr, "Content-Type") ); + mp_msg(MSGT_NETWORK,MSGL_V,"Content-Length: [%s]\n", http_get_field(http_hdr, "Content-Length") ); + if( http_hdr->body_size>0 ) { + if( streaming_bufferize( stream->streaming_ctrl, http_hdr->body, http_hdr->body_size )<0 ) { + http_free( http_hdr ); + return -1; + } + } + break; + default: + mp_msg(MSGT_NETWORK,MSGL_ERR,"Server return %d: %s\n", http_hdr->status_code, http_hdr->reason_phrase ); + close( fd ); + fd = -1; + } + stream->fd = fd; + + if( http_hdr ) { + http_free( http_hdr ); + stream->streaming_ctrl->data = NULL; + } + + stream->pos=pos; + + return 1; +} + + // By using the protocol, the extension of the file or the content-type // we might be able to guess the streaming type. int @@ -581,6 +631,7 @@ int fd=-1; int redirect; int auth_retry=0; + int seekable=0; char *extension; char *content_type; char *next_url; @@ -683,7 +734,7 @@ // HTTP based protocol if( !strcasecmp(url->protocol, "http") || !strcasecmp(url->protocol, "http_proxy") ) { - fd = http_send_request( url ); + fd = http_send_request( url, 0 ); if( fd<0 ) { return -1; } @@ -701,7 +752,10 @@ } streaming_ctrl->data = (void*)http_hdr; - + + // Check if we can make partial content requests and thus seek in http-streams + seekable=(http_hdr!=NULL && http_hdr->status_code==200 && strncmp(http_get_field(http_hdr,"Accept-Ranges"),"bytes",5)==0); + // Check if the response is an ICY status_code reason_phrase if( !strcasecmp(http_hdr->protocol, "ICY") ) { switch( http_hdr->status_code ) { @@ -756,13 +810,13 @@ for( i=0 ; i<(sizeof(mime_type_table)/sizeof(mime_type_table[0])) ; i++ ) { if( !strcasecmp( content_type, mime_type_table[i].mime_type ) ) { *file_format = mime_type_table[i].demuxer_type; - return 0; + return seekable; // for streaming_start } } } // Not found in the mime type table, don't fail, // we should try raw HTTP - return 0; + return seekable; // for streaming_start // Redirect case 301: // Permanently case 302: // Temporarily @@ -857,7 +911,7 @@ fd = stream->fd; if( fd<0 ) { - fd = http_send_request( stream->streaming_ctrl->url ); + fd = http_send_request( stream->streaming_ctrl->url, 0 ); if( fd<0 ) return -1; http_hdr = http_read_response( fd ); if( http_hdr==NULL ) return -1; @@ -1121,6 +1175,11 @@ if( ret<0 ) { return -1; } + if( ret==1 ) { + stream->flags |= STREAM_SEEK; + stream->seek = http_seek; + } + ret = -1; // Get the bandwidth available Index: network.h =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/network.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- network.h 15 Aug 2003 19:13:23 -0000 1.18 +++ network.h 17 Feb 2004 12:30:45 -0000 1.19 @@ -53,7 +53,7 @@ int connect2Server(char *host, int port,int verb); -int http_send_request(URL_t *url); +int http_send_request(URL_t *url, off_t pos); HTTP_header_t *http_read_response(int fd); int http_authenticate(HTTP_header_t *http_hdr, URL_t *url, int *auth_retry); Index: stream.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/stream.c,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- stream.c 31 Aug 2003 18:51:05 -0000 1.70 +++ stream.c 17 Feb 2004 12:30:45 -0000 1.71 @@ -314,6 +314,14 @@ // A function call that return -1 can tell that the protocol // doesn't support seeking. #ifdef MPLAYER_NETWORK + if(s->seek) { // new stream seek is much cleaner than streaming_ctrl one + if(!s->seek(s,newpos)) { + mp_msg(MSGT_STREAM,MSGL_ERR, "Seek failed\n"); + return 1; + } + break; + } + if( s->streaming_ctrl!=NULL && s->streaming_ctrl->streaming_seek ) { if( s->streaming_ctrl->streaming_seek( s->fd, pos, s->streaming_ctrl )<0 ) { mp_msg(MSGT_STREAM,MSGL_INFO,"Stream not seekable!\n"); Index: stream.h =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/stream.h,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- stream.h 19 Jan 2004 19:16:10 -0000 1.66 +++ stream.h 17 Feb 2004 12:30:45 -0000 1.67 @@ -229,7 +229,7 @@ } inline static int stream_skip(stream_t *s,off_t len){ - if(len<0 || (len>2*STREAM_BUFFER_SIZE && s->type!=STREAMTYPE_STREAM)){ + if(len<0 || (len>2*STREAM_BUFFER_SIZE && (s->flags & STREAM_SEEK))) { // negative or big skip! return stream_seek(s,stream_tell(s)+len); }

4 3

CVS: main/libmpdemux demux_mkv.c, 1.14, 1.15 demux_ogg.c, 1.51, 1.52
by syncmail＠mplayerhq.hu 01 Aug '04

01 Aug '04

CVS change done by Jindrich Makovicka CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv31330/libmpdemux Modified Files: demux_mkv.c demux_ogg.c Log Message: ENCA support (http://trific.ath.cx/software/enca/) Index: demux_mkv.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- demux_mkv.c 26 Apr 2004 09:22:17 -0000 1.14 +++ demux_mkv.c 8 May 2004 17:52:25 -0000 1.15 @@ -1832,7 +1832,7 @@ char *str; #ifdef USE_ICONV - subcp_open(); + subcp_open_noenca(); #endif stream_seek(s, s->start_pos); Index: demux_ogg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ogg.c,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- demux_ogg.c 7 May 2004 08:31:39 -0000 1.51 +++ demux_ogg.c 8 May 2004 17:52:25 -0000 1.52 @@ -664,7 +664,7 @@ sh_video_t* sh_v; #ifdef USE_ICONV - subcp_open(); + subcp_open_noenca(); #endif clear_sub = -1;

6 5

CVS: main ChangeLog,1.93,1.94
by syncmail＠mplayerhq.hu 20 Jul '04

20 Jul '04

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv6795 Modified Files: ChangeLog Log Message: Some release dates added, consistent date format. Index: ChangeLog =================================================================== RCS file: /cvsroot/mplayer/main/ChangeLog,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- ChangeLog 13 Apr 2004 00:12:03 -0000 1.93 +++ ChangeLog 13 Apr 2004 02:24:39 -0000 1.94 @@ -103,13 +103,13 @@ * Swedish and Polish yes/no options in config files * support binding F11 and F12 keys - pre3try2: security fix release + pre3try2: security fix release Mar 3, 2004 Security: * HTTP parser remote heap overflow vulnerability fixed - pre3: "The Real Counter" + pre3: "The Real Counter" Dec 9, 2003 DOCS: * all MPlayer and MEncoder options documented @@ -263,7 +263,7 @@ * rawyuv (i420) 'encoder' - pre2: + pre2: Oct 5, 2003 Security: * remotely exploitable buffer overflow in the asf streaming code fixed @@ -353,7 +353,7 @@ * alignment and smart line splitting option on subtitles - pre1: "Development" on the beach + pre1: "Development" on the beach Sept 1, 2003 NOTE: the MPlayer 'main' branch was forked at the time of 0.90-rc4, so 0.90-rc5 (and later 0.90 releases) changes are independent! (it also means that there are main-only and 0_90-only changes) @@ -495,7 +495,7 @@ mplayer (0.90) - rc4: "FlameCounter" + rc4: "FlameCounter" Feb 9, 2003 DOCS: * some clarification and updates in the English DOCS @@ -551,7 +551,7 @@ * -fstype option: override priority/layer of the fullscreen switch methods * libavcodec: some B-frames related encoding failures/crashes fixed - rc3: "BugfixCounter" + rc3: "BugfixCounter" Jan 19, 2003 DOCS: * English man page & HTML docs updates @@ -638,7 +638,7 @@ * fixed 'single pixel bug' * fixed some possible crashes - rc2: + rc2: Dec 24, 2002 General: * DOCS/tech/encoding-tips.txt and tech/directfb.txt * Some DOCS corrections/updates/sync/html fixes @@ -670,7 +670,7 @@ * XMMS Input plugins (demuxer & codec) support * Fixed a bug in MMX optimized mp3lib (triggered by OpenBSD) - rc1: "CodecCounter" + rc1: "CodecCounter" Dec 7, 2002 Docs: * new French translation * Irix section @@ -708,7 +708,7 @@ * More compiler warning fixes * Altivec (G4) support - pre10: "BirthdayCounter" + pre10: "BirthdayCounter" Nov 11, 2002 Docs: * dvd auth, vcd sections extended (DOCS/cd-dvd.html) * unified *BSD sections, extended cygwin @@ -764,7 +764,7 @@ * -vop sab * -vop smartblur - pre9: + pre9: Oct 24, 2002 Docs: * man page rewritten again :))) * man page updated to latest options, including lavc options @@ -839,7 +839,7 @@ * complete MPEG4 GMC decoding support - pre8: + pre8: Sep 18, 2002 Docs: * manpage has been rewritten, now has better indenting, and convertable to html * AUTHORS, MAINTAINERS converted back to separate text files, and updated. @@ -870,7 +870,7 @@ * libavcodec: aspect ratio encoding support (mpeg4, mjpeg, h263?) * win32 DLL loader merged/synced with avifile CVS - pre7: + pre7: Sep 5, 2002 Cleanup: * libvo2, old input code & sis_vid removed, other code cleanups * tons of compiler warning fixes, some configure/makefile improvements @@ -897,7 +897,7 @@ * gui preferences menu extended, runtime subtitle loading support * gui: drag'n'drop support - pre6: + pre6: Aug 6, 2002 * WMV1, Sorenson v1 (SVQ1) and RealPlayer 8.0 (RV20/30, Cook) codecs support * libavcodec M1 direct rendering * IPB support with Xv @@ -924,7 +924,7 @@ * html DOCS updates * manpage & README restructured (again :)) - pre5: + pre5: Jun 8, 2002 Documentation: * lot of fixes, updates, cleanups * new README containing quick install guide @@ -962,7 +962,7 @@ * gcc 3.1 support * various portability fixes (cygwin, darwin, 64bit sparc/alpha) - pre4: + pre4: May 13, 2002 * X11 fullscreen toggle fixes with various windowmanagers, multifile playback * DXR2 support * Output into animated GIF @@ -971,7 +971,7 @@ * manpage rewrite * lot of other fixes - pre3: + pre3: May 3, 2002 * 3DNow! optimization of AC3 4ch downmix fixed, optims re-enabled * DGA error/fail after 1 second of playing fixed * big A-V desync for some AVI files fixed @@ -983,7 +983,7 @@ * buggy v4l audio grabbing disabled, we cannot fix, but patches are welcomed! * various mjpeg improvements in libavcodec - pre2: + pre2: Apr 30, 2002 * hwac3 fixes (try AFMT_AC3 first), bigendian fixes for PCM audio * 2-pass encoding with libavcodec (-lavcopts vpass=x), B frames support * faster .ogg seeking (use -forceidx for slow but accurate one) @@ -1003,7 +1003,7 @@ * fixed gtk gui crash with --disable-mencoder * no more black vobsub subtitles :) - pre1: + pre1: Apr 21, 2002 * 100% GPL - yeah, so what? * runtime CPU detection code - any x86 MPlayer binary can run on "any" other x86 CPU * video filter layer - with numerous plugins (crop, expand, etc, see the documentation) @@ -1020,7 +1020,7 @@ * and of course, faster than ever... :) -mplayer (0.60) "The RTFMCounter" +mplayer (0.60) "The RTFMCounter": Jan 2, 2002 release: * minor bugfixes for realmedia/nuppelvideo demuxers @@ -1057,7 +1057,7 @@ * hardware MPEG decoder support (DXR3, Siemens DVB) -mplayer (0.50) "The Faszom(C)ounter" +mplayer (0.50) "The Faszom(C)ounter": Oct 8, 2001 release: * documentation updates @@ -1072,7 +1072,7 @@ * dynamic setting of DivX postprocessing quality (-autoq) * updated FAQ section on the homepage -mplayer (0.18) "The BugCounter" +mplayer (0.18) "The BugCounter": Jul 9, 2001 pre 1-5: * mp3lib even more optimized to 3DNow!/MMX @@ -1090,11 +1090,11 @@ * A-V sync for AVI files fixed (both -bps and -nobps) -mplayer v0.17a "IdegCounter++" : Apr 27 2001 +mplayer v0.17a "IdegCounter++": Apr 27 2001 - first 0.17 release failed - buggy files outdated docs etc :( it's (hopefully) fixed now. -mplayer v0.17 "IdegCounter" : Apr 27 2001 +mplayer v0.17 "IdegCounter": Apr 27, 2001 * DVD playing (libcss) * OSD and subtitles with antialiased fonts * new Win32 codecs (WMV1,AP42,ASV2 etc) @@ -1131,7 +1131,7 @@ - new Makefile/dependency system - added check_events() to libvo, x11 stuff moved to x11_common.c -mplayer v0.11-pre24: Feb 19 2001 +mplayer v0.11-pre24: Feb 19, 2001 small fixes again :( - DOCS/LIRC changed: users *must* enable lirc support manually, it is not autodetected yet. (./configure --enable-lirc) @@ -1139,7 +1139,7 @@ - added manpage by Gabucino - manpage -vo fixes by A'rpi -mplayer v0.11-pre23: Feb 18 2001 +mplayer v0.11-pre23: Feb 18, 2001 lirc support, text updates, mailinglists - added "-ni" option to force usage of the non-interleaved AVI parser - DOCS/* updated by Gabucino @@ -1150,7 +1150,7 @@ TODO: ./configure should detect LIRC installed and better Makefile handling - added AVI_NINI parser for broken (no index) non-interleaved files -mplayer v0.11-pre22: Feb 16 2001 +mplayer v0.11-pre22: Feb 16, 2001 last fixes, release is coming soon! - non-interleaved avi EOF bug fixed [thanks to DC-1 for help] - "You" strings in Makefile after make dep bug fixed... [thx to DC-1] @@ -1161,7 +1161,7 @@ fork() -> 0.12pre1 -mplayer v0.11-pre21: Feb 12 2001 +mplayer v0.11-pre21: Feb 12, 2001 mpeg1 pp, stereo fix - "Skip chunk xxxx" messages moved from -v to -v -v -v debug level... [thanks to Christoph H. Lampert] @@ -1175,7 +1175,7 @@ - draw_slice in syncfb finished for G400 cards (plays mpeg 1/2, opendivx) (de-interlacing has been disabled, because it's buggy now) -mplayer v0.11-pre20: Feb 11 2001 +mplayer v0.11-pre20: Feb 11, 2001 NI-AVI support, small fixes & patches... - asf parser: flag 0x40 (explicit packet size) implemented [Marvin] - new option to select DSP device: -dsp (default: /dev/dsp) [Pontscho] @@ -1185,7 +1185,7 @@ - added non-interleaved .AVI parser - added non-interleaved .AVI detection (if a_pos-v_pos distance > 1MB) -mplayer v0.11-pre19: Feb 9 2001 +mplayer v0.11-pre19: Feb 9, 2001 small fixes... - vo_xmga.c: G200 draw_slice fixed xmga + mga: common part (draw_frame & draw_slice) moved to mga_common.c @@ -1200,7 +1200,7 @@ -> that weird_al_yankovic asf is not so weird now :) - AUTHORS file changed -mplayer v0.11-pre18: Feb 7 2001 +mplayer v0.11-pre18: Feb 7, 2001 patch release :) - skip broken .asf fragments (for better seeking) - seeking code cleanup in sources (now it's in a switch(){}) @@ -1216,7 +1216,7 @@ - libvo: sdl driver now closes SDL at QUIT... - small english fixes (docs & messages) [Balazs Tibor] -mplayer v0.11-pre17: Feb 4 2001 +mplayer v0.11-pre17: Feb 4, 2001 fixes - asf "missing video stream" fixed (stream id & 0x7F) [Christoph H. Lampert] - added GL-test directory, it contains source and compiler script of a @@ -1227,7 +1227,7 @@ - benchmarking in gltest.c: calculate fps and process times - .asf seeking v0.01-pre0.1 :) -mplayer v0.11-pre16: Feb 4 2001 +mplayer v0.11-pre16: Feb 4, 2001 ACM fixed - Win32/ACM audio codec fixed (most important for asf with divx audio): There was an output buffer size problem with the Win32/ACM audio codec @@ -1239,13 +1239,13 @@ (adds --with-win32libdir and fixes --with-x11libdir) - ./configure fixed, now it defaults to /usr/lib/win32 if detection failed -mplayer v0.11-pre15: Feb 2 2001 +mplayer v0.11-pre15: Feb 2, 2001 asf sync fixed - asf parser: now supports other than 0x5D segments [Dirk Vornheder] - new asf PTS reading: sync works now, including fps... (-fps no longer required!) [thanks again to Eugene Kuznetsov for docs!] -mplayer v0.11-pre14: Feb 1 2001 +mplayer v0.11-pre14: Feb 1, 2001 small fixes, asf sync v0.1 :) - version number incremented :))) - libvo / Xv driver swapped Red-Blue fixed @@ -1260,7 +1260,7 @@ we never will have working .asf player... - asf fragment offset checks disabled for grouping... -mplayer v0.11-pre13: Jan 31 2001 +mplayer v0.11-pre13: Jan 31, 2001 libvo changes, mpeg bitrate, vcd fix, asf grouping - libvo: draw_slice() interface changed, now it has src stride[3] and destination rect dimension (w,h,x,y) @@ -1275,7 +1275,7 @@ [bugreport: Kang Sun] - asf_parser: grouping implemented! [test file provided by Gabucino :))] -mplayer v0.11-pre12: Jan 30 2001 +mplayer v0.11-pre12: Jan 30, 2001 ./configure fixes, improved odivx-encoding, streaming fixes - ./configure: using /tmp/main$$.c instead /tmp.main.c, and remove file after tests [SaPe] @@ -1294,7 +1294,7 @@ - compile-time option to disable using soundcard driver's select() (requires for some people with buggy/pre-alpha/etc sound driver...) -mplayer v0.11-pre11: Jan 29 2001 +mplayer v0.11-pre11: Jan 29, 2001 streaming fixes, asf support pre, indeo5 fix - asf/asfinfo.c improved: now it dumps streams to files - need testing! (it's ready to be converted to asf demuxer and intergated into MPlayer) @@ -1312,7 +1312,7 @@ - improved signal handling: module name is now printed. audio_resync added. - RGB opendivx encoding implemented, now AVI->opendivx is possible. -mplayer v0.11-pre10: Jan 22 2001 +mplayer v0.11-pre10: Jan 22, 2001 OpenDivX encoding, streaming fixes, avi seek fixes - new libvo driver: odivx (OpenDivX File Writer) - AVI file writting support, new option: -encode filename @@ -1335,14 +1335,14 @@ ** Now we are ready with planned features & urgent fixes, ** ** it's time to final testing and then the 0.11 release!! ** -mplayer v0.11-pre9: Jan 18 2001 +mplayer v0.11-pre9: Jan 18, 2001 OpenDivX fixes,speedup - solved OpenDivX width problem (stride=width+(Quality?0:64)) now -divxq 0 works, and 0 is the default - libvo call moved out from my_convert_yuv() so it can be measured (cpu %) - IDCT code ported from libmpeg2 -> much faster OpenDivX decoding -mplayer v0.11-pre8: Jan 18 2001 +mplayer v0.11-pre8: Jan 18, 2001 SDL fixes, OpenDivX support - added -I/usr/X11R6/include to libvo CFLAGS - (removed later: applied libvo SDL driver fixes by Jeffrey Boser) @@ -1350,7 +1350,7 @@ (I need testfiles, I have just only one) use -divxq option to adjust quality (1..29 works), 1=default -mplayer v0.11-pre7: Jan 14 2001 +mplayer v0.11-pre7: Jan 14, 2001 SDL support - ported SDL driver from mpeg2dec/libvo (currect CVS) (it's slower than internal X11 driver, but supports software scaling!) @@ -1360,14 +1360,14 @@ - 'q' (Quit) disabled in SDL fullscreen mode (because it's impossible to restore screen before exiting so it gets unusable state now) -mplayer v0.11-pre6: Jan 14 2001 +mplayer v0.11-pre6: Jan 14, 2001 audio fix - fixed video_out_xv.c compiling problems [bugreport: Kalle Mellerup] - modified audio playing: always keep buffer (both internal and card's) filled using select() -> -alsa audio delays should be fixed. - updated DOCS/AUTHORS and DOCS/README -mplayer v0.11-pre5: Jan 12 2001 +mplayer v0.11-pre5: Jan 12, 2001 xmmp audio support, applied Pontscho's libvo patch - xmmp audio driver support by Arthur Kleer - new video_out driver by Pontscho: xmga (Matrox G200/G400 only!) @@ -1377,7 +1377,7 @@ - added keyboard event support in X11 windows [Pontscho] (using mplayer_[put|get]_key() in codecctrl.c) -mplayer v0.11-pre4: Jan 6 2001 +mplayer v0.11-pre4: Jan 6, 2001 x11 driver fixes, 15/16bpp support - version in version.h fixed :))) [Pontscho] - inttypes.h moved to DOCS/ (copy back to the root if you need it) @@ -1398,7 +1398,7 @@ 32bpp MMX/C convert memcpy / C conv. => now all the movie types are viewable using the -o x11 driver! -mplayer v0.11-pre3: Jan 5 2001 +mplayer v0.11-pre3: Jan 5, 2001 mpeg fixes, fullscreen support - vertical.mpg serious libvo (x11,gl) segfaults fixed: yuv2rgb_mmx requires one more lines that vertical image size... @@ -1409,7 +1409,7 @@ - simple inttypes.h included for libc5 (and glibc2.0 too?) users - homepage updates (links changed ftp->http) -mplayer v0.11-pre2: Jan 4 2001 +mplayer v0.11-pre2: Jan 4, 2001 better user messages, mp3 codec selection, demuxer changes - w32codec.zip restored at the FTP site (somehow it damaged...) - added version.h, and used its content everywhere @@ -1432,7 +1432,7 @@ Now only the Desperado-trailer has 1.0 sec delay after seeking. - fixed AVI sync in -bps mode too! :) (perfect except that Desperado avi) -mplayer v0.10: Jan 1 2001 "The new year" release! +mplayer v0.10: Jan 1, 2001 "The new year" release! - testing - docs changed - it's time to release and remove the old buggy 0.09 version... @@ -1444,7 +1444,7 @@ - libvo: default driver order changed, because some users with software-only opengl though that this 'slow' player can only play at 1-3fps :) -mplayer v0.10-pre7: Dec 31 2000 +mplayer v0.10-pre7: Dec 31, 2000 libmpeg2 interface changes, display size/area changes, AVI fixes - libmpeg2/decode.c modified: - removed unused OMS and mpeg2dec stuff @@ -1488,7 +1488,7 @@ codec supports it (only internal codecs and ACM/mp3 allows it). - AVI: audio delay correction if can't seek inside the chunk -mplayer v0.10-pre6: Dec 24 2000 "Xmas edition" +mplayer v0.10-pre6: Dec 24, 2000 "Xmas edition" mpeg signal & EOF fixes - ./configure: k6_mtrr (2.4.test11+) added [Pontscho] - `term destroys if mplayer (mpg) called from mc.ext` bug fixed: @@ -1500,7 +1500,7 @@ - audio detection changed: using afm=4 (Win32/ACM) for MP3 audio (AVI files) (you MUST have l3codeca.acm at /usr/lib/win32, or you have to use '-afm 1') -mplayer v0.10-pre5: Dec 22 2000 +mplayer v0.10-pre5: Dec 22, 2000 flipping fixed - AVI image flipping reworked: - new flag: avi_header.flipped, TRUE if upside-down @@ -1515,7 +1515,7 @@ [thanks to David Whysong] - libmpeg2 upgraded -mplayer v0.10-pre3: Dec 10 2000 +mplayer v0.10-pre3: Dec 10, 2000 test release, verbose mode, new docs - new option: -v = increment verbose level (debug printf's changed to verbose level-dependent) @@ -1528,7 +1528,7 @@ - README rewritten, added Troubleshooting and Bugreports sections - TVout directory added (only the scripts) -mplayer v0.10-pre2: Dec 8 2000 +mplayer v0.10-pre2: Dec 8, 2000 bugfix test release, bps-sync enabled - avi: supporting both 0-based and movi-based index types (autodetect) - avi: tested with VBR audio: plays well with -mc 0 option, seek doesn't @@ -1538,7 +1538,7 @@ - ./configire: 3rd name ('kni') of the P3 added. Where is the compatibility? - useless '\' removed from libac3/Makefile [Otvos Ferenc] -mplayer v0.10-pre1: Dec 5 2000 +mplayer v0.10-pre1: Dec 5, 2000 test release, players merged!!! - avip and mpegp has been merged to a single binary called 'mplayer' - file type detection (AVI/MPEG-PS/MPEG-ES/Other) @@ -1556,12 +1556,12 @@ [default values are still configurable at compile-time, see config.h] - TV project (not finished) codebase added (see tvision.c, or: make tvision) -mplayer v0.09: Dec 5 2000 +mplayer v0.09: Dec 5, 2000 Beta release [same as 0.09-pre3] - version changed in the files - docs updated -mplayer v0.09-pre3: Dec 3 2000 +mplayer v0.09-pre3: Dec 3, 2000 bugfix test-release, X11 support testing - fixed the if [ -z $pparam ] bug in ./configure [Christian Birchinger] - many changes in AVI seek code, resulting near-perfect seeking now! @@ -1579,14 +1579,14 @@ - CRC support to mp3lib's mpeg audio layer-2 decoder thanks for bugreport & testfile to Samson -mplayer v0.09-pre1: Dec 1 2000 +mplayer v0.09-pre1: Dec 1, 2000 bugfix test-release - imported new libmpeg2 files (under testing...) - GL renderer flickering bug fixed (MMX missing emms() between yuv2rgb and glTexSubImage(), bug triggered by new Utah-GLX code) [thanks for Christian Birchinger] -mplayer v0.08: Nov 27 2000 +mplayer v0.08: Nov 27, 2000 Index support, avi seeking, DLL loader fix, compilation fixes - Added support for chunk index usage (disable with -noidx option) - Removed code optimization flags from loader/Makefile because @@ -1605,13 +1605,13 @@ - default video_out driver changed from 'mga' to the first available driver new driver priority: mga_vid, opengl, x11 -mplayer v0.07: Nov 21 2000 +mplayer v0.07: Nov 21, 2000 Easier compile - Added Pontscho's ./configure script (it's modified a lot) - Updated makefiles, and tested a lot :) - Updated DOCS/INSTALL -mplayer v0.06: Nov 20 2000 +mplayer v0.06: Nov 20, 2000 Better codec selection - avi audio&video codec selection moved to new codecs.c file, loader/driver.c and loader/afl.c modified for this @@ -1620,17 +1620,17 @@ - DOCS/INSTALL updated - DOCS/SPEED updated, DivX benchmarks added -mplayer v0.05: Nov 18 2000 +mplayer v0.05: Nov 18, 2000 Merged with MPEGplayer 0.90pre6, first public release of AVI player - code merged with mpegplayer, new Makefile, some small modifications - docs updated and moved to DOCS -mplayer v0.04: Nov 17 2000 +mplayer v0.04: Nov 17, 2000 YUV (yuy2) support with divx 3.11 dll, some code cleanup, preview-release -mplayer v0.03: Nov 14 2000 +mplayer v0.03: Nov 14, 2000 -mplayer v0.01: Nov 11 2000 +mplayer v0.01: Nov 11, 2000 first preview version based on new MPEGplayer's codebase. it contains the win32 loader from avifile, and can decode divx 3.11 video.

3 2

CVS: main/libmpdemux demux_mkv.c,1.9,1.10
by syncmail＠mplayerhq.hu 20 Jul '04

20 Jul '04

CVS change done by Moritz Bunkus CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv3236 Modified Files: demux_mkv.c Log Message: Parse comma separated language lists instead of comparing the complete language string. Patch by Loren Merritt <lorenm at u dot washington dot edu> Index: demux_mkv.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- demux_mkv.c 9 Feb 2004 19:21:08 -0000 1.9 +++ demux_mkv.c 18 Mar 2004 08:37:21 -0000 1.10 @@ -236,12 +236,19 @@ static mkv_track_t * demux_mkv_find_track_by_language (mkv_demuxer_t *d, char *language, int type) { - int i; + int i, len; - for (i=0; i < d->num_tracks; i++) - if (d->tracks[i] != NULL && d->tracks[i]->language != NULL && - d->tracks[i]->type == type && !strcmp(d->tracks[i]->language,language)) - return d->tracks[i]; + language += strspn(language,","); + while((len = strcspn(language,",")) > 0) + { + for (i=0; i < d->num_tracks; i++) + if (d->tracks[i] != NULL && d->tracks[i]->language != NULL && + d->tracks[i]->type == type && + !strncmp(d->tracks[i]->language, language, len)) + return d->tracks[i]; + language += len; + language += strspn(language,","); + } return NULL; }

3 2

CVS: main/libmpdemux demux_ts.c,1.13,1.14
by syncmail＠mplayerhq.hu 31 May '04

31 May '04

CVS change done by Nico Sabbi CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv23206 Modified Files: demux_ts.c Log Message: removed unused and commented code; audio is pushed synchronously (reported to work better); pid 16 is not default PMT (100l); trails of data are add_packet()ed Index: demux_ts.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ts.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- demux_ts.c 20 Mar 2004 13:09:08 -0000 1.13 +++ demux_ts.c 31 May 2004 16:12:13 -0000 1.14 @@ -92,7 +92,6 @@ demux_stream_t *ds; demux_packet_t *pack; int offset, buffer_size; - int broken; //set if it's the final part of a chunk (doesn't have a corresponding is_start) } av_fifo_t; typedef struct { @@ -710,7 +709,6 @@ { priv->fifo[i].pack = NULL; priv->fifo[i].offset = 0; - priv->fifo[i].broken = 1; } priv->fifo[0].ds = demuxer->audio; priv->fifo[1].ds = demuxer->video; @@ -1037,7 +1035,6 @@ priv->fifo[i].offset = 0; priv->fifo[i].pack = NULL; } - priv->fifo[i].broken = 1; } } @@ -1575,28 +1572,18 @@ } -static int fill_packet(demuxer_t *demuxer, demux_stream_t *ds, demux_packet_t **dp, int *dp_offset, int *broken) +static int fill_packet(demuxer_t *demuxer, demux_stream_t *ds, demux_packet_t **dp, int *dp_offset) { int ret = 0; if((*dp != NULL) && (*dp_offset > 0)) { - if(*broken == 0) - { ret = *dp_offset; resize_demux_packet(*dp, ret); //shrinked to the right size ds_add_packet(ds, *dp); mp_msg(MSGT_DEMUX, MSGL_DBG2, "ADDED %d bytes to %s fifo, PTS=%f\n", ret, (ds == demuxer->audio ? "audio" : (ds == demuxer->video ? "video" : "sub")), (*dp)->pts); } - else - { - ret = 0; - mp_msg(MSGT_DEMUX, MSGL_DBG2, "BROKEN PES, DISCARDING\n"); - free_demux_packet(*dp); - } - } - *broken = 1; *dp = NULL; *dp_offset = 0; @@ -1616,7 +1603,7 @@ char *p, tmp[TS_FEC_PACKET_SIZE]; demux_stream_t *ds = NULL; demux_packet_t **dp = NULL; - int *dp_offset = 0, *buffer_size = 0, *broken = NULL; + int *dp_offset = 0, *buffer_size = 0; int32_t progid, pid_type, bad, ts_error; @@ -1625,7 +1612,7 @@ bad = ts_error = 0; ds = (demux_stream_t*) NULL; dp = (demux_packet_t **) NULL; - broken = dp_offset = buffer_size = NULL; + dp_offset = buffer_size = NULL; buf_size = priv->ts.packet_size; @@ -1750,7 +1737,7 @@ else { progid = prog_id_in_pat(priv, pid); - if(((progid != -1) || (pid == 16))) + if(progid != -1) { if(pid != demuxer->video->id && pid != demuxer->audio->id && pid != demuxer->sub->id) { @@ -1759,7 +1746,7 @@ continue; } else - mp_msg(MSGT_DEMUX, MSGL_ERR, "Argh! Data pid used in the PMT, Skipping PMT parsing!\n"); + mp_msg(MSGT_DEMUX, MSGL_ERR, "Argh! Data pid %d used in the PMT, Skipping PMT parsing!\n", pid); } } @@ -1786,7 +1773,6 @@ dp = &priv->fifo[1].pack; dp_offset = &priv->fifo[1].offset; buffer_size = &priv->fifo[1].buffer_size; - broken = &priv->fifo[1].broken; } else if(is_audio && (demuxer->audio->id == tss->pid)) { @@ -1795,7 +1781,6 @@ dp = &priv->fifo[0].pack; dp_offset = &priv->fifo[0].offset; buffer_size = &priv->fifo[0].buffer_size; - broken = &priv->fifo[0].broken; } else if(is_sub || (pid_type == SPU_DVD) || (pid_type == SPU_DVB)) @@ -1842,7 +1827,6 @@ dp = &priv->fifo[2].pack; dp_offset = &priv->fifo[2].offset; buffer_size = &priv->fifo[2].buffer_size; - broken = &priv->fifo[2].broken; } else { @@ -1859,7 +1843,7 @@ //IS IT TIME TO QUEUE DATA to the dp_packet? if(is_start && (dp != NULL)) { - retv = fill_packet(demuxer, ds, dp, dp_offset, broken); + retv = fill_packet(demuxer, ds, dp, dp_offset); } @@ -1916,7 +1900,6 @@ return 1; //es->size; else { - *broken = 0; if(es->size > 0) { if(*dp_offset + es->size > *buffer_size) @@ -1938,6 +1921,12 @@ else continue; } + + if(is_audio) + { + retv = fill_packet(demuxer, ds, dp, dp_offset); + return 1; + } } else return 0; @@ -1998,6 +1987,12 @@ stream_skip(stream, buf_size - sz); } + if(is_audio) + { + retv = fill_packet(demuxer, ds, dp, dp_offset); + return 1; + } + continue; } else @@ -2030,7 +2025,6 @@ priv->fifo[0].pack = NULL; } priv->fifo[0].offset = 0; - priv->fifo[0].broken = 1; } if(v) @@ -2041,7 +2035,6 @@ priv->fifo[1].pack = NULL; } priv->fifo[1].offset = 0; - priv->fifo[1].broken = 1; } if(s) @@ -2052,7 +2045,6 @@ priv->fifo[2].pack = NULL; } priv->fifo[2].offset = 0; - priv->fifo[2].broken = 1; } }

1 0

CVS: main/libmpcodecs vf.c,1.107,1.108
by syncmail＠mplayerhq.hu 31 May '04

31 May '04

CVS change done by Nicolas Plourde CVS Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var2/tmp/cvs-serv12193/libmpcodecs Modified Files: vf.c Log Message: Big Endian fix Index: vf.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf.c,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- vf.c 28 Apr 2004 04:29:17 -0000 1.107 +++ vf.c 31 May 2004 15:07:58 -0000 1.108 @@ -217,12 +217,19 @@ unsigned int* p=(unsigned int*) dst; int size=(mpi->bpp>>3)*w/4; int i; +#ifdef WORDS_BIGENDIAN +#define CLEAR_PACKEDYUV_PATTERN 0x00800080 +#define CLEAR_PACKEDYUV_PATTERN_SWAPPED 0x80008000 +#else +#define CLEAR_PACKEDYUV_PATTERN 0x80008000 +#define CLEAR_PACKEDYUV_PATTERN_SWAPPED 0x00800080 +#endif if(mpi->flags&MP_IMGFLAG_SWAPPED){ - for(i=0;i<size;i+=4) p[i]=p[i+1]=p[i+2]=p[i+3]=0x00800080; - for(;i<size;i++) p[i]=0x00800080; + for(i=0;i<size-3;i+=4) p[i]=p[i+1]=p[i+2]=p[i+3]=CLEAR_PACKEDYUV_PATTERN_SWAPPED; + for(;i<size;i++) p[i]=CLEAR_PACKEDYUV_PATTERN_SWAPPED; } else { - for(i=0;i<size;i+=4) p[i]=p[i+1]=p[i+2]=p[i+3]=0x80008000; - for(;i<size;i++) p[i]=0x80008000; + for(i=0;i<size-3;i+=4) p[i]=p[i+1]=p[i+2]=p[i+3]=CLEAR_PACKEDYUV_PATTERN; + for(;i<size;i++) p[i]=CLEAR_PACKEDYUV_PATTERN; } } else memset(dst,0,(mpi->bpp>>3)*w);

2 1

CVS: main/libvo vo_quartz.c,1.10,1.11
by syncmail＠mplayerhq.hu 31 May '04

31 May '04

CVS change done by Nicolas Plourde CVS Update of /cvsroot/mplayer/main/libvo In directory mail:/var2/tmp/cvs-serv26067/libvo Modified Files: vo_quartz.c Log Message: uyvy osd support Index: vo_quartz.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_quartz.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- vo_quartz.c 18 May 2004 20:49:44 -0000 1.10 +++ vo_quartz.c 31 May 2004 15:16:41 -0000 1.11 @@ -114,7 +114,7 @@ vo_draw_alpha_yv12(w,h,src,srca,stride, ((char*)P) + P->componentInfoY.offset + x0 + y0 * imgRect.right, imgRect.right); break; case IMGFMT_UYVY: - //vo_draw_alpha_uyvy(w,h,src,srca,stride,((char*)P) + (x0 + y0 * imgRect.right) * 2,imgRect.right*2); + vo_draw_alpha_uyvy(w,h,src,srca,stride,((char*)P) + (x0 + y0 * imgRect.right) * 2,imgRect.right*2); break; case IMGFMT_YUY2: vo_draw_alpha_yuy2(w,h,src,srca,stride,((char*)P) + (x0 + y0 * imgRect.right) * 2,imgRect.right*2);

1 0

CVS: main/libvo osd_template.c,1.20,1.21
by syncmail＠mplayerhq.hu 31 May '04

31 May '04

CVS change done by Nicolas Plourde CVS Update of /cvsroot/mplayer/main/libvo In directory mail:/var2/tmp/cvs-serv26753/libvo Modified Files: osd_template.c Log Message: draw alpha for uyvy Index: osd_template.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/osd_template.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- osd_template.c 3 Aug 2003 18:33:28 -0000 1.20 +++ osd_template.c 31 May 2004 15:13:35 -0000 1.21 @@ -160,6 +160,30 @@ return; } +static inline void RENAME(vo_draw_alpha_uyvy)(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride){ + int y; +#if defined(FAST_OSD) + w=w>>1; +#endif + for(y=0;y<h;y++){ + register int x; + for(x=0;x<w;x++){ +#ifdef FAST_OSD + if(srca[2*x+0]) dstbase[4*x+2]=src[2*x+0]; + if(srca[2*x+1]) dstbase[4*x+0]=src[2*x+1]; +#else + if(srca[x]) { + dstbase[2*x+1]=((dstbase[2*x+1]*srca[x])>>8)+src[x]; + dstbase[2*x]=((((signed)dstbase[2*x]-128)*srca[x])>>8)+128; + } +#endif + } + src+=srcstride; + srca+=srcstride; + dstbase+=dststride; + } +} + static inline void RENAME(vo_draw_alpha_rgb24)(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride){ int y; for(y=0;y<h;y++){

1 0