December 2005 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/input input.c,1.125,1.126
by syncmail＠mplayerhq.hu 24 Dec '06

24 Dec '06

CVS change done by Alban Bedel CVS Update of /cvsroot/mplayer/main/input In directory mail:/var2/tmp/cvs-serv3818/input Modified Files: input.c Log Message: libvo input cleanup: remove the dependency on libinput, remove most of the crappy mappings (like O->o or ESC->q). Index: input.c =================================================================== RCS file: /cvsroot/mplayer/main/input/input.c,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- input.c 25 Oct 2005 21:23:45 -0000 1.125 +++ input.c 2 Nov 2005 21:50:54 -0000 1.126 @@ -240,10 +240,27 @@ { JOY_BTN8, "JOY_BTN8" }, { JOY_BTN9, "JOY_BTN9" }, - { KEY_XF86_PAUSE, "XF86_PAUSE" }, - { KEY_XF86_STOP, "XF86_STOP" }, - { KEY_XF86_PREV, "XF86_PREV" }, - { KEY_XF86_NEXT, "XF86_NEXT" }, + { KEY_POWER, "POWER" }, + { KEY_MENU, "MENU" }, + { KEY_PLAY, "PLAY" }, + { KEY_PAUSE, "PAUSE" }, + { KEY_PLAYPAUSE, "PLAYPAUSE" }, + { KEY_STOP, "STOP" }, + { KEY_FORWARD, "FORWARD" }, + { KEY_REWIND, "REWIND" }, + { KEY_NEXT, "NEXT" }, + { KEY_PREV, "PREV" }, + { KEY_VOLUME_UP, "VOLUME_UP" }, + { KEY_VOLUME_DOWN, "VOLUME_DOWN" }, + { KEY_MUTE, "MUTE" }, + + // These are kept for backward compatibility + { KEY_PAUSE, "XF86_PAUSE" }, + { KEY_STOP, "XF86_STOP" }, + { KEY_PREV, "XF86_PREV" }, + { KEY_NEXT, "XF86_NEXT" }, + + { KEY_CLOSE_WIN, "CLOSE_WIN" }, { 0, NULL } }; @@ -282,9 +299,11 @@ { { '}', 0 }, "speed_mult 2.0" }, { { KEY_BACKSPACE, 0 }, "speed_set 1.0" }, { { 'q', 0 }, "quit" }, + { { 'Q', 0 }, "quit" }, #ifndef HAVE_NEW_GUI { { KEY_ESC, 0 }, "quit" }, { { 'p', 0 }, "pause" }, + { { 'P', 0 }, "pause" }, #endif { { ' ', 0 }, "pause" }, { { '.', 0 }, "frame_step" }, @@ -298,6 +317,7 @@ { { KEY_INS, 0 }, "alt_src_step 1" }, { { KEY_DEL, 0 }, "alt_src_step -1" }, { { 'o', 0 }, "osd" }, + { { 'O', 0 }, "osd" }, { { 'z', 0 }, "sub_delay -0.1" }, { { 'x', 0 }, "sub_delay +0.1" }, { { 'g', 0 }, "sub_step -1" }, @@ -307,6 +327,7 @@ { { '0', 0 }, "volume 1" }, { { '*', 0 }, "volume 1" }, { { 'm', 0 }, "mute" }, + { { 'M', 0 }, "mute" }, { { '1', 0 }, "contrast -1" }, { { '2', 0 }, "contrast 1" }, { { '3', 0 }, "brightness -1" }, @@ -358,10 +379,21 @@ { { 'w', 0 }, "panscan -0.1" }, { { 'e', 0 }, "panscan +0.1" }, - { { KEY_XF86_PAUSE, 0 }, "pause" }, - { { KEY_XF86_STOP, 0 }, "quit" }, - { { KEY_XF86_PREV, 0 }, "seek -60" }, - { { KEY_XF86_NEXT, 0 }, "seek +60" }, + { { KEY_POWER, 0 }, "quit" }, + { { KEY_MENU, 0 }, "osd" }, + { { KEY_PLAY, 0 }, "pause" }, + { { KEY_PAUSE, 0 }, "pause" }, + { { KEY_PLAYPAUSE, 0 }, "pause" }, + { { KEY_STOP, 0 }, "quit" }, + { { KEY_FORWARD, 0 }, "seek 60" }, + { { KEY_REWIND, 0 }, "seek -60" }, + { { KEY_NEXT, 0 }, "pt_step 1" }, + { { KEY_PREV, 0 }, "pt_step -1" }, + { { KEY_VOLUME_UP, 0 }, "volume 1" }, + { { KEY_VOLUME_DOWN, 0 }, "volume -1" }, + { { KEY_MUTE, 0 }, "mute" }, + + { { KEY_CLOSE_WIN, 0 }, "quit" }, { { 0 }, NULL } };

