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

r35712 - trunk/libmpcodecs/vf_ass.c
by upsuper 31 Dec '12

31 Dec '12

Author: upsuper Date: Mon Dec 31 05:35:03 2012 New Revision: 35712 Log: Fix a rendering bug in vf_ass. Reported at http://thread.gmane.org/gmane.comp.video.mplayer.user/69250. Modified: trunk/libmpcodecs/vf_ass.c Modified: trunk/libmpcodecs/vf_ass.c ============================================================================== --- trunk/libmpcodecs/vf_ass.c Sun Dec 30 14:41:52 2012 (r35711) +++ trunk/libmpcodecs/vf_ass.c Mon Dec 31 05:35:03 2012 (r35712) @@ -333,7 +333,7 @@ static void prepare_buffer_420p(vf_insta int xmin = FFMIN(dirty_rows[i].xmin, dirty_rows[i + 1].xmin) & ~1, xmax = FFMAX(dirty_rows[i].xmax, dirty_rows[i + 1].xmax); for (j = xmin; j < xmax; j += 2) { - size_t p = i * outw / 4 + j / 2, + size_t p = i * outw / 2 + j / 2, q1 = i * outw + j, q2 = q1 + outw; dst_a[p] = (src_a[q1] + src_a[q1 + 1] + @@ -354,12 +354,12 @@ static void prepare_buffer_420p(vf_insta if (xmin >= xmax) continue; for (j = xmin & ~31; j < xmin; j += 2) { - size_t p = i * outw / 4 + j / 2; + size_t p = i * outw / 2 + j / 2; dst_a[p] = 0xFF; dst_u[p] = dst_v[p] = 0; } for (j = xmax; j < FFALIGN(xmax, 32); j += 2) { - size_t p = i * outw / 4 + j / 2; + size_t p = i * outw / 2 + j / 2; dst_a[p] = 0xFF; dst_u[p] = dst_v[p] = 0; } @@ -406,7 +406,7 @@ static void render_frame_yuv420p(vf_inst int xmin = FFMIN(dirty_rows[i * 2].xmin, dirty_rows[i * 2 + 1].xmin), xmax = FFMAX(dirty_rows[i * 2].xmax, dirty_rows[i * 2 + 1].xmax); for (j = xmin / 2; j < (xmax + 1) / 2; j++) { - size_t s = i * outw / 2 + j, + size_t s = i * outw + j, d = i * stride + j; if (alpha[s] != 0xFF) { uint_fast16_t a = MAP_16BIT(alpha[s]); @@ -546,9 +546,9 @@ static void render_frame_yuv420p_sse4(vf : : [j] "r" (xmin / 2), [xmax] "g" ((xmax + 1) / 2), - [alpha] "r" (alpha + i * outw / 2), - [src_u] "g" (src_u + i * outw / 2), - [src_v] "g" (src_v + i * outw / 2), + [alpha] "r" (alpha + i * outw), + [src_u] "g" (src_u + i * outw), + [src_v] "g" (src_v + i * outw), [dst_u] "g" (dst_u + i * stride), [dst_v] "g" (dst_v + i * stride) : REG_S, REG_D @@ -571,6 +571,16 @@ static void clean_buffer(vf_instance_t * uint8_t *alpha = vf->priv->alphas[0]; int i, j; + if (vf->priv->prepare_buffer == prepare_buffer_420p) { + // HACK: prepare_buffer_420p touched u & v planes + // so we want to clean them here. + for (i = 0; i < outh; i += 2) { + int xmin = FFMIN(dirty_rows[i].xmin, dirty_rows[i + 1].xmin) & ~1, + xmax = FFMAX(dirty_rows[i].xmax, dirty_rows[i + 1].xmax); + dirty_rows[i / 2].xmin = FFMIN(dirty_rows[i / 2].xmin, xmin / 2); + dirty_rows[i / 2].xmax = FFMAX(dirty_rows[i / 2].xmax, xmax / 2); + } + } for (i = 0; i < MP_MAX_PLANES; i++) { uint8_t *plane = planes[i]; if (!plane)

