October 2010 - ffmpeg-cvslog - lists.ffmpeg.org

r18533 - trunk/libavcodec/h264.c
by subversion＠mplayerhq.hu 10 Jan '11

10 Jan '11

Author: michael Date: Thu Apr 16 06:46:44 2009 New Revision: 18533 Log: Support broken avc nal encapsulation. Fixes issue987. Modified: trunk/libavcodec/h264.c Modified: trunk/libavcodec/h264.c ============================================================================== --- trunk/libavcodec/h264.c Thu Apr 16 04:28:49 2009 (r18532) +++ trunk/libavcodec/h264.c Thu Apr 16 06:46:44 2009 (r18533) @@ -7461,6 +7461,7 @@ static int decode_nal_units(H264Context int buf_index=0; H264Context *hx; ///< thread context int context_count = 0; + int next_avc= h->is_avc ? 0 : buf_size; h->max_contexts = avctx->thread_count; #if 0 @@ -7484,7 +7485,7 @@ static int decode_nal_units(H264Context int i, nalsize = 0; int err; - if(h->is_avc) { + if(buf_index >= next_avc) { if(buf_index >= buf_size) break; nalsize = 0; for(i = 0; i < h->nal_length_size; i++) @@ -7498,6 +7499,7 @@ static int decode_nal_units(H264Context break; } } + next_avc= buf_index + nalsize; } else { // start code prefix search for(; buf_index + 3 < buf_size; buf_index++){ @@ -7513,7 +7515,7 @@ static int decode_nal_units(H264Context hx = h->thread_context[context_count]; - ptr= ff_h264_decode_nal(hx, buf + buf_index, &dst_length, &consumed, h->is_avc ? nalsize : buf_size - buf_index); + ptr= ff_h264_decode_nal(hx, buf + buf_index, &dst_length, &consumed, next_avc - buf_index); if (ptr==NULL || dst_length < 0){ return -1; } @@ -7525,13 +7527,12 @@ static int decode_nal_units(H264Context av_log(h->s.avctx, AV_LOG_DEBUG, "NAL %d at %d/%d length %d\n", hx->nal_unit_type, buf_index, buf_size, dst_length); } - if (h->is_avc && (nalsize != consumed)){ + if (h->is_avc && (nalsize != consumed) && nalsize){ int i, debug_level = AV_LOG_DEBUG; for (i = consumed; i < nalsize; i++) if (buf[buf_index+i]) debug_level = AV_LOG_ERROR; av_log(h->s.avctx, debug_level, "AVC: Consumed only %d bytes instead of %d\n", consumed, nalsize); - consumed= nalsize; } buf_index += consumed;

3 7

r24645 - in trunk: Makefile tests/lavfi-regression.sh
by subversion＠mplayerhq.hu 29 Dec '10

29 Dec '10

Author: stefano Date: Sun Aug 1 12:27:04 2010 New Revision: 24645 Log: Fix fate-lavfi-pixfmts test cross-compilation. Add the lavfi-showfiltfmts dependency in the Makefile, and correctly use the $target_exec and $target_path variables for invoking the lavfi-showfiltfmts tool. Modified: trunk/Makefile trunk/tests/lavfi-regression.sh Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sun Aug 1 12:27:00 2010 (r24644) +++ trunk/Makefile Sun Aug 1 12:27:04 2010 (r24645) @@ -226,6 +226,9 @@ tests/data/asynth1.sw tests/vsynth%/00.p tests/seek_test$(EXESUF): tests/seek_test.o $(FF_DEP_LIBS) $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS) +tools/lavfi-showfiltfmts$(EXESUF): tools/lavfi-showfiltfmts.o $(FF_DEP_LIBS) + $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS) + include $(SRC_PATH_BARE)/tests/fate.mak include $(SRC_PATH_BARE)/tests/fate2.mak @@ -248,7 +251,7 @@ FATE = $(FATE_ACODEC) $(FATE_ACODEC): $(AREF) $(FATE_VCODEC): $(VREF) $(FATE_LAVF): $(REFS) -$(FATE_LAVFI): $(REFS) +$(FATE_LAVFI): $(REFS) tools/lavfi-showfiltfmts$(EXESUF) $(FATE_SEEK): fate-codec fate-lavf tests/seek_test$(EXESUF) $(FATE_ACODEC): CMD = codectest acodec Modified: trunk/tests/lavfi-regression.sh ============================================================================== --- trunk/tests/lavfi-regression.sh Sun Aug 1 12:27:00 2010 (r24644) +++ trunk/tests/lavfi-regression.sh Sun Aug 1 12:27:04 2010 (r24645) @@ -66,15 +66,16 @@ vflip " if [ -n "$do_pixfmts_be" ] || [ -n "$do_pixfmts_le" ]; then + showfiltfmts="$target_exec $target_path/tools/lavfi-showfiltfmts" # exclude pixel formats which are not supported as input excluded_pix_fmts="$($ffmpeg -pix_fmts list 2>/dev/null | sed -ne '9,$p' | grep '^\..\.' | cut -d' ' -f2)" - scale_out_pix_fmts=$(tools/lavfi-showfiltfmts scale | grep "^OUTPUT" | cut -d: -f2) + scale_out_pix_fmts=$($showfiltfmts scale | grep "^OUTPUT" | cut -d: -f2) scale_out_pix_fmts=$(get_exclusive_elements "$scale_out_pix_fmts" "$excluded_pix_fmts") for filter_args in $filters_args; do filter=$(echo $filter_args | sed -e 's/$[^=]\+$=.*/\1/') - in_pix_fmts=$(tools/lavfi-showfiltfmts $filter | grep "^INPUT" | cut -d: -f2) + in_pix_fmts=$($showfiltfmts $filter | grep "^INPUT" | cut -d: -f2) pix_fmts=$(get_common_elements "$in_pix_fmts" "$scale_out_pix_fmts") for pix_fmt in $pix_fmts; do

