February 2012 - ffmpeg-cvslog

adpcmenc: fix adpcm_ms extradata allocation
by git＠videolan.org 01 Feb '12

01 Feb '12

ffmpeg | branch: master | Justin Ruggles <justin.ruggles(a)gmail.com> | Mon Jan 30 13:15:18 2012 -0500| [dd88ae831a3e703ec48b28a3b28e96567eab605f] | committer: Justin Ruggles adpcmenc: fix adpcm_ms extradata allocation Add FF_INPUT_BUFFER_PADDING_SIZE. If allocation fails, also free memory which was allocated previously in adpcm_encode_init(). > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dd88ae831a3e703ec… --- libavcodec/adpcmenc.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index f0f8c1f..706c504 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -110,10 +110,10 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx) avctx->frame_size = (BLKSIZE - 7 * avctx->channels) * 2 / avctx->channels + 2; avctx->block_align = BLKSIZE; + if (!(avctx->extradata = av_malloc(32 + FF_INPUT_BUFFER_PADDING_SIZE))) + goto error; avctx->extradata_size = 32; - extradata = avctx->extradata = av_malloc(avctx->extradata_size); - if (!extradata) - return AVERROR(ENOMEM); + extradata = avctx->extradata; bytestream_put_le16(&extradata, avctx->frame_size); bytestream_put_le16(&extradata, 7); /* wNumCoef */ for (i = 0; i < 7; i++) {

1 0

adpcmenc: Do not set coded_frame->key_frame.
by git＠videolan.org 01 Feb '12

01 Feb '12

ffmpeg | branch: master | Justin Ruggles <justin.ruggles(a)gmail.com> | Mon Jan 30 12:57:34 2012 -0500| [ddf70db6d71fdab15bf8626aea4301b85891c2bd] | committer: Justin Ruggles adpcmenc: Do not set coded_frame->key_frame. It is already set in avcodec_alloc_frame(). > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ddf70db6d71fdab15… --- libavcodec/adpcmenc.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 9697f82..9cf1e391 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -136,7 +136,6 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx) } avctx->coded_frame = avcodec_alloc_frame(); - avctx->coded_frame->key_frame= 1; return 0; error:

1 0

adpcmenc: check for coded_frame allocation failure
by git＠videolan.org 01 Feb '12

01 Feb '12

ffmpeg | branch: master | Justin Ruggles <justin.ruggles(a)gmail.com> | Mon Jan 30 13:03:01 2012 -0500| [cb023d9afe9da0a9d221b5eeddd2981c520b5978] | committer: Justin Ruggles adpcmenc: check for coded_frame allocation failure > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cb023d9afe9da0a9d… --- libavcodec/adpcmenc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 9cf1e391..26d673d 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -135,7 +135,8 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx) goto error; } - avctx->coded_frame = avcodec_alloc_frame(); + if (!(avctx->coded_frame = avcodec_alloc_frame())) + goto error; return 0; error:

1 0

mpc7: check for allocation failure
by git＠videolan.org 01 Feb '12

01 Feb '12

ffmpeg | branch: master | Justin Ruggles <justin.ruggles(a)gmail.com> | Mon Jan 30 14:33:01 2012 -0500| [3c4add27f7513f435e9daa03643fd992d5f6bcee] | committer: Justin Ruggles mpc7: check for allocation failure > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3c4add27f7513f435… --- libavcodec/mpc7.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libavcodec/mpc7.c b/libavcodec/mpc7.c index 8bc0853..6b6bffe 100644 --- a/libavcodec/mpc7.c +++ b/libavcodec/mpc7.c @@ -224,6 +224,8 @@ static int mpc7_decode_frame(AVCodecContext * avctx, void *data, } bits = av_malloc(((buf_size - 1) & ~3) + FF_INPUT_BUFFER_PADDING_SIZE); + if (!bits) + return AVERROR(ENOMEM); c->dsp.bswap_buf((uint32_t*)bits, (const uint32_t*)(buf + 4), (buf_size - 4) >> 2); init_get_bits(&gb, bits, (buf_size - 4)* 8); skip_bits_long(&gb, buf[0]);