1 0

r35711 - trunk/configure
by cehoyos 30 Dec '12

30 Dec '12

Author: cehoyos Date: Sun Dec 30 14:41:52 2012 New Revision: 35711 Log: Fix compilation with latest FFmpeg. Patch by Josh, joshf87 live com Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Mon Dec 24 21:15:26 2012 (r35710) +++ trunk/configure Sun Dec 30 14:41:52 2012 (r35711) @@ -8465,6 +8465,7 @@ CONFIG_MPEGVIDEO = yes CONFIG_MPEGVIDEOENC = yes CONFIG_RANGECODER = yes CONFIG_RDFT = yes +CONFIG_RTPENC_CHAIN = yes CONFIG_SINEWIN = yes CONFIG_VIDEODSP = yes CONFIG_VP3DSP = yes

1 0

r35710 - trunk/libvo/vo_gl.c
by reimar 24 Dec '12

24 Dec '12

Author: reimar Date: Mon Dec 24 21:15:26 2012 New Revision: 35710 Log: Fix missing screen clear with -nodouble. Modified: trunk/libvo/vo_gl.c Modified: trunk/libvo/vo_gl.c ============================================================================== --- trunk/libvo/vo_gl.c Mon Dec 24 15:22:46 2012 (r35709) +++ trunk/libvo/vo_gl.c Mon Dec 24 21:15:26 2012 (r35710) @@ -907,6 +907,7 @@ static void do_render(void) { } static void flip_page(void) { + int need_clear = aspect_scaling() && use_aspect; // We might get an expose event between draw_image and its // corresponding flip_page. // For double-buffering we would then flip in a clear backbuffer. @@ -914,18 +915,20 @@ static void flip_page(void) { // current GL buffer contains a properly rendered video. // did_render will always be false for single buffer. if (!did_render) { + if (!vo_doublebuffering && need_clear) + mpglClear(GL_COLOR_BUFFER_BIT); do_render(); do_render_osd(RENDER_OSD | RENDER_EOSD); } + if (use_glFinish) mpglFinish(); + if (vo_doublebuffering) { - if (use_glFinish) mpglFinish(); glctx.swapGlBuffers(&glctx); - if (aspect_scaling() && use_aspect) + if (need_clear) mpglClear(GL_COLOR_BUFFER_BIT); - } else { - if (use_glFinish) mpglFinish(); - else mpglFlush(); - } + } else if (!use_glFinish) + mpglFlush(); + did_render = 0; }

1 0

r35709 - trunk/libmpcodecs/vd_ffmpeg.c
by reimar 24 Dec '12

24 Dec '12

Author: reimar Date: Mon Dec 24 15:22:46 2012 New Revision: 35709 Log: Disable direct rendering for non-ref frames only again, it still seems to cause issues that need to be debugged and fixed. Modified: trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Sun Dec 23 03:19:57 2012 (r35708) +++ trunk/libmpcodecs/vd_ffmpeg.c Mon Dec 24 15:22:46 2012 (r35709) @@ -247,7 +247,10 @@ static int init(sh_video_t *sh){ if(lavc_codec->capabilities&CODEC_CAP_DR1 && !do_vis_debug && lavc_codec->id != CODEC_ID_INTERPLAY_VIDEO && lavc_codec->id != CODEC_ID_VP8) ctx->do_dr1=1; - ctx->nonref_dr = lavc_codec->id == CODEC_ID_H264; + // TODO: fix and enable again. This currently causes issues when using filters + // and seeking, usually failing with the "Ran out of numbered images" message, + // but bugzilla #2118 might be related as well. + //ctx->nonref_dr = lavc_codec->id == CODEC_ID_H264; ctx->ip_count= ctx->b_count= 0; ctx->pic = avcodec_alloc_frame();

1 0

r35704 - in trunk: configure etc/codecs.conf
by cehoyos 23 Dec '12

23 Dec '12

Author: cehoyos Date: Sat Dec 22 12:21:35 2012 New Revision: 35704 Log: Add support for FFmpeg's libilbc decoder. Modified: trunk/configure trunk/etc/codecs.conf Modified: trunk/configure ============================================================================== --- trunk/configure Sat Dec 22 11:53:51 2012 (r35703) +++ trunk/configure Sat Dec 22 12:21:35 2012 (r35704) @@ -444,6 +444,7 @@ Codecs: --disable-ladspa disable LADSPA plugin support [autodetect] --disable-libbs2b disable libbs2b audio filter support [autodetect] --disable-libdv disable libdv 0.9.5 en/decoding support [autodetect] + --disable-libilbc disable libilbc decoding support [autodetect] --disable-libopus disable libopus decoding support [autodetect] --disable-mpg123 disable libmpg123 MP3 decoding support [autodetect] --disable-mad disable libmad (MPEG audio) support [autodetect] @@ -769,6 +770,7 @@ _faac=auto _faac_lavc=auto _ladspa=auto _libbs2b=auto +_libilbc=auto _libopus=auto _xmms=no _vcd=auto @@ -1178,6 +1180,8 @@ for ac_option do --disable-ladspa) _ladspa=no ;; --enable-libbs2b) _libbs2b=yes ;; --disable-libbs2b) _libbs2b=no ;; + --enable-libilbc) _libilbc=yes ;; + --disable-libilbc) _libilbc=no ;; --enable-libopus) _libopus=yes ;; --disable-libopus) _libopus=no ;; --enable-xmms) _xmms=yes ;; @@ -6619,6 +6623,23 @@ fi echores "$_faad" +echocheck "libilbc support" +if test "$_libilbc" = auto; then + _libilbc=no + statement_check ilbc.h 'WebRtcIlbcfix_InitDecode(0, 0, 0);' -lilbc && _libilbc=yes +fi +echores "$_libilbc" +if test "$_libilbc" = yes ; then + def_libilbc='#define CONFIG_LIBILBC 1' + extra_ldflags="$extra_ldflags -lilbc" + libavdecoders="$libavdecoders LIBILBC_DECODER" + codecmodules="ilbc $codecmodules" +else + def_libopenjpeg='#define CONFIG_ILBC 0' + nocodecmodules="ilbc $nocodecmodules" +fi + + echocheck "libopus decoding support" if test "$_libopus" = auto ; then _libopus=no @@ -8681,6 +8702,7 @@ $def_libdv $def_liblzo $def_libmpeg2 $def_libmpeg2_internal +$def_libilbc $def_libopus $def_mad $def_mp3lame Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Sat Dec 22 11:53:51 2012 (r35703) +++ trunk/etc/codecs.conf Sat Dec 22 12:21:35 2012 (r35704) @@ -5450,6 +5450,13 @@ audiocodec libopencoreamrwb driver ffmpeg dll "libopencore_amrwb" +audiocodec libilbc + info "FFmpeg libilbc" + status working + fourcc ilbc + driver ffmpeg + dll libilbc + audiocodec ffadcpmswf info "FFmpeg's ADPCM Flash-variant" status working

3 2

r35708 - trunk/configure
by cehoyos 23 Dec '12

23 Dec '12

Author: cehoyos Date: Sun Dec 23 03:19:57 2012 New Revision: 35708 Log: 10l: Use correct variable name for libilbc config line. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Dec 23 02:25:26 2012 (r35707) +++ trunk/configure Sun Dec 23 03:19:57 2012 (r35708) @@ -6637,7 +6637,7 @@ if test "$_libilbc" = yes ; then libavdecoders="$libavdecoders LIBILBC_DECODER" codecmodules="ilbc $codecmodules" else - def_libopenjpeg='#define CONFIG_ILBC 0' + def_libilbc='#define CONFIG_ILBC 0' nocodecmodules="ilbc $nocodecmodules" fi

1 0

r35707 - trunk/libmpdemux/mp_taglists.c
by cehoyos 23 Dec '12

23 Dec '12

Author: cehoyos Date: Sun Dec 23 02:25:26 2012 New Revision: 35707 Log: Support decoding lbc files. Reported-by: bat guano, batguano999 hotmail Modified: trunk/libmpdemux/mp_taglists.c Modified: trunk/libmpdemux/mp_taglists.c ============================================================================== --- trunk/libmpdemux/mp_taglists.c Sat Dec 22 18:53:30 2012 (r35706) +++ trunk/libmpdemux/mp_taglists.c Sun Dec 23 02:25:26 2012 (r35707) @@ -56,6 +56,7 @@ static const struct AVCodecTag mp_wav_ta #endif { CODEC_ID_G723_1, MKTAG('7', '2', '3', '1')}, { CODEC_ID_INTERPLAY_DPCM, MKTAG('I', 'N', 'P', 'A')}, + { AV_CODEC_ID_ILBC, MKTAG('i', 'l', 'b', 'c')}, { CODEC_ID_MLP, MKTAG('M', 'L', 'P', ' ')}, { CODEC_ID_MP1, 0x50}, { CODEC_ID_MP4ALS, MKTAG('A', 'L', 'S', ' ')},

1 0

r35706 - trunk/configure
by cehoyos 22 Dec '12

22 Dec '12

Author: cehoyos Date: Sat Dec 22 18:53:30 2012 New Revision: 35706 Log: Allow libmng autodetection to test for "-lmng" and "-lmng -ljpeg". Patch by Josh, joshf87 live com Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sat Dec 22 14:17:19 2012 (r35705) +++ trunk/configure Sat Dec 22 18:53:30 2012 (r35706) @@ -5004,12 +5004,14 @@ fi echocheck "MNG support" if test "$_mng" = auto ; then _mng=no - return_statement_check libmng.h 'const char * p_ver = mng_version_text()' '!p_ver || p_ver[0] == 0' -lmng -lz && _mng=yes + for mnglibs in '-lmng -lz' '-lmng -ljpeg -lz' ; do + return_statement_check libmng.h 'const char * p_ver = mng_version_text()' '!p_ver || p_ver[0] == 0' $mnglibs && _mng=yes + done fi echores "$_mng" if test "$_mng" = yes ; then def_mng='#define CONFIG_MNG 1' - extra_ldflags="$extra_ldflags -lmng -lz" + extra_ldflags="$extra_ldflags $mnglibs" vomodules="mng $vomodules" else def_mng='#undef CONFIG_MNG'

1 0

r35705 - trunk/gui/ui/main.c
by ib 22 Dec '12

22 Dec '12

Author: ib Date: Sat Dec 22 14:17:19 2012 New Revision: 35705 Log: Reset video window after STOP (MP command or evStop) has been pressed. Reset the video window as specified in the configuration file. Indirectly reported by Hans-Dieter Kosch, hdkosch kabelbw de. Modified: trunk/gui/ui/main.c Modified: trunk/gui/ui/main.c ============================================================================== --- trunk/gui/ui/main.c Sat Dec 22 12:21:35 2012 (r35704) +++ trunk/gui/ui/main.c Sat Dec 22 14:17:19 2012 (r35705) @@ -371,7 +371,7 @@ NoPause: break; } else if ( !guiApp.videoWindow.isFullScreen ) break; case evFullScreen: - if ( guiInfo.VideoWindow && guiInfo.Playing ) + if ( guiInfo.VideoWindow && ( guiInfo.Playing || !iparam ) ) { uiFullScreen(); if ( !guiApp.videoWindow.isFullScreen )

1 0

r35703 - trunk/configure
by cehoyos 22 Dec '12

22 Dec '12

Author: cehoyos Date: Sat Dec 22 11:53:51 2012 New Revision: 35703 Log: Fix compilation with current FFmpeg. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Fri Dec 21 06:18:50 2012 (r35702) +++ trunk/configure Sat Dec 22 11:53:51 2012 (r35703) @@ -8443,6 +8443,7 @@ CONFIG_MPEGVIDEOENC = yes CONFIG_RANGECODER = yes CONFIG_RDFT = yes CONFIG_SINEWIN = yes +CONFIG_VIDEODSP = yes CONFIG_VP3DSP = yes $mak_hardcoded_tables

1 0