3 2

r15641 - trunk/libavformat/utils.c
by subversion＠mplayerhq.hu 23 Dec '10

23 Dec '10

Author: michael Date: Sun Oct 19 03:02:48 2008 New Revision: 15641 Log: Check for pts==dts on I/P frames in the presence of non low delay decoding and discard these invalid timestamps. fixes issue171. Modified: trunk/libavformat/utils.c Modified: trunk/libavformat/utils.c ============================================================================== --- trunk/libavformat/utils.c (original) +++ trunk/libavformat/utils.c Sun Oct 19 03:02:48 2008 @@ -838,6 +838,14 @@ static void compute_pkt_fields(AVFormatC pkt->dts -= 1LL<<st->pts_wrap_bits; } + // some mpeg2 in mpeg-ps lack dts (issue171 / input_file.mpg) + // we take the conservative approach and discard both + // Note, if this is misbehaving for a H.264 file then possibly presentation_delayed is not set correctly. + if(delay==1 && pkt->dts == pkt->pts && pkt->dts != AV_NOPTS_VALUE && presentation_delayed){ + av_log(s, AV_LOG_ERROR, "invalid dts/pts combination\n"); + pkt->dts= pkt->pts= AV_NOPTS_VALUE; + } + if (pkt->duration == 0) { compute_frame_duration(&num, &den, st, pc, pkt); if (den && num) {

2 1

r20814 - trunk/libavcodec/mpeg12.c
by subversion＠mplayerhq.hu 15 Dec '10

15 Dec '10