1 0

mpc7: align local temp buffer
by git＠videolan.org 01 Feb '12

01 Feb '12

ffmpeg | branch: master | Justin Ruggles <justin.ruggles(a)gmail.com> | Mon Jan 30 14:29:05 2012 -0500| [eac31dd163cd9168860aeed88112455cb44cc4f1] | committer: Justin Ruggles mpc7: align local temp buffer DSPContext.bswap_buf() requires aligned output > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eac31dd163cd91688… --- libavcodec/mpc7.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavcodec/mpc7.c b/libavcodec/mpc7.c index 290ecfb..8bc0853 100644 --- a/libavcodec/mpc7.c +++ b/libavcodec/mpc7.c @@ -53,7 +53,7 @@ static av_cold int mpc7_decode_init(AVCodecContext * avctx) int i, j; MPCContext *c = avctx->priv_data; GetBitContext gb; - uint8_t buf[16]; + LOCAL_ALIGNED_16(uint8_t, buf, [16]); static int vlc_initialized = 0; static VLC_TYPE scfi_table[1 << MPC7_SCFI_BITS][2];

1 0

rv40: x86 SIMD for biweight
by git＠videolan.org 01 Feb '12

01 Feb '12

ffmpeg | branch: master | Christophe Gisquet <christophe.gisquet(a)gmail.com> | Thu Jan 12 00:11:15 2012 +0100| [e5c9de2ab78cf18636eac2fa8e059e58a71e512b] | committer: Diego Biurrun rv40: x86 SIMD for biweight Provide MMX, SSE2 and SSSE3 versions, with a fast-path when the weights are multiples of 512 (which is often the case when the values round up nicely). *_TIMER report for the 16x16 and 8x8 cases: C: 9015 decicycles in 16, 524257 runs, 31 skips 2656 decicycles in 8, 524271 runs, 17 skips MMX: 4156 decicycles in 16, 262090 runs, 54 skips 1206 decicycles in 8, 262131 runs, 13 skips MMX on fast-path: 2760 decicycles in 16, 524222 runs, 66 skips 995 decicycles in 8, 524252 runs, 36 skips SSE2: 2163 decicycles in 16, 262131 runs, 13 skips 832 decicycles in 8, 262137 runs, 7 skips SSE2 with fast path: 1783 decicycles in 16, 524276 runs, 12 skips 711 decicycles in 8, 524283 runs, 5 skips SSSE3: 2117 decicycles in 16, 262136 runs, 8 skips 814 decicycles in 8, 262143 runs, 1 skips SSSE3 with fast path: 1315 decicycles in 16, 524285 runs, 3 skips 578 decicycles in 8, 524286 runs, 2 skips This means around a 4% speedup for some sequences. Signed-off-by: Diego Biurrun <diego(a)biurrun.de> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e5c9de2ab78cf1863… --- libavcodec/x86/Makefile | 3 +- libavcodec/x86/rv40dsp.asm | 207 +++++++++++++++++++++++++++++++++++++++++ libavcodec/x86/rv40dsp_init.c | 19 ++++ 3 files changed, 228 insertions(+), 1 deletions(-) diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 2f29138..930ace7 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -28,7 +28,8 @@ MMX-OBJS-$(CONFIG_RV30_DECODER) += x86/rv34dsp_init.o YASM-OBJS-$(CONFIG_RV30_DECODER) += x86/rv34dsp.o MMX-OBJS-$(CONFIG_RV40_DECODER) += x86/rv34dsp_init.o \ x86/rv40dsp_init.o -YASM-OBJS-$(CONFIG_RV40_DECODER) += x86/rv34dsp.o +YASM-OBJS-$(CONFIG_RV40_DECODER) += x86/rv34dsp.o \ + x86/rv40dsp.o YASM-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_yasm.o diff --git a/libavcodec/x86/rv40dsp.asm b/libavcodec/x86/rv40dsp.asm new file mode 100644 index 0000000..bff3e7b --- /dev/null +++ b/libavcodec/x86/rv40dsp.asm @@ -0,0 +1,207 @@ +;****************************************************************************** +;* MMX/SSE2-optimized functions for the RV40 decoder +;* Copyright (C) 2012 Christophe Gisquet <christophe.gisquet(a)gmail.com> +;* +;* This file is part of Libav. +;* +;* Libav is free software; you can redistribute it and/or +;* modify it under the terms of the GNU Lesser General Public +;* License as published by the Free Software Foundation; either +;* version 2.1 of the License, or (at your option) any later version. +;* +;* Libav is distributed in the hope that it will be useful, +;* but WITHOUT ANY WARRANTY; without even the implied warranty of +;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;* Lesser General Public License for more details. +;* +;* You should have received a copy of the GNU Lesser General Public +;* License along with Libav; if not, write to the Free Software +;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +;****************************************************************************** + +%include "x86inc.asm" +%include "x86util.asm" + +SECTION_RODATA + +align 16 +shift_round: times 8 dw 1 << (16 - 6) +cextern pw_16 + +SECTION .text + +; %1=5bits weights?, %2=dst %3=src1 %4=src3 %5=stride if sse2 +%macro RV40_WCORE 4-5 + movh m4, [%3 + 0] + movh m5, [%4 + 0] +%if %0 == 4 +%define OFFSET mmsize / 2 +%else + ; 8x8 block and sse2, stride was provided +%define OFFSET %5 +%endif + movh m6, [%3 + OFFSET] + movh m7, [%4 + OFFSET] + +%if %1 == 0 + ; 14bits weights + punpcklbw m4, m0 + punpcklbw m5, m0 + punpcklbw m6, m0 + punpcklbw m7, m0 + + psllw m4, 7 + psllw m5, 7 + psllw m6, 7 + psllw m7, 7 + pmulhw m4, m3 + pmulhw m5, m2 + pmulhw m6, m3 + pmulhw m7, m2 + + paddw m4, m5 + paddw m6, m7 +%else + ; 5bits weights +%if cpuflag(ssse3) + punpcklbw m4, m5 + punpcklbw m6, m7 + + pmaddubsw m4, m3 + pmaddubsw m6, m3 +%else + punpcklbw m4, m0 + punpcklbw m5, m0 + punpcklbw m6, m0 + punpcklbw m7, m0 + + pmullw m4, m3 + pmullw m5, m2 + pmullw m6, m3 + pmullw m7, m2 + paddw m4, m5 + paddw m6, m7 +%endif + +%endif + + ; bias and shift down +%if cpuflag(ssse3) + pmulhrsw m4, m1 + pmulhrsw m6, m1 +%else + paddw m4, m1 + paddw m6, m1 + psrlw m4, 5 + psrlw m6, 5 +%endif + + packuswb m4, m6 +%if %0 == 5 + ; Only called for 8x8 blocks and sse2 + movh [%2 + 0], m4 + movhps [%2 + %5], m4 +%else + mova [%2], m4 +%endif +%endmacro + + +%macro MAIN_LOOP 2 +%if mmsize == 8 + RV40_WCORE %2, r0, r1, r2 +%if %1 == 16 + RV40_WCORE %2, r0 + 8, r1 + 8, r2 + 8 +%endif + + ; Prepare for next loop + add r0, r5 + add r1, r5 + add r2, r5 +%else +%ifidn %1, 8 + RV40_WCORE %2, r0, r1, r2, r5 + ; Prepare 2 next lines + lea r0, [r0 + 2 * r5] + lea r1, [r1 + 2 * r5] + lea r2, [r2 + 2 * r5] +%else + RV40_WCORE %2, r0, r1, r2 + ; Prepare single next line + add r0, r5 + add r1, r5 + add r2, r5 +%endif +%endif + + dec r6 +%endmacro + +; rv40_weight_func_%1(uint8_t *dst, uint8_t *src1, uint8_t *src2, int w1, int w2, int stride) +; %1=size %2=num of xmm regs +%macro RV40_WEIGHT 2 +cglobal rv40_weight_func_%1, 6, 7, %2 +%if cpuflag(ssse3) + mova m1, [shift_round] +%else + mova m1, [pw_16] +%endif + pxor m0, m0 + mov r6, r3 + or r6, r4 + ; The weights are FP0.14 notation of fractions depending on pts. + ; For timebases without rounding error (i.e. PAL), the fractions + ; can be simplified, and several operations can be avoided. + ; Therefore, we check here whether they are multiples of 2^9 for + ; those simplifications to occur. + and r6, 0x1FF + ; Set loop counter and increments +%if mmsize == 8 + mov r6, %1 +%else + mov r6, (%1 * %1) / mmsize +%endif + + ; Use result of test now + jz .loop_512 + movd m2, r3 + movd m3, r4 + SPLATW m2, m2 + SPLATW m3, m3 + +.loop: + MAIN_LOOP %1, 0 + jnz .loop + REP_RET + + ; Weights are multiple of 512, which allows some shortcuts +.loop_512: + sar r3, 9 + sar r4, 9 + movd m2, r3 + movd m3, r4 +%if cpuflag(ssse3) + punpcklbw m3, m2 + SPLATW m3, m3 +%else + SPLATW m2, m2 + SPLATW m3, m3 +%endif +.loop2: + MAIN_LOOP %1, 1 + jnz .loop2 + REP_RET + +%endmacro + +INIT_MMX mmx +RV40_WEIGHT 8, 0 +RV40_WEIGHT 16, 0 + +INIT_XMM sse2 +RV40_WEIGHT 8, 8 +RV40_WEIGHT 16, 8 + +INIT_XMM ssse3 +RV40_WEIGHT 8, 8 +RV40_WEIGHT 16, 8 diff --git a/libavcodec/x86/rv40dsp_init.c b/libavcodec/x86/rv40dsp_init.c index b429de7..3d6c6f0 100644 --- a/libavcodec/x86/rv40dsp_init.c +++ b/libavcodec/x86/rv40dsp_init.c @@ -40,6 +40,15 @@ void ff_avg_rv40_chroma_mc4_mmx2 (uint8_t *dst, uint8_t *src, void ff_avg_rv40_chroma_mc4_3dnow(uint8_t *dst, uint8_t *src, int stride, int h, int x, int y); +#define DECLARE_WEIGHT(opt) \ +void ff_rv40_weight_func_16_##opt(uint8_t *dst, uint8_t *src1, uint8_t *src2, \ + int w1, int w2, int stride); \ +void ff_rv40_weight_func_8_##opt (uint8_t *dst, uint8_t *src1, uint8_t *src2, \ + int w1, int w2, int stride); +DECLARE_WEIGHT(mmx) +DECLARE_WEIGHT(sse2) +DECLARE_WEIGHT(ssse3) + void ff_rv40dsp_init_x86(RV34DSPContext *c, DSPContext *dsp) { #if HAVE_YASM @@ -48,6 +57,8 @@ void ff_rv40dsp_init_x86(RV34DSPContext *c, DSPContext *dsp) if (mm_flags & AV_CPU_FLAG_MMX) { c->put_chroma_pixels_tab[0] = ff_put_rv40_chroma_mc8_mmx; c->put_chroma_pixels_tab[1] = ff_put_rv40_chroma_mc4_mmx; + c->rv40_weight_pixels_tab[0] = ff_rv40_weight_func_16_mmx; + c->rv40_weight_pixels_tab[1] = ff_rv40_weight_func_8_mmx; } if (mm_flags & AV_CPU_FLAG_MMX2) { c->avg_chroma_pixels_tab[0] = ff_avg_rv40_chroma_mc8_mmx2; @@ -56,5 +67,13 @@ void ff_rv40dsp_init_x86(RV34DSPContext *c, DSPContext *dsp) c->avg_chroma_pixels_tab[0] = ff_avg_rv40_chroma_mc8_3dnow; c->avg_chroma_pixels_tab[1] = ff_avg_rv40_chroma_mc4_3dnow; } + if (mm_flags & AV_CPU_FLAG_SSE2) { + c->rv40_weight_pixels_tab[0] = ff_rv40_weight_func_16_sse2; + c->rv40_weight_pixels_tab[1] = ff_rv40_weight_func_8_sse2; + } + if (mm_flags & AV_CPU_FLAG_SSSE3) { + c->rv40_weight_pixels_tab[0] = ff_rv40_weight_func_16_ssse3; + c->rv40_weight_pixels_tab[1] = ff_rv40_weight_func_8_ssse3; + } #endif }

1 0

x86: Give RV40 init file a more suitable name.
by git＠videolan.org 01 Feb '12

01 Feb '12

ffmpeg | branch: master | Diego Biurrun <diego(a)biurrun.de> | Mon Jan 30 09:56:28 2012 +0100| [91bafb52ae31d85314e77ba84dc1e10348cd114e] | committer: Diego Biurrun x86: Give RV40 init file a more suitable name. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=91bafb52ae31d8531… --- libavcodec/x86/Makefile | 2 +- libavcodec/x86/{rv40dsp.c => rv40dsp_init.c} | 0 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 0576c3a..2f29138 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -27,7 +27,7 @@ MMX-OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred_init.o MMX-OBJS-$(CONFIG_RV30_DECODER) += x86/rv34dsp_init.o YASM-OBJS-$(CONFIG_RV30_DECODER) += x86/rv34dsp.o MMX-OBJS-$(CONFIG_RV40_DECODER) += x86/rv34dsp_init.o \ - x86/rv40dsp.o + x86/rv40dsp_init.o YASM-OBJS-$(CONFIG_RV40_DECODER) += x86/rv34dsp.o YASM-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_yasm.o diff --git a/libavcodec/x86/rv40dsp.c b/libavcodec/x86/rv40dsp_init.c similarity index 100% rename from libavcodec/x86/rv40dsp.c rename to libavcodec/x86/rv40dsp_init.c

1 0

x86: Place mm_flags variable declaration below the appropriate #ifdef.
by git＠videolan.org 01 Feb '12

01 Feb '12

ffmpeg | branch: master | Diego Biurrun <diego(a)biurrun.de> | Mon Jan 30 09:39:16 2012 +0100| [c30b198381706e94aab1097e49d2638763312b05] | committer: Diego Biurrun x86: Place mm_flags variable declaration below the appropriate #ifdef. This fixes some unused variable warnings with YASM disabled. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c30b198381706e94a… --- libavcodec/x86/fmtconvert_mmx.c | 2 +- libavcodec/x86/rv40dsp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/x86/fmtconvert_mmx.c b/libavcodec/x86/fmtconvert_mmx.c index 17079d3..42cb0bc 100644 --- a/libavcodec/x86/fmtconvert_mmx.c +++ b/libavcodec/x86/fmtconvert_mmx.c @@ -110,9 +110,9 @@ static void float_interleave_sse(float *dst, const float **src, void ff_fmt_convert_init_x86(FmtConvertContext *c, AVCodecContext *avctx) { +#if HAVE_YASM int mm_flags = av_get_cpu_flags(); -#if HAVE_YASM if (mm_flags & AV_CPU_FLAG_MMX) { c->float_interleave = float_interleave_mmx; diff --git a/libavcodec/x86/rv40dsp.c b/libavcodec/x86/rv40dsp.c index 9f90ad8..b429de7 100644 --- a/libavcodec/x86/rv40dsp.c +++ b/libavcodec/x86/rv40dsp.c @@ -42,9 +42,9 @@ void ff_avg_rv40_chroma_mc4_3dnow(uint8_t *dst, uint8_t *src, void ff_rv40dsp_init_x86(RV34DSPContext *c, DSPContext *dsp) { - av_unused int mm_flags = av_get_cpu_flags(); - #if HAVE_YASM + int mm_flags = av_get_cpu_flags(); + if (mm_flags & AV_CPU_FLAG_MMX) { c->put_chroma_pixels_tab[0] = ff_put_rv40_chroma_mc8_mmx; c->put_chroma_pixels_tab[1] = ff_put_rv40_chroma_mc4_mmx;

1 0

movdec: Ignore sample_degradation_priority bits when checking first_sample_flags
by git＠videolan.org 01 Feb '12

01 Feb '12

ffmpeg | branch: master | Martin Storsjö <martin(a)martin.st> | Wed Jan 18 15:12:10 2012 +0200| [75ab1e62d4187c8ad627835ee8fcf38501477caf] | committer: Martin Storsjö movdec: Ignore sample_degradation_priority bits when checking first_sample_flags This makes the first packet of a track fragment run to get the keyframe flag set properly if sample_degradation_priority is nonzero. This makes the keyframes flag be set properly for ismv files created by Microsoft. Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=75ab1e62d4187c8ad… --- libavformat/mov.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index b7d8a55..0ce32e0 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2250,7 +2250,7 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom) sc->ctts_data[sc->ctts_count].duration = (flags & 0x800) ? avio_rb32(pb) : 0; sc->ctts_count++; if ((keyframe = st->codec->codec_type == AVMEDIA_TYPE_AUDIO || - (flags & 0x004 && !i && !sample_flags) || sample_flags & 0x2000000)) + (flags & 0x004 && !i && !(sample_flags & 0xffff0000)) || sample_flags & 0x2000000)) distance = 0; av_add_index_entry(st, offset, dts, sample_size, distance, keyframe ? AVINDEX_KEYFRAME : 0);

