November 2011 - MPlayer-cvslog - lists.mplayerhq.hu

r34307 - in trunk: etc/codecs.conf libmpdemux/mp_taglists.c
by reimar 05 Nov '11

05 Nov '11

Author: reimar Date: Sat Nov 5 23:18:13 2011 New Revision: 34307 Log: Restore NUV1 internal fourcc. Fixes playback of http://samples.mplayerhq.hu/nuv/nirvana.nuv Modified: trunk/etc/codecs.conf trunk/libmpdemux/mp_taglists.c Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Sat Nov 5 20:11:21 2011 (r34306) +++ trunk/etc/codecs.conf Sat Nov 5 23:18:13 2011 (r34307) @@ -469,7 +469,9 @@ videocodec mpegpes videocodec ffnuv info "NuppelVideo" status working - fourcc NUV1 ; former internal MPlayer FOURCC + fourcc NUV1 ; internal MPlayer FOURCC + ; note that RJPG is _not_ equivalent, + ; these are slightly different formats fourcc RJPG driver ffmpeg dll nuv Modified: trunk/libmpdemux/mp_taglists.c ============================================================================== --- trunk/libmpdemux/mp_taglists.c Sat Nov 5 20:11:21 2011 (r34306) +++ trunk/libmpdemux/mp_taglists.c Sat Nov 5 23:18:13 2011 (r34307) @@ -120,7 +120,7 @@ static const struct AVCodecTag mp_bmp_ta { CODEC_ID_MDEC, MKTAG('M', 'D', 'E', 'C')}, { CODEC_ID_MOTIONPIXELS, MKTAG('M', 'V', 'I', '1')}, { CODEC_ID_MXPEG, MKTAG('M', 'X', 'P', 'G')}, - { CODEC_ID_NUV, MKTAG('R', 'J', 'P', 'G')}, + { CODEC_ID_NUV, MKTAG('N', 'U', 'V', '1')}, { CODEC_ID_RL2, MKTAG('R', 'L', '2', 'V')}, { CODEC_ID_ROQ, MKTAG('R', 'o', 'Q', 'V')}, { CODEC_ID_RV10, MKTAG('R', 'V', '1', '0')},

1 0

r34306 - trunk/libmpcodecs/vd_ffmpeg.c
by reimar 05 Nov '11

05 Nov '11