3 3

CVS: main/mp3lib sr1.c,1.33,1.34
by syncmail＠mplayerhq.hu 03 Jan '06

03 Jan '06

CVS change done by Guillaume Poirier CVS Update of /cvsroot/mplayer/main/mp3lib In directory mail:/var2/tmp/cvs-serv74/mp3lib Modified Files: sr1.c Log Message: "Currently mplayer looks for only one MP3 frame sync. The attached patch makes it to look for two consecutive valid MP3 frame headers, reducing the probability of false positives, which causes Bug 380. Funny that the fix is so simple. Seems that someone has forgotten to initialize MP3_resync correctly. Also this is the recommended way to sync MP3 frames. See http://www.dv.co.yu/mpgscript/mpeghdr.htm. " Original thread: Date: Dec 31, 2005 10:15 AM Subject: [MPlayer-dev-eng] [PATCH] Try twice when searching for MP3 frame header, fixes Bug 380 Index: sr1.c =================================================================== RCS file: /cvsroot/mplayer/main/mp3lib/sr1.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sr1.c 15 Nov 2005 18:14:07 -0000 1.33 +++ sr1.c 31 Dec 2005 18:56:35 -0000 1.34 @@ -45,7 +45,7 @@ int MP3_framesize=0; // current framesize int MP3_bitrate=0; // current bitrate int MP3_samplerate=0; // current samplerate -int MP3_resync=0; +static int MP3_resync; int MP3_channels=0; int MP3_bps=2; @@ -407,6 +407,7 @@ _has_mmx = 0; dct36_func = dct36; + MP3_resync = 1; make_decode_tables(outscale);

2 1

CVS: main/libmpcodecs vd_ffmpeg.c,1.154,1.155
by syncmail＠mplayerhq.hu 03 Jan '06

03 Jan '06

CVS change done by Michael Niedermayer CVS Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var2/tmp/cvs-serv28250 Modified Files: vd_ffmpeg.c Log Message: bitexact flag Index: vd_ffmpeg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v retrieving revision 1.154 retrieving revision 1.155 diff -u -r1.154 -r1.155 --- vd_ffmpeg.c 2 Dec 2005 22:00:50 -0000 1.154 +++ vd_ffmpeg.c 18 Dec 2005 01:22:11 -0000 1.155 @@ -112,6 +112,7 @@ static char *lavc_param_skip_frame_str = NULL; #endif static int lavc_param_threads=1; +static int lavc_param_bitexact=0; m_option_t lavc_decode_opts_conf[]={ {"bug", &lavc_param_workaround_bugs, CONF_TYPE_INT, CONF_RANGE, -1, 999999, NULL}, @@ -134,6 +135,7 @@ {"skipframe", &lavc_param_skip_frame_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, #endif {"threads", &lavc_param_threads, CONF_TYPE_INT, CONF_RANGE, 1, 8, NULL}, + {"bitexact", &lavc_param_bitexact, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_BITEXACT, NULL}, {NULL, NULL, 0, 0, 0, 0, NULL} }; @@ -270,6 +272,7 @@ #ifdef CODEC_FLAG_NOT_TRUNCATED avctx->flags|= CODEC_FLAG_NOT_TRUNCATED; #endif + avctx->flags|= lavc_param_bitexact; avctx->width = sh->disp_w; avctx->height= sh->disp_h;