Author: michael Date: Sat Dec 12 20:44:01 2009 New Revision: 20814 Log: Be less picky on invalid invalid frame_pred_frame_dct values. Fixed issue1615. Modified: trunk/libavcodec/mpeg12.c Modified: trunk/libavcodec/mpeg12.c ============================================================================== --- trunk/libavcodec/mpeg12.c Sat Dec 12 20:15:56 2009 (r20813) +++ trunk/libavcodec/mpeg12.c Sat Dec 12 20:44:01 2009 (r20814) @@ -1557,7 +1557,7 @@ static void mpeg_decode_picture_coding_e s->picture_structure= PICT_FRAME; } - if(s->progressive_frame && !s->frame_pred_frame_dct){ + if(s->progressive_sequence && !s->frame_pred_frame_dct){ av_log(s->avctx, AV_LOG_ERROR, "invalid frame_pred_frame_dct\n"); s->frame_pred_frame_dct= 1; }

3 3

r25017 - in trunk/tests: codec-regression.sh ref/vsynth1/qtrle ref/vsynth2/qtrle
by subversion＠mplayerhq.hu 14 Dec '10

14 Dec '10

Author: vitor Date: Wed Sep 1 14:38:36 2010 New Revision: 25017 Log: QTRLE regtest Added: trunk/tests/ref/vsynth1/qtrle trunk/tests/ref/vsynth2/qtrle Modified: trunk/tests/codec-regression.sh Modified: trunk/tests/codec-regression.sh ============================================================================== --- trunk/tests/codec-regression.sh Wed Sep 1 12:26:28 2010 (r25016) +++ trunk/tests/codec-regression.sh Wed Sep 1 14:38:36 2010 (r25017) @@ -248,6 +248,11 @@ do_video_encoding roqav.roq "" "-vframes do_video_decoding "" "-pix_fmt yuv420p" fi +if [ -n "$do_qtrle" ] ; then +do_video_encoding qtrle.mov "" "" +do_video_decoding "" "" +fi + if [ -n "$do_rgb" ] ; then do_video_encoding rgb.avi "" "-an -vcodec rawvideo -pix_fmt bgr24" do_video_decoding "" "-pix_fmt yuv420p" Added: trunk/tests/ref/vsynth1/qtrle ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/tests/ref/vsynth1/qtrle Wed Sep 1 14:38:36 2010 (r25017) @@ -0,0 +1,4 @@ +3f070779d7deb54626515ac7f7002e63 *./tests/data/vsynth1/qtrle.mov +387772 ./tests/data/vsynth1/qtrle.mov +a3c2610e2c069c3ad22ec03da83f774f *./tests/data/qtrle.vsynth1.out.yuv +stddev: 15.14 PSNR: 24.53 MAXDIFF: 174 bytes: 7603200/ 7603200 Added: trunk/tests/ref/vsynth2/qtrle ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/tests/ref/vsynth2/qtrle Wed Sep 1 14:38:36 2010 (r25017) @@ -0,0 +1,4 @@ +5346bba8e03e7de72b482efbcf712a2e *./tests/data/vsynth2/qtrle.mov +141533 ./tests/data/vsynth2/qtrle.mov +f967b290c7e6d015c0e78175db828249 *./tests/data/qtrle.vsynth2.out.yuv +stddev: 5.75 PSNR: 32.93 MAXDIFF: 92 bytes: 7603200/ 7603200

2 1

r25620 - trunk/libavcodec/x86/lpc_mmx.c
by subversion＠mplayerhq.hu 31 Oct '10

31 Oct '10

Author: ramiro Date: Mon Nov 1 00:37:15 2010 New Revision: 25620 Log: lpc_mmx: add xmm registers to clobber list Modified: trunk/libavcodec/x86/lpc_mmx.c Modified: trunk/libavcodec/x86/lpc_mmx.c ============================================================================== --- trunk/libavcodec/x86/lpc_mmx.c Mon Nov 1 00:36:26 2010 (r25619) +++ trunk/libavcodec/x86/lpc_mmx.c Mon Nov 1 00:37:15 2010 (r25620) @@ -62,6 +62,8 @@ static void apply_welch_window_sse2(cons "3: \n\t" :"+&r"(i), "+&r"(j) :"r"(w_data+n2), "r"(data+n2), "m"(c), "r"(len) + XMM_CLOBBERS_ONLY("%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm5", "%xmm6", "%xmm7") ); #undef WELCH }

1 0

r25619 - trunk/libavcodec/x86/lpc_mmx.c
by subversion＠mplayerhq.hu 31 Oct '10

31 Oct '10

Author: ramiro Date: Mon Nov 1 00:36:26 2010 New Revision: 25619 Log: lpc_mmx: merge some asm blocks These blocks depended on the compiler keeping xmm registers untouched between them. Modified: trunk/libavcodec/x86/lpc_mmx.c Modified: trunk/libavcodec/x86/lpc_mmx.c ============================================================================== --- trunk/libavcodec/x86/lpc_mmx.c Sun Oct 31 23:48:44 2010 (r25618) +++ trunk/libavcodec/x86/lpc_mmx.c Mon Nov 1 00:36:26 2010 (r25619) @@ -29,16 +29,15 @@ static void apply_welch_window_sse2(cons x86_reg i = -n2*sizeof(int32_t); x86_reg j = n2*sizeof(int32_t); __asm__ volatile( - "movsd %0, %%xmm7 \n\t" + "movsd %4, %%xmm7 \n\t" "movapd "MANGLE(ff_pd_1)", %%xmm6 \n\t" "movapd "MANGLE(ff_pd_2)", %%xmm5 \n\t" "movlhps %%xmm7, %%xmm7 \n\t" "subpd %%xmm5, %%xmm7 \n\t" "addsd %%xmm6, %%xmm7 \n\t" - ::"m"(c) - ); + "test $1, %5 \n\t" + "jz 2f \n\t" #define WELCH(MOVPD, offset)\ - __asm__ volatile(\ "1: \n\t"\ "movapd %%xmm7, %%xmm1 \n\t"\ "mulpd %%xmm1, %%xmm1 \n\t"\ @@ -55,13 +54,15 @@ static void apply_welch_window_sse2(cons "sub $8, %1 \n\t"\ "add $8, %0 \n\t"\ "jl 1b \n\t"\ - :"+&r"(i), "+&r"(j)\ - :"r"(w_data+n2), "r"(data+n2)\ - ); - if(len&1) + WELCH("movupd", -1) - else + "jmp 3f \n\t" + "2: \n\t" WELCH("movapd", -2) + "3: \n\t" + :"+&r"(i), "+&r"(j) + :"r"(w_data+n2), "r"(data+n2), "m"(c), "r"(len) + ); #undef WELCH }

1 0

r25618 - trunk/ffmpeg.c
by subversion＠mplayerhq.hu 31 Oct '10

31 Oct '10

Author: stefano Date: Sun Oct 31 23:48:44 2010 New Revision: 25618 Log: Use AV_RL32() in opt_codec_tag(). Modified: trunk/ffmpeg.c Modified: trunk/ffmpeg.c ============================================================================== --- trunk/ffmpeg.c Sun Oct 31 22:20:20 2010 (r25617) +++ trunk/ffmpeg.c Sun Oct 31 23:48:44 2010 (r25618) @@ -39,6 +39,7 @@ #include "libavcore/parseutils.h" #include "libavutil/colorspace.h" #include "libavutil/fifo.h" +#include "libavutil/intreadwrite.h" #include "libavutil/pixdesc.h" #include "libavutil/avstring.h" #include "libavutil/libm.h" @@ -2868,7 +2869,7 @@ static int opt_codec_tag(const char *opt *codec_tag = strtol(arg, &tail, 0); if (!tail || *tail) - *codec_tag = arg[0] + (arg[1]<<8) + (arg[2]<<16) + (arg[3]<<24); + *codec_tag = AV_RL32(arg); return 0; }

1 0

r25617 - trunk/libavcodec/x86/motion_est_mmx.c
by subversion＠mplayerhq.hu 31 Oct '10

31 Oct '10

Author: ramiro Date: Sun Oct 31 22:20:20 2010 New Revision: 25617 Log: sad16_sse2: merge 2 asm blocks Modified: trunk/libavcodec/x86/motion_est_mmx.c Modified: trunk/libavcodec/x86/motion_est_mmx.c ============================================================================== --- trunk/libavcodec/x86/motion_est_mmx.c Sun Oct 31 20:55:13 2010 (r25616) +++ trunk/libavcodec/x86/motion_est_mmx.c Sun Oct 31 22:20:20 2010 (r25617) @@ -98,23 +98,20 @@ static int sad16_sse2(void *v, uint8_t * ASMALIGN(4) "1: \n\t" "movdqu (%1), %%xmm0 \n\t" - "movdqu (%1, %3), %%xmm1 \n\t" + "movdqu (%1, %4), %%xmm1 \n\t" "psadbw (%2), %%xmm0 \n\t" - "psadbw (%2, %3), %%xmm1 \n\t" + "psadbw (%2, %4), %%xmm1 \n\t" "paddw %%xmm0, %%xmm2 \n\t" "paddw %%xmm1, %%xmm2 \n\t" - "lea (%1,%3,2), %1 \n\t" - "lea (%2,%3,2), %2 \n\t" + "lea (%1,%4,2), %1 \n\t" + "lea (%2,%4,2), %2 \n\t" "sub $2, %0 \n\t" " jg 1b \n\t" - : "+r" (h), "+r" (blk1), "+r" (blk2) - : "r" ((x86_reg)stride) - ); - __asm__ volatile( "movhlps %%xmm2, %%xmm0 \n\t" "paddw %%xmm0, %%xmm2 \n\t" - "movd %%xmm2, %0 \n\t" - : "=r"(ret) + "movd %%xmm2, %3 \n\t" + : "+r" (h), "+r" (blk1), "+r" (blk2), "=r"(ret) + : "r" ((x86_reg)stride) ); return ret; }

1 0

r25596 - trunk/ffmpeg.c
by subversion＠mplayerhq.hu 31 Oct '10

31 Oct '10

Author: stefano Date: Thu Oct 28 15:20:26 2010 New Revision: 25596 Log: Factorize: opt_{audio,video,subtitle}_tag() -> opt_codec_tag(). Modified: trunk/ffmpeg.c Modified: trunk/ffmpeg.c ============================================================================== --- trunk/ffmpeg.c Thu Oct 28 14:15:50 2010 (r25595) +++ trunk/ffmpeg.c Thu Oct 28 15:20:26 2010 (r25596) @@ -2819,24 +2819,6 @@ static void opt_audio_codec(const char * opt_codec(&audio_stream_copy, &audio_codec_name, AVMEDIA_TYPE_AUDIO, arg); } -static void opt_audio_tag(const char *arg) -{ - char *tail; - audio_codec_tag= strtol(arg, &tail, 0); - - if(!tail || *tail) - audio_codec_tag= arg[0] + (arg[1]<<8) + (arg[2]<<16) + (arg[3]<<24); -} - -static void opt_video_tag(const char *arg) -{ - char *tail; - video_codec_tag= strtol(arg, &tail, 0); - - if(!tail || *tail) - video_codec_tag= arg[0] + (arg[1]<<8) + (arg[2]<<16) + (arg[3]<<24); -} - static void opt_video_codec(const char *arg) { opt_codec(&video_stream_copy, &video_codec_name, AVMEDIA_TYPE_VIDEO, arg); @@ -2847,13 +2829,18 @@ static void opt_subtitle_codec(const cha opt_codec(&subtitle_stream_copy, &subtitle_codec_name, AVMEDIA_TYPE_SUBTITLE, arg); } -static void opt_subtitle_tag(const char *arg) +static void opt_codec_tag(const char *opt, const char *arg) { char *tail; - subtitle_codec_tag= strtol(arg, &tail, 0); + uint32_t *codec_tag; - if(!tail || *tail) - subtitle_codec_tag= arg[0] + (arg[1]<<8) + (arg[2]<<16) + (arg[3]<<24); + codec_tag = !strcmp(opt, "atag") ? &audio_codec_tag : + !strcmp(opt, "vtag") ? &video_codec_tag : + !strcmp(opt, "stag") ? &subtitle_codec_tag : NULL; + + *codec_tag = strtol(arg, &tail, 0); + if (!tail || *tail) + *codec_tag = arg[0] + (arg[1]<<8) + (arg[2]<<16) + (arg[3]<<24); } static void opt_map(const char *arg) @@ -4124,7 +4111,7 @@ static const OptionDef options[] = { { "inter_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_inter_matrix}, "specify inter matrix coeffs", "matrix" }, { "top", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_top_field_first}, "top=1/bottom=0/auto=-1 field first", "" }, { "dc", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&intra_dc_precision}, "intra_dc_precision", "precision" }, - { "vtag", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_video_tag}, "force video tag/fourcc", "fourcc/tag" }, + { "vtag", OPT_FUNC2 | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_codec_tag}, "force video tag/fourcc", "fourcc/tag" }, { "newvideo", OPT_VIDEO | OPT_FUNC2, {(void*)opt_new_stream}, "add a new video stream to the current output stream" }, { "vlang", HAS_ARG | OPT_STRING | OPT_VIDEO, {(void *)&video_language}, "set the ISO 639 language code (3 letters) of the current video stream" , "code" }, { "qphist", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, { (void *)&qp_hist }, "show QP histogram" }, @@ -4140,7 +4127,7 @@ static const OptionDef options[] = { { "ac", HAS_ARG | OPT_FUNC2 | OPT_AUDIO, {(void*)opt_audio_channels}, "set number of audio channels", "channels" }, { "an", OPT_BOOL | OPT_AUDIO, {(void*)&audio_disable}, "disable audio" }, { "acodec", HAS_ARG | OPT_AUDIO, {(void*)opt_audio_codec}, "force audio codec ('copy' to copy stream)", "codec" }, - { "atag", HAS_ARG | OPT_EXPERT | OPT_AUDIO, {(void*)opt_audio_tag}, "force audio tag/fourcc", "fourcc/tag" }, + { "atag", OPT_FUNC2 | HAS_ARG | OPT_EXPERT | OPT_AUDIO, {(void*)opt_codec_tag}, "force audio tag/fourcc", "fourcc/tag" }, { "vol", OPT_INT | HAS_ARG | OPT_AUDIO, {(void*)&audio_volume}, "change audio volume (256=normal)" , "volume" }, // { "newaudio", OPT_AUDIO | OPT_FUNC2, {(void*)opt_new_stream}, "add a new audio stream to the current output stream" }, { "alang", HAS_ARG | OPT_STRING | OPT_AUDIO, {(void *)&audio_language}, "set the ISO 639 language code (3 letters) of the current audio stream" , "code" }, @@ -4151,7 +4138,7 @@ static const OptionDef options[] = { { "scodec", HAS_ARG | OPT_SUBTITLE, {(void*)opt_subtitle_codec}, "force subtitle codec ('copy' to copy stream)", "codec" }, { "newsubtitle", OPT_SUBTITLE | OPT_FUNC2, {(void*)opt_new_stream}, "add a new subtitle stream to the current output stream" }, { "slang", HAS_ARG | OPT_STRING | OPT_SUBTITLE, {(void *)&subtitle_language}, "set the ISO 639 language code (3 letters) of the current subtitle stream" , "code" }, - { "stag", HAS_ARG | OPT_EXPERT | OPT_SUBTITLE, {(void*)opt_subtitle_tag}, "force subtitle tag/fourcc", "fourcc/tag" }, + { "stag", OPT_FUNC2 | HAS_ARG | OPT_EXPERT | OPT_SUBTITLE, {(void*)opt_codec_tag}, "force subtitle tag/fourcc", "fourcc/tag" }, /* grab options */ { "vc", HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_GRAB, {(void*)opt_video_channel}, "set video grab channel (DV1394 only)", "channel" },

3 3