Author: reimar Date: Sat Nov 5 20:11:21 2011 New Revision: 34306 Log: Improve support for reget_buffer, this fixes DR1 with C93 FFmpeg decoder. Modified: trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Sat Nov 5 19:38:56 2011 (r34305) +++ trunk/libmpcodecs/vd_ffmpeg.c Sat Nov 5 20:11:21 2011 (r34306) @@ -529,8 +529,8 @@ static int get_buffer(AVCodecContext *av int type= MP_IMGTYPE_IPB; int width= avctx->width; int height= avctx->height; - // special case to handle reget_buffer without buffer hints - if (pic->opaque && pic->data[0] && !pic->buffer_hints) + // special case to handle reget_buffer + if (pic->opaque && pic->data[0] && (!pic->buffer_hints || pic->buffer_hints & FF_BUFFER_HINTS_REUSABLE)) return 0; avcodec_align_dimensions(avctx, &width, &height); //printf("get_buffer %d %d %d\n", pic->reference, ctx->ip_count, ctx->b_count); @@ -541,16 +541,16 @@ static int get_buffer(AVCodecContext *av if (pic->buffer_hints & FF_BUFFER_HINTS_READABLE) flags |= MP_IMGFLAG_READABLE; if (pic->buffer_hints & FF_BUFFER_HINTS_PRESERVE) { - type = MP_IMGTYPE_STATIC; + type = MP_IMGTYPE_IP; flags |= MP_IMGFLAG_PRESERVE; } if (pic->buffer_hints & FF_BUFFER_HINTS_REUSABLE) { - type = MP_IMGTYPE_STATIC; + type = MP_IMGTYPE_IP; flags |= MP_IMGFLAG_PRESERVE; } flags|=(avctx->skip_idct<=AVDISCARD_DEFAULT && avctx->skip_frame<=AVDISCARD_DEFAULT && ctx->do_slices) ? MP_IMGFLAG_DRAW_CALLBACK:0; - mp_msg(MSGT_DECVIDEO, MSGL_DBG2, type == MP_IMGTYPE_STATIC ? "using STATIC\n" : "using TEMP\n"); + mp_msg(MSGT_DECVIDEO, MSGL_DBG2, type == MP_IMGTYPE_IP ? "using IP\n" : "using TEMP\n"); } else { if(!pic->reference){ ctx->b_count++;

1 0

r34305 - in trunk: etc/codecs.conf libmpdemux/mp_taglists.c
by cehoyos 05 Nov '11

05 Nov '11

Author: cehoyos Date: Sat Nov 5 19:38:56 2011 New Revision: 34305 Log: Support Chronomaster DFA decoding (bug 2006). Modified: trunk/etc/codecs.conf trunk/libmpdemux/mp_taglists.c Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Sat Nov 5 19:20:44 2011 (r34304) +++ trunk/etc/codecs.conf Sat Nov 5 19:38:56 2011 (r34305) @@ -3486,6 +3486,14 @@ videocodec ffc93 dll c93 out BGR8 +videocodec ffdfa + info "FFmpeg Chronomaster DFA" + status working + fourcc CDFA ; internal MPlayer FourCC + driver ffmpeg + dll dfa + out BGR8 + videocodec ffeatgv info "FFmpeg Electronic Arts TGV" status working Modified: trunk/libmpdemux/mp_taglists.c ============================================================================== --- trunk/libmpdemux/mp_taglists.c Sat Nov 5 19:20:44 2011 (r34304) +++ trunk/libmpdemux/mp_taglists.c Sat Nov 5 19:38:56 2011 (r34305) @@ -109,6 +109,7 @@ static const struct AVCodecTag mp_bmp_ta { CODEC_ID_BFI, MKTAG('B', 'F', 'I', 'V')}, { CODEC_ID_C93, MKTAG('C', '9', '3', 'V')}, { CODEC_ID_CDGRAPHICS, MKTAG('C', 'D', 'G', 'R')}, + { CODEC_ID_DFA, MKTAG('C', 'D', 'F', 'A')}, { CODEC_ID_DNXHD, MKTAG('A', 'V', 'd', 'n')}, { CODEC_ID_DSICINVIDEO, MKTAG('D', 'C', 'I', 'V')}, { CODEC_ID_DXA, MKTAG('D', 'X', 'A', '1')},

1 0

r34304 - in trunk/libmpcodecs: vd_ffmpeg.c vf.c
by reimar 05 Nov '11

05 Nov '11

Author: reimar Date: Sat Nov 5 19:20:44 2011 New Revision: 34304 Log: Fixes for palette allocation handling. Modified: trunk/libmpcodecs/vd_ffmpeg.c trunk/libmpcodecs/vf.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Sat Nov 5 17:35:50 2011 (r34303) +++ trunk/libmpcodecs/vd_ffmpeg.c Sat Nov 5 19:20:44 2011 (r34304) @@ -709,9 +709,6 @@ static void release_buffer(struct AVCode } if (mpi) { - // Palette support: free palette buffer allocated in get_buffer - if (mpi->bpp == 8) - av_freep(&mpi->planes[1]); // release mpi (in case MPI_IMGTYPE_NUMBERED is used, e.g. for VDPAU) mpi->usage_count--; } Modified: trunk/libmpcodecs/vf.c ============================================================================== --- trunk/libmpcodecs/vf.c Sat Nov 5 17:35:50 2011 (r34303) +++ trunk/libmpcodecs/vf.c Sat Nov 5 19:20:44 2011 (r34304) @@ -338,6 +338,7 @@ mp_image_t* vf_get_image(vf_instance_t* break; } if(mpi){ + int missing_palette = !(mpi->flags & MP_IMGFLAG_RGB_PALETTE) && (mp_imgflag & MP_IMGFLAG_RGB_PALETTE); mpi->type=mp_imgtype; mpi->w=vf->w; mpi->h=vf->h; // keep buffer allocation status & color flags only: @@ -346,12 +347,14 @@ mp_image_t* vf_get_image(vf_instance_t* // accept restrictions, draw_slice and palette flags only: mpi->flags|=mp_imgflag&(MP_IMGFLAGMASK_RESTRICTIONS|MP_IMGFLAG_DRAW_CALLBACK|MP_IMGFLAG_RGB_PALETTE); if(!vf->draw_slice) mpi->flags&=~MP_IMGFLAG_DRAW_CALLBACK; - if(mpi->width!=w2 || mpi->height!=h){ + if(mpi->width!=w2 || mpi->height!=h || missing_palette){ // printf("vf.c: MPI parameters changed! %dx%d -> %dx%d \n", mpi->width,mpi->height,w2,h); if(mpi->flags&MP_IMGFLAG_ALLOCATED){ - if(mpi->width<w2 || mpi->height<h){ + if(mpi->width<w2 || mpi->height<h || missing_palette){ // need to re-allocate buffer memory: - av_free(mpi->planes[0]); + av_freep(&mpi->planes[0]); + if (mpi->flags & MP_IMGFLAG_RGB_PALETTE) + av_freep(&mpi->planes[1]); mpi->flags&=~MP_IMGFLAG_ALLOCATED; mp_msg(MSGT_VFILTER,MSGL_V,"vf.c: have to REALLOCATE buffer memory :(\n"); }

1 0

r34303 - in trunk: DOCS/xml DOCS/xml/Makefile configure
by diego 05 Nov '11

05 Nov '11

Author: diego Date: Sat Nov 5 17:35:50 2011 New Revision: 34303 Log: build: Merge DOCS/xml/xml.mak into config.mak. Modified: trunk/DOCS/xml/ (props changed) trunk/configure Changes in other areas also in this revision: Modified: trunk/DOCS/xml/Makefile Modified: trunk/configure ============================================================================== --- trunk/configure Sat Nov 5 14:47:51 2011 (r34302) +++ trunk/configure Sat Nov 5 17:35:50 2011 (r34303) @@ -7930,12 +7930,6 @@ if xsltproc --version > /dev/null 2>&1; fi fi -cat > DOCS/xml/xml.mak << EOF -CATALOG = $catalog -XMLLINT_COMMAND = xmllint --noout --noent --postvalid $catalog_opts \$* -XSLT_COMMAND = $xsltcommand -EOF - ############################################################################# mak_enable () { @@ -7965,6 +7959,10 @@ DOC_LANG_ALL = $doc_lang_all MAN_LANGS = $language_man MAN_LANG_ALL = $man_lang_all +CATALOG = $catalog +XMLLINT_COMMAND = xmllint --noout --noent --postvalid $catalog_opts \$* +XSLT_COMMAND = $xsltcommand + prefix = \$(DESTDIR)$_prefix BINDIR = \$(DESTDIR)$_bindir DATADIR = \$(DESTDIR)$_datadir

1 0

r34301 - trunk/fmt-conversion.c
by diego 04 Nov '11

04 Nov '11

Author: diego Date: Fri Nov 4 16:22:51 2011 New Revision: 34301 Log: fmt_conversion: surround PIX_FMT_GBR24P by #ifdefs to ensure availability Modified: trunk/fmt-conversion.c Modified: trunk/fmt-conversion.c ============================================================================== --- trunk/fmt-conversion.c Fri Nov 4 15:29:33 2011 (r34300) +++ trunk/fmt-conversion.c Fri Nov 4 16:22:51 2011 (r34301) @@ -57,7 +57,9 @@ static const struct { {IMGFMT_RGB8, PIX_FMT_BGR8}, {IMGFMT_RGB4, PIX_FMT_BGR4}, {IMGFMT_BGR8, PIX_FMT_PAL8}, +#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 20, 1) {IMGFMT_GBR24P, PIX_FMT_GBR24P}, +#endif {IMGFMT_YUY2, PIX_FMT_YUYV422}, {IMGFMT_UYVY, PIX_FMT_UYVY422}, {IMGFMT_NV12, PIX_FMT_NV12},

1 0

r34300 - trunk/configure
by diego 04 Nov '11

04 Nov '11

Author: diego Date: Fri Nov 4 15:29:33 2011 New Revision: 34300 Log: configure: Remove unused alsa9 and alsa1x config.h #defines. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Fri Nov 4 15:29:31 2011 (r34299) +++ trunk/configure Fri Nov 4 15:29:33 2011 (r34300) @@ -5498,8 +5498,6 @@ if test "$_alsa" != no ; then fi def_alsa='#undef CONFIG_ALSA' def_alsa5='#undef CONFIG_ALSA5' -def_alsa9='#undef CONFIG_ALSA9' -def_alsa1x='#undef CONFIG_ALSA1X' def_sys_asoundlib_h='#undef HAVE_SYS_ASOUNDLIB_H' def_alsa_asoundlib_h='#undef HAVE_ALSA_ASOUNDLIB_H' if test "$_alsaver" ; then @@ -5514,28 +5512,24 @@ if test "$_alsaver" ; then _alsa9=yes aomodules="alsa $aomodules" def_alsa='#define CONFIG_ALSA 1' - def_alsa9='#define CONFIG_ALSA9 1' def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' res_comment="using alsa 0.9.x and sys/asoundlib.h" elif test "$_alsaver" = '0.9.x-alsa' ; then _alsa9=yes aomodules="alsa $aomodules" def_alsa='#define CONFIG_ALSA 1' - def_alsa9='#define CONFIG_ALSA9 1' def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1' res_comment="using alsa 0.9.x and alsa/asoundlib.h" elif test "$_alsaver" = '1.0.x-sys' ; then _alsa1x=yes aomodules="alsa $aomodules" def_alsa='#define CONFIG_ALSA 1' - def_alsa1x="#define CONFIG_ALSA1X 1" def_alsa_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' res_comment="using alsa 1.0.x and sys/asoundlib.h" elif test "$_alsaver" = '1.0.x-alsa' ; then _alsa1x=yes aomodules="alsa $aomodules" def_alsa='#define CONFIG_ALSA 1' - def_alsa1x="#define CONFIG_ALSA1X 1" def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1' res_comment="using alsa 1.0.x and alsa/asoundlib.h" else @@ -8511,9 +8505,7 @@ $def_xshape /* Audio output drivers */ $def_alsa -$def_alsa1x $def_alsa5 -$def_alsa9 $def_arts $def_coreaudio $def_dart

1 0

r34299 - trunk/configure
by diego 04 Nov '11

04 Nov '11

Author: diego Date: Fri Nov 4 15:29:31 2011 New Revision: 34299 Log: configure: remove erroneous extra set of braces from vsscanf test POSIX does not make any promises about the layout of va_list. Thus initializing it with extra braces might fail to compile on systems with perfectly fine vsscanf support. Skip the initialization instead, which also avoids warnings. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Fri Nov 4 13:30:42 2011 (r34298) +++ trunk/configure Fri Nov 4 15:29:31 2011 (r34299) @@ -3843,7 +3843,7 @@ cat > $TMPC << EOF #define _ISOC99_SOURCE #include <stdarg.h> #include <stdio.h> -int main(void) { va_list ap = { { 0 } }; vsscanf("foo", "bar", ap); return 0; } +int main(void) { va_list ap; vsscanf("foo", "bar", ap); return 0; } EOF cc_check || { vsscanf=no ; def_vsscanf='#undef HAVE_VSSCANF' ; } echores "$vsscanf"

1 0

r34298 - trunk/libmpcodecs/vf_zrmjpeg.c
by diego 04 Nov '11

04 Nov '11

Author: diego Date: Fri Nov 4 13:30:42 2011 New Revision: 34298 Log: vf_zrmjpeg: fix compilation after introduction of av_strcasecmp Modified: trunk/libmpcodecs/vf_zrmjpeg.c Modified: trunk/libmpcodecs/vf_zrmjpeg.c ============================================================================== --- trunk/libmpcodecs/vf_zrmjpeg.c Fri Nov 4 13:30:39 2011 (r34297) +++ trunk/libmpcodecs/vf_zrmjpeg.c Fri Nov 4 13:30:42 2011 (r34298) @@ -53,6 +53,7 @@ #undef malloc #undef free +#undef strcasecmp /* some convenient #define's, is this portable enough? */ /// Printout with vf_zrmjpeg: prefix at VERBOSE level

1 0

r34297 - trunk/configure
by diego 04 Nov '11

04 Nov '11

Author: diego Date: Fri Nov 4 13:30:39 2011 New Revision: 34297 Log: configure: Add CONFIG_LIBMODPLUG to config.h for FFmpeg. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Fri Nov 4 13:30:36 2011 (r34296) +++ trunk/configure Fri Nov 4 13:30:39 2011 (r34297) @@ -8721,6 +8721,7 @@ $def_yasm #define CONFIG_FFSERVER 0 #define CONFIG_GPL 1 #define CONFIG_GRAY 0 +#define CONFIG_LIBMODPLUG 0 #define CONFIG_LIBVORBIS 0 #define CONFIG_POWERPC_PERF 0 #define CONFIG_SHARED 0

1 0