4 3

CVS: main mencoder.c,1.326,1.327
by syncmail＠mplayerhq.hu 31 Dec '05

31 Dec '05

CVS change done by The Wanderer CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv2139 Modified Files: mencoder.c Log Message: make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet Index: mencoder.c =================================================================== RCS file: /cvsroot/mplayer/main/mencoder.c,v retrieving revision 1.326 retrieving revision 1.327 diff -u -r1.326 -r1.327 --- mencoder.c 7 Dec 2005 10:07:27 -0000 1.326 +++ mencoder.c 15 Dec 2005 17:57:18 -0000 1.327 @@ -170,7 +170,7 @@ unsigned int vobsub_out_index=0; char *vobsub_out_id=NULL; -char* out_filename="test.avi"; +char* out_filename=NULL; char *force_fourcc=NULL; int force_audiofmttag=-1; @@ -465,6 +465,33 @@ filelist = m_config_parse_me_command_line(mconfig, argc, argv); if(!filelist) mencoder_exit(1, MSGTR_ErrorParsingCommandLine); +{ + char *extension; + + if (!out_filename) mencoder_exit(1,MSGTR_MissingOutputFilename); + extension=strrchr(out_filename,'.'); + if (extension != NULL && strlen(extension) > 3 && strlen(extension) < 6) + { + extension++; + + switch (out_file_format) + { + case MUXER_TYPE_AVI: + if (strcasecmp(extension,"avi")) + mp_msg(MSGT_MENCODER, MSGL_WARN, MSGTR_MencoderWrongFormatAVI); + break; + + case MUXER_TYPE_MPEG: + if (strcasecmp(extension,"mpg") && + strcasecmp(extension,"mpeg") && + strcasecmp(extension,"vob")) + mp_msg(MSGT_MENCODER, MSGL_WARN, MSGTR_MencoderWrongFormatMPG); + break; + } + } +} + + if (frameno_filename) { stream2=open_stream(frameno_filename,0,&i); if(stream2){

8 14

CVS: main/etc codecs.conf,1.442,1.443
by syncmail＠mplayerhq.hu 31 Dec '05

31 Dec '05

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/etc In directory mail:/var2/tmp/cvs-serv28015 Modified Files: codecs.conf Log Message: Add MPEG fourcc to mpeg12. Index: codecs.conf =================================================================== RCS file: /cvsroot/mplayer/main/etc/codecs.conf,v retrieving revision 1.442 retrieving revision 1.443 diff -u -r1.442 -r1.443 --- codecs.conf 9 Dec 2005 16:52:44 -0000 1.442 +++ codecs.conf 31 Dec 2005 18:24:00 -0000 1.443 @@ -33,6 +33,7 @@ fourcc PIM1 ; Pinnacle hardware-MPEG-1 fourcc VCR2 fourcc mpg2 + fourcc MPEG driver libmpeg2 ; dll "libmpeg2" out YV12,I420,IYUV

1 0

CVS: main/libmpdemux video.c,1.56,1.57
by syncmail＠mplayerhq.hu 31 Dec '05

31 Dec '05

CVS change done by Nico Sabbi CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv30840 Modified Files: video.c Log Message: search next sequence_header untile a valid one is found Index: video.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/video.c,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- video.c 19 Dec 2005 19:38:28 -0000 1.56 +++ video.c 31 Dec 2005 17:47:54 -0000 1.57 @@ -274,7 +274,7 @@ break; } case VIDEO_MPEG12: { -//mpeg_header_parser: +mpeg_header_parser: // Find sequence_header first: videobuf_len=0; videobuf_code_len=0; telecine=0; telecine_cnt=-2.5; @@ -307,7 +307,8 @@ } if(mp_header_process_sequence_header (&picture, &videobuffer[4])) { mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_BadMpegSequHdr); - return 0; + goto mpeg_header_parser; + //return 0; } if(sync_video_packet(d_video)==0x1B5){ // next packet is seq. ext. // videobuf_len=0;

1 0

CVS: main mplayer.c,1.898,1.899
by syncmail＠mplayerhq.hu 31 Dec '05

31 Dec '05

CVS change done by Jindrich Makovicka CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv15463 Modified Files: mplayer.c Log Message: check the intermediate audio buffer otherwise, data can get stuck between the demuxer and filter layer causing a premature end of audio. Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.898 retrieving revision 1.899 diff -u -r1.898 -r1.899 --- mplayer.c 29 Dec 2005 11:27:22 -0000 1.898 +++ mplayer.c 31 Dec 2005 07:37:37 -0000 1.899 @@ -2599,7 +2599,7 @@ current_module="decode_audio"; // Enter AUDIO decoder module t=GetTimer(); while(sh_audio->a_out_buffer_len<playsize && - (!d_audio->eof || sh_audio->a_in_buffer_len > 0)){ + (!d_audio->eof || sh_audio->a_in_buffer_len > 0 || sh_audio->a_buffer_len > 0)){ int ret=decode_audio(sh_audio,&sh_audio->a_out_buffer[sh_audio->a_out_buffer_len], playsize-sh_audio->a_out_buffer_len,sh_audio->a_out_buffer_size-sh_audio->a_out_buffer_len); if(ret<=0) { // EOF?

1 0

CVS: main/libmpdemux muxer_mpeg.c,1.26,1.27
by syncmail＠mplayerhq.hu 30 Dec '05

30 Dec '05

CVS change done by Nico Sabbi CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv3719 Modified Files: muxer_mpeg.c Log Message: simplification: don't use residual_buffer, but prepend remainder of current frame to next one (needed for future work; init frame->pos to 0 in reorder_frame(); fix: don't go beyond last frame in flush_buffer() Index: muxer_mpeg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/muxer_mpeg.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- muxer_mpeg.c 5 Dec 2005 01:26:09 -0000 1.26 +++ muxer_mpeg.c 30 Dec 2005 18:46:56 -0000 1.27 @@ -130,8 +130,8 @@ off_t headers_size, data_size; uint64_t scr, vbytes, abytes, init_delay_pts; uint32_t muxrate; - uint8_t *buff, *tmp, *abuf, *residual; - uint32_t residual_cnt, headers_cnt; + uint8_t *buff, *tmp, *abuf; + uint32_t headers_cnt; double init_adelay; int drop; @@ -1094,6 +1094,7 @@ (uint32_t) idx, FTYPE(pt), temp_ref, ptr, (uint32_t) len, (uint32_t) spriv->framebuf[idx].alloc_size, spriv->framebuf[idx].buffer); memcpy(spriv->framebuf[idx].buffer, ptr, len); + spriv->framebuf[idx].pos = 0; spriv->framebuf[idx].size = len; spriv->framebuf[idx].temp_ref = temp_ref; spriv->framebuf[idx].type = pt; @@ -1599,22 +1600,6 @@ vbytes = 0; vpriv = (muxer_headers_t*) vs->priv; - if(priv->residual_cnt) - { - mpeg_frame_t *f = &(vpriv->framebuf[0]); - size_t sz = f->size + priv->residual_cnt; - - if(f->alloc_size < sz) - { - f->buffer = (uint8_t *) realloc(f->buffer, sz); - f->alloc_size = sz; - } - memmove(&(f->buffer[priv->residual_cnt]), f->buffer, f->size); - memcpy(f->buffer, priv->residual, priv->residual_cnt); - f->size += priv->residual_cnt; - priv->residual_cnt = 0; - } - duration = 0; iduration = 0; for(i = 0; i < n; i++) @@ -1737,6 +1722,8 @@ if(vbytes == 0) //current frame is saved, pass to the next { + if(i+1 >= n) //the current one is the last frame in GOP + break; i++; vbytes = vpriv->framebuf[i].size; offset = 0; @@ -1750,8 +1737,14 @@ if((pl_size < priv->packet_size - calc_pack_hlen(priv, vpriv)) && !finalize && (i >= n - 1)) { - memcpy(priv->residual, buf, pl_size); - priv->residual_cnt = pl_size; + if(vpriv->framebuf[n].alloc_size < pl_size + vpriv->framebuf[n].size) + { + vpriv->framebuf[n].buffer = realloc(vpriv->framebuf[n].buffer, pl_size + vpriv->framebuf[n].size); + vpriv->framebuf[n].alloc_size = pl_size + vpriv->framebuf[n].size; + } + memmove(&(vpriv->framebuf[n].buffer[pl_size]), vpriv->framebuf[n].buffer, vpriv->framebuf[n].size); + memcpy(vpriv->framebuf[n].buffer, buf, pl_size); + vpriv->framebuf[n].size += pl_size; pl_size = update = vbytes = 0; } if(pl_size) @@ -2816,8 +2809,7 @@ priv->buff = (uint8_t *) malloc(priv->packet_size); priv->tmp = (uint8_t *) malloc(priv->packet_size); priv->abuf = (uint8_t *) malloc(priv->packet_size); - priv->residual = (uint8_t *) malloc(priv->packet_size); - if((priv->buff == NULL) || (priv->tmp == NULL) || (priv->abuf == NULL) || (priv->residual == NULL)) + if((priv->buff == NULL) || (priv->tmp == NULL) || (priv->abuf == NULL)) { mp_msg(MSGT_MUXER, MSGL_ERR, "\nCouldn't allocate %d bytes, exit\n", priv->packet_size); return 0;

1 0

CVS: main/libmpcodecs ve_x264.c,1.41,1.42
by syncmail＠mplayerhq.hu 30 Dec '05

30 Dec '05

CVS change done by Loren Merritt CVS Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var2/tmp/cvs-serv28337/libmpcodecs Modified Files: ve_x264.c Log Message: sync to x264 r390 (bime) Index: ve_x264.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_x264.c,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- ve_x264.c 22 Nov 2005 05:32:28 -0000 1.41 +++ ve_x264.c 30 Dec 2005 05:15:27 -0000 1.42 @@ -101,6 +101,7 @@ static char *zones = NULL; static int subq = 5; static int bframe_rdo = 0; +static int bidir_me = 0; static int me_method = 2; static int me_range = 16; static int trellis = 1; @@ -154,6 +155,8 @@ {"direct_pred", &direct_pred, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL}, {"weight_b", &weight_b, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"noweight_b", &weight_b, CONF_TYPE_FLAG, 0, 1, 0, NULL}, + {"bime", &bidir_me, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"nobime", &bidir_me, CONF_TYPE_FLAG, 0, 0, 0, NULL}, {"chroma_me", &chroma_me, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"nochroma_me", &chroma_me, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"mixed_refs", &mixed_references, CONF_TYPE_FLAG, 0, 0, 1, NULL}, @@ -292,6 +295,7 @@ mod->param.analyse.i_direct_mv_pred = direct_pred; mod->param.analyse.b_weighted_bipred = weight_b; mod->param.analyse.i_chroma_qp_offset = chroma_qp_offset; + mod->param.analyse.b_bidir_me = bidir_me; mod->param.analyse.b_chroma_me = chroma_me; mod->param.analyse.b_mixed_references = mixed_references; mod->param.analyse.i_trellis = trellis;

1 0

CVS: main configure,1.1115,1.1116
by syncmail＠mplayerhq.hu 30 Dec '05

30 Dec '05

CVS change done by Loren Merritt CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv28337 Modified Files: configure Log Message: sync to x264 r390 (bime) Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.1115 retrieving revision 1.1116 diff -u -r1.1115 -r1.1116 --- configure 29 Dec 2005 18:01:22 -0000 1.1115 +++ configure 30 Dec 2005 05:15:26 -0000 1.1116 @@ -6265,7 +6265,7 @@ cat > $TMPC << EOF #include <inttypes.h> #include <x264.h> -#if X264_BUILD < 40 +#if X264_BUILD < 43 #error We do not support old versions of x264. Get the latest from SVN. #endif int main(void) { x264_encoder_open((void*)0); return 0; }

1 0