1 0

flvdec: Interpret a toplevel 'object' type metadata item as normal metadata , too
by git＠videolan.org 01 Feb '12

01 Feb '12

ffmpeg | branch: master | Martin Storsjö <martin(a)martin.st> | Mon Jan 30 22:47:40 2012 +0200| [89f6e8a20c07ad779ca374fdc5b16a22a37a6150] | committer: Martin Storsjö flvdec: Interpret a toplevel 'object' type metadata item as normal metadata, too Previously, we've only passed the key string on to the recursive amf_parse_object for the mixedarray type, not for 'object'. By passing the key string on, the recursive amf_parse_object can store the amf objects as metadata. This kind of data was seen in data from XSplit Broadcaster, received over RTMP via Wowza. This patch allows reading this metadata. Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=89f6e8a20c07ad779… --- libavformat/flvdec.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 9296ef9..ad38653 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -240,22 +240,18 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vst if(amf_get_string(ioc, str_val, sizeof(str_val)) < 0) return -1; break; - case AMF_DATA_TYPE_OBJECT: { - unsigned int keylen; - + case AMF_DATA_TYPE_OBJECT: if ((vstream || astream) && key && !strcmp(KEYFRAMES_TAG, key) && depth == 1) if (parse_keyframes_index(s, ioc, vstream ? vstream : astream, max_pos) < 0) return -1; - while(avio_tell(ioc) < max_pos - 2 && (keylen = avio_rb16(ioc))) { - avio_skip(ioc, keylen); //skip key string - if(amf_parse_object(s, NULL, NULL, NULL, max_pos, depth + 1) < 0) + while (avio_tell(ioc) < max_pos - 2 && amf_get_string(ioc, str_val, sizeof(str_val)) > 0) { + if (amf_parse_object(s, astream, vstream, str_val, max_pos, depth + 1) < 0) return -1; //if we couldn't skip, bomb out. } if(avio_r8(ioc) != AMF_END_OF_OBJECT) return -1; - } break; case AMF_DATA_TYPE_NULL: case AMF_DATA_TYPE_UNDEFINED:

1 0