November 2016 - ffmpeg-cvslog

aarch64: Add an offset parameter to the movrel macro
by git＠videolan.org 08 Dec '16

08 Dec '16

ffmpeg | branch: master | Martin Storsjö <martin(a)martin.st> | Mon Nov 14 12:32:24 2016 +0200| [7fe898dbb949f0e31665d716f671e2428d50bb29] | committer: Ronald S. Bultje aarch64: Add an offset parameter to the movrel macro With apple tools, the linker fails with errors like these, if the offset is negative: ld: in section __TEXT,__text reloc 8: symbol index out of range for architecture arm64 This is cherry-picked from libav commit c44a8a3eabcd6acd2ba79f32ec8a432e6ebe552c. Signed-off-by: Ronald S. Bultje <rsbultje(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7fe898dbb949f0e31… --- libavutil/aarch64/asm.S | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/libavutil/aarch64/asm.S b/libavutil/aarch64/asm.S index ff34e7a..523b8c5 100644 --- a/libavutil/aarch64/asm.S +++ b/libavutil/aarch64/asm.S @@ -72,15 +72,21 @@ ELF .size \name, . - \name \name: .endm -.macro movrel rd, val +.macro movrel rd, val, offset=0 #if CONFIG_PIC && defined(__APPLE__) + .if \offset < 0 adrp \rd, \val@PAGE add \rd, \rd, \val@PAGEOFF + sub \rd, \rd, -(\offset) + .else + adrp \rd, \val+(\offset)@PAGE + add \rd, \rd, \val+(\offset)@PAGEOFF + .endif #elif CONFIG_PIC - adrp \rd, \val - add \rd, \rd, :lo12:\val + adrp \rd, \val+\offset + add \rd, \rd, :lo12:\val+\offset #else - ldr \rd, =\val + ldr \rd, =\val+\offset #endif .endm

2 1

tools/coverity: Add model for av_realloc
by git＠videolan.org 30 Nov '16

30 Nov '16

ffmpeg | branch: master | Philip Langdale <philipl(a)overt.org> | Wed Nov 30 14:50:36 2016 -0800| [fdb124001e9adb12e5c27cc0a9e2982f46445bf7] | committer: Philip Langdale tools/coverity: Add model for av_realloc Really should have done this last time. It should provide consistency across our allocations and frees. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fdb124001e9adb12e… --- tools/coverity.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tools/coverity.c b/tools/coverity.c index 3cc248c..19a132a 100644 --- a/tools/coverity.c +++ b/tools/coverity.c @@ -58,7 +58,22 @@ void *av_mallocz(size_t size) { } } +void *av_realloc(void *ptr, size_t size) { + int has_memory; + __coverity_negative_sink__(size); + if (has_memory) { + __coverity_escape__(ptr); + ptr = __coverity_alloc__(size); + __coverity_writeall__(ptr); + __coverity_mark_as_afm_allocated__(ptr, "av_free"); + return ptr; + } else { + return 0; + } +} + void *av_free(void *ptr) { __coverity_free__(ptr); __coverity_mark_as_afm_freed__(ptr, "av_free"); } +

1 0

avcodec/h264: sse2 and avx 4:2:2 idct add8 10-bit functions
by git＠videolan.org 30 Nov '16

30 Nov '16

ffmpeg | branch: master | James Darnley <jdarnley(a)obe.tv> | Tue Nov 29 00:38:43 2016 +0100| [13d71c28cc44dd049d27a0a2e909add46ed1d5d0] | committer: James Darnley avcodec/h264: sse2 and avx 4:2:2 idct add8 10-bit functions Yorkfield: - sse2: - complex: 4.13x faster (1514 vs. 367 cycles) - simple: 4.38x faster (1836 vs. 419 cycles) Skylake: - sse2: - complex: 3.61x faster ( 936 vs. 260 cycles) - simple: 3.97x faster (1126 vs. 284 cycles) - avx (versus sse2): - complex: 1.07x faster (260 vs. 244 cycles) - simple: 1.03x faster (284 vs. 274 cycles) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=13d71c28cc44dd049… --- libavcodec/x86/h264_idct_10bit.asm | 53 ++++++++++++++++++++++++++++++++++++++ libavcodec/x86/h264dsp_init.c | 13 ++++++++-- 2 files changed, 64 insertions(+), 2 deletions(-) diff --git a/libavcodec/x86/h264_idct_10bit.asm b/libavcodec/x86/h264_idct_10bit.asm index 4f7491d..9fd05ab 100644 --- a/libavcodec/x86/h264_idct_10bit.asm +++ b/libavcodec/x86/h264_idct_10bit.asm @@ -351,6 +351,59 @@ IDCT_ADD8 %endif ;----------------------------------------------------------------------------- +; void ff_h264_idct_add8_422_10(pixel **dst, const int *block_offset, +; int16_t *block, int stride, +; const uint8_t nnzc[6*8]) +;----------------------------------------------------------------------------- +%assign last_block 44 + +%macro IDCT_ADD8_422 0 + +cglobal h264_idct_add8_422_10, 5, 8, 7 + movsxdifnidn r3, r3d +%if ARCH_X86_64 + mov r7, r0 +%endif + + add r2, 1024 + mov r0, [r0] + ADD16_OP_INTRA 16, 4+ 6*8 + ADD16_OP_INTRA 18, 4+ 7*8 + ADD16_OP_INTRA 24, 4+ 8*8 ; i+4 + ADD16_OP_INTRA 26, 4+ 9*8 ; i+4 + add r2, 1024-128*4 + +%if ARCH_X86_64 + mov r0, [r7+gprsize] +%else + mov r0, r0m + mov r0, [r0+gprsize] +%endif + + ADD16_OP_INTRA 32, 4+11*8 + ADD16_OP_INTRA 34, 4+12*8 + ADD16_OP_INTRA 40, 4+13*8 ; i+4 + ADD16_OP_INTRA 42, 4+14*8 ; i+4 +REP_RET + AC 16 + AC 18 + AC 24 ; i+4 + AC 26 ; i+4 + AC 32 + AC 34 + AC 40 ; i+4 + AC 42 ; i+4 + +%endmacro + +INIT_XMM sse2 +IDCT_ADD8_422 +%if HAVE_AVX_EXTERNAL +INIT_XMM avx +IDCT_ADD8_422 +%endif + +;----------------------------------------------------------------------------- ; void ff_h264_idct8_add_10(pixel *dst, int16_t *block, int stride) ;----------------------------------------------------------------------------- %macro IDCT8_1D 2 diff --git a/libavcodec/x86/h264dsp_init.c b/libavcodec/x86/h264dsp_init.c index ed52c4d..c6c643a 100644 --- a/libavcodec/x86/h264dsp_init.c +++ b/libavcodec/x86/h264dsp_init.c @@ -80,6 +80,9 @@ IDCT_ADD_REP_FUNC2(, 8, 10, avx) IDCT_ADD_REP_FUNC2(, 8_422, 8, mmx) +IDCT_ADD_REP_FUNC2(, 8_422, 10, sse2) +IDCT_ADD_REP_FUNC2(, 8_422, 10, avx) + void ff_h264_luma_dc_dequant_idct_mmx(int16_t *output, int16_t *input, int qmul); void ff_h264_luma_dc_dequant_idct_sse2(int16_t *output, int16_t *input, int qmul); @@ -319,8 +322,11 @@ av_cold void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth, c->h264_idct8_dc_add = ff_h264_idct8_dc_add_10_sse2; c->h264_idct_add16 = ff_h264_idct_add16_10_sse2; - if (chroma_format_idc <= 1) + if (chroma_format_idc <= 1) { c->h264_idct_add8 = ff_h264_idct_add8_10_sse2; + } else { + c->h264_idct_add8 = ff_h264_idct_add8_422_10_sse2; + } c->h264_idct_add16intra = ff_h264_idct_add16intra_10_sse2; #if HAVE_ALIGNED_STACK c->h264_idct8_add = ff_h264_idct8_add_10_sse2; @@ -359,8 +365,11 @@ av_cold void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth, c->h264_idct8_dc_add = ff_h264_idct8_dc_add_10_avx; c->h264_idct_add16 = ff_h264_idct_add16_10_avx; - if (chroma_format_idc <= 1) + if (chroma_format_idc <= 1) { c->h264_idct_add8 = ff_h264_idct_add8_10_avx; + } else { + c->h264_idct_add8 = ff_h264_idct_add8_422_10_avx; + } c->h264_idct_add16intra = ff_h264_idct_add16intra_10_avx; #if HAVE_ALIGNED_STACK c->h264_idct8_add = ff_h264_idct8_add_10_avx;

1 0

avcodec/h264: mmx 4:2:2 idct add8 function
by git＠videolan.org 30 Nov '16

30 Nov '16

ffmpeg | branch: master | James Darnley <jdarnley(a)obe.tv> | Mon Nov 28 18:22:17 2016 +0100| [1dae7ffa0b11293fa3294fc25cd38055915fcf19] | committer: James Darnley avcodec/h264: mmx 4:2:2 idct add8 function 2.87 times faster (1830 vs. 638 cycles) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1dae7ffa0b11293fa… --- libavcodec/x86/h264_idct.asm | 32 ++++++++++++++++++++++++++++++++ libavcodec/x86/h264dsp_init.c | 7 ++++++- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/libavcodec/x86/h264_idct.asm b/libavcodec/x86/h264_idct.asm index 27222cb..c36fea5 100644 --- a/libavcodec/x86/h264_idct.asm +++ b/libavcodec/x86/h264_idct.asm @@ -697,6 +697,38 @@ cglobal h264_idct_add8_8, 5, 8 + npicregs, 0, dst1, block_offset, block, stride, call h264_idct_add8_mmx_plane RET +cglobal h264_idct_add8_422_8, 5, 8 + npicregs, 0, dst1, block_offset, block, stride, nnzc, cntr, coeff, dst2, picreg +; dst1, block_offset, block, stride, nnzc, cntr, coeff, dst2, picreg + movsxdifnidn r3, r3d +%ifdef PIC + lea picregq, [scan8_mem] +%endif +%if ARCH_X86_64 + mov dst2q, r0 +%endif + + mov r5, 16 ; i + add r2, 512 ; i * 16 * sizeof(dctcoef) ; #define dctcoef int16_t + + call h264_idct_add8_mmx_plane + add r5, 4 + call h264_idct_add8_mmx_plane + +%if ARCH_X86_64 + add dst2q, gprsize ; dest[1] +%else + add r0mp, gprsize +%endif + + add r5, 4 ; set to 32 + add r2, 256 ; set to i * 16 * sizeof(dctcoef) + + call h264_idct_add8_mmx_plane + add r5, 4 + call h264_idct_add8_mmx_plane + + RET + h264_idct_add8_mmxext_plane: movsxdifnidn r3, r3d .nextblock: diff --git a/libavcodec/x86/h264dsp_init.c b/libavcodec/x86/h264dsp_init.c index 027c1ae..ed52c4d 100644 --- a/libavcodec/x86/h264dsp_init.c +++ b/libavcodec/x86/h264dsp_init.c @@ -78,6 +78,8 @@ IDCT_ADD_REP_FUNC2(, 8, 8, sse2) IDCT_ADD_REP_FUNC2(, 8, 10, sse2) IDCT_ADD_REP_FUNC2(, 8, 10, avx) +IDCT_ADD_REP_FUNC2(, 8_422, 8, mmx) + void ff_h264_luma_dc_dequant_idct_mmx(int16_t *output, int16_t *input, int qmul); void ff_h264_luma_dc_dequant_idct_sse2(int16_t *output, int16_t *input, int qmul); @@ -228,8 +230,11 @@ av_cold void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth, c->h264_idct_add16 = ff_h264_idct_add16_8_mmx; c->h264_idct8_add4 = ff_h264_idct8_add4_8_mmx; - if (chroma_format_idc <= 1) + if (chroma_format_idc <= 1) { c->h264_idct_add8 = ff_h264_idct_add8_8_mmx; + } else { + c->h264_idct_add8 = ff_h264_idct_add8_422_8_mmx; + } c->h264_idct_add16intra = ff_h264_idct_add16intra_8_mmx; if (cpu_flags & AV_CPU_FLAG_CMOV) c->h264_luma_dc_dequant_idct = ff_h264_luma_dc_dequant_idct_mmx;

1 0

avcodec/h264: mmxext 4:2:2 chroma intra deblock/loop filter
by git＠videolan.org 30 Nov '16

30 Nov '16

ffmpeg | branch: master | James Darnley <jdarnley(a)obe.tv> | Mon Nov 28 14:26:53 2016 +0100| [815ea8c6ccf7a1a8154a829f948d7c98120ad084] | committer: James Darnley avcodec/h264: mmxext 4:2:2 chroma intra deblock/loop filter 2.1 times faster (401 vs. 194 cycles) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=815ea8c6ccf7a1a81… --- libavcodec/x86/h264_deblock.asm | 14 ++++++++++++++ libavcodec/x86/h264dsp_init.c | 2 ++ 2 files changed, 16 insertions(+) diff --git a/libavcodec/x86/h264_deblock.asm b/libavcodec/x86/h264_deblock.asm index 4aabbc0..fe0ab20 100644 --- a/libavcodec/x86/h264_deblock.asm +++ b/libavcodec/x86/h264_deblock.asm @@ -946,6 +946,20 @@ cglobal deblock_h_chroma_intra_8, 4,6 TRANSPOSE8x4B_STORE PASS8ROWS(t5, r0, r1, t6) RET +cglobal deblock_h_chroma422_intra_8, 4, 6 + CHROMA_H_START + TRANSPOSE4x8_LOAD bw, wd, dq, PASS8ROWS(t5, r0, r1, t6) + call ff_chroma_intra_body_mmxext + TRANSPOSE8x4B_STORE PASS8ROWS(t5, r0, r1, t6) + + lea r0, [r0+r1*8] + lea t5, [t5+r1*8] + + TRANSPOSE4x8_LOAD bw, wd, dq, PASS8ROWS(t5, r0, r1, t6) + call ff_chroma_intra_body_mmxext + TRANSPOSE8x4B_STORE PASS8ROWS(t5, r0, r1, t6) +RET + ALIGN 16 ff_chroma_intra_body_mmxext: LOAD_MASK r2d, r3d diff --git a/libavcodec/x86/h264dsp_init.c b/libavcodec/x86/h264dsp_init.c index d2452c7..027c1ae 100644 --- a/libavcodec/x86/h264dsp_init.c +++ b/libavcodec/x86/h264dsp_init.c @@ -130,6 +130,7 @@ LF_FUNCS(uint8_t, 8) LF_FUNCS(uint16_t, 10) void ff_deblock_h_chroma422_8_mmxext(uint8_t *pix, int stride, int alpha, int beta, int8_t *tc0); +LF_IFUNC(h, chroma422_intra, 8, mmxext) #if ARCH_X86_32 && HAVE_MMXEXT_EXTERNAL LF_FUNC(v8, luma, 8, mmxext) @@ -249,6 +250,7 @@ av_cold void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth, c->h264_h_loop_filter_chroma_intra = ff_deblock_h_chroma_intra_8_mmxext; } else { c->h264_h_loop_filter_chroma = ff_deblock_h_chroma422_8_mmxext; + c->h264_h_loop_filter_chroma_intra = ff_deblock_h_chroma422_intra_8_mmxext; } #if ARCH_X86_32 && HAVE_MMXEXT_EXTERNAL c->h264_v_loop_filter_luma = deblock_v_luma_8_mmxext;

1 0

ffserver: use codec time_base for stream
by git＠videolan.org 30 Nov '16

30 Nov '16

ffmpeg | branch: master | Andreas Cadhalpun <Andreas.Cadhalpun(a)googlemail.com> | Wed Nov 30 01:49:09 2016 +0100| [122190392b297b7cd9783641d880df887fd80d07] | committer: Andreas Cadhalpun ffserver: use codec time_base for stream This fixes producing swf and rm files as done by ffservertest. Reviewed-by: Reynaldo H. Verdejo Pinochet <reynaldo(a)osg.samsung.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun(a)googlemail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=122190392b297b7cd… --- ffserver.c | 2 +- tests/ffserver.regression.ref | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ffserver.c b/ffserver.c index 8745181..d6b7b44 100644 --- a/ffserver.c +++ b/ffserver.c @@ -3561,7 +3561,7 @@ static LayeredAVStream *add_av_stream1(FFServerStream *stream, //NOTE we previously allocated internal & internal->avctx, these seemed uneeded though fst->codecpar = avcodec_parameters_alloc(); fst->index = stream->nb_streams; - fst->time_base = (AVRational) {1, 90000}; + fst->time_base = codec->time_base; fst->pts_wrap_bits = 33; fst->sample_aspect_ratio = codec->sample_aspect_ratio; stream->streams[stream->nb_streams++] = fst; diff --git a/tests/ffserver.regression.ref b/tests/ffserver.regression.ref index 8629d52..3fdb6d6 100644 --- a/tests/ffserver.regression.ref +++ b/tests/ffserver.regression.ref @@ -1,11 +1,11 @@ 233020d119085ba47535d5f2faf73cc0 *ff-test_h.avi 431b75d1f12cb039acebad61a3d39225 *ff-test_l.avi -d41d8cd98f00b204e9800998ecf8427e *ff-test.swf +a767dbdf5d1bded3450279f812f97b37 *ff-test.swf dc16f607e13328a832e73801cd21ec98 *ff-test_h.asf 69337d6c8cd7ac7e626338decdbf41d3 *ff-test_l.asf -d41d8cd98f00b204e9800998ecf8427e *ff-test_h.rm -d41d8cd98f00b204e9800998ecf8427e *ff-test_l.rm +06f5a6a4c5d1c6735f4d0068e825c91f *ff-test_h.rm +1f57580f02f0317407b3b82a3d5e093f *ff-test_l.rm 4c887dfc1dd0f6ea1a3a2be6dd32e495 *ff-test.jpg 1d04b73b04aad27793cc762d5afabac1 *ff-test_small.jpg bc36c40ee34ebee6ffe50f3094aab733 *ff-test.mjpg -56c8b3ba2c4f3eebfa6d2a895e042ee3 *ff-stat +128530a16464be60d27d013c30401851 *ff-stat

1 0

tests: drop -d option from ffserver invocation
by git＠videolan.org 30 Nov '16

30 Nov '16

ffmpeg | branch: master | Andreas Cadhalpun <Andreas.Cadhalpun(a)googlemail.com> | Wed Nov 30 01:29:40 2016 +0100| [7f034a02cdcfa9feb621b4722e85bfcbca6957a7] | committer: Andreas Cadhalpun tests: drop -d option from ffserver invocation It randomly causes failures with an error like: "Failed to set value '-f' for option 'd': Error number -920332800 occurred" (The error number is different every time.) Reviewed-by: Reynaldo H. Verdejo Pinochet <reynaldo(a)osg.samsung.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun(a)googlemail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7f034a02cdcfa9feb… --- tests/ffserver-regression.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ffserver-regression.sh b/tests/ffserver-regression.sh index 6009ad3..9007fe3 100755 --- a/tests/ffserver-regression.sh +++ b/tests/ffserver-regression.sh @@ -12,7 +12,7 @@ target_path=$5 FILES=$(sed -n 's/^[^#]*<Stream $.*$>.*/\1/p' $2 | grep -v html) rm -f tests/feed1.ffm -$target_exec ${target_path}/ffserver${PROGSUF} -d -f "$2" & +$target_exec ${target_path}/ffserver${PROGSUF} -f "$2" & FFSERVER_PID=$! echo "Waiting for feeds to startup..." sleep 2

1 0

tests: print errors from ffserver
by git＠videolan.org 30 Nov '16

30 Nov '16

ffmpeg | branch: master | Andreas Cadhalpun <Andreas.Cadhalpun(a)googlemail.com> | Wed Nov 30 01:23:26 2016 +0100| [0bd227e31ca769c1403ec3df9272d008fa5985c6] | committer: Andreas Cadhalpun tests: print errors from ffserver Not doing so makes debugging unnecessarily hard. Reviewed-by: Reynaldo H. Verdejo Pinochet <reynaldo(a)osg.samsung.com> Reviewed-by: Michael Niedermayer <michael(a)niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun(a)googlemail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0bd227e31ca769c14… --- tests/ffserver-regression.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ffserver-regression.sh b/tests/ffserver-regression.sh index 17e9060..6009ad3 100755 --- a/tests/ffserver-regression.sh +++ b/tests/ffserver-regression.sh @@ -12,7 +12,7 @@ target_path=$5 FILES=$(sed -n 's/^[^#]*<Stream $.*$>.*/\1/p' $2 | grep -v html) rm -f tests/feed1.ffm -$target_exec ${target_path}/ffserver${PROGSUF} -d -f "$2" 2> /dev/null & +$target_exec ${target_path}/ffserver${PROGSUF} -d -f "$2" & FFSERVER_PID=$! echo "Waiting for feeds to startup..." sleep 2

1 0

tools/coverity: Add models for av_mallocz and av_free
by git＠videolan.org 30 Nov '16

30 Nov '16

ffmpeg | branch: master | Philip Langdale <philipl(a)overt.org> | Sun Nov 27 11:16:18 2016 -0800| [5eb68520635d895bbd878abf29fdb66872cbe00e] | committer: Philip Langdale tools/coverity: Add models for av_mallocz and av_free This should deal with some false positives, but might lead to more of them depending on whether it realises that av_freep() wraps av_free() or not. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5eb68520635d895bb… --- tools/coverity.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/tools/coverity.c b/tools/coverity.c index 80fc1c2..3cc248c 100644 --- a/tools/coverity.c +++ b/tools/coverity.c @@ -35,8 +35,30 @@ void *av_malloc(size_t size) { int has_memory; __coverity_negative_sink__(size); - if(has_memory) - return __coverity_alloc__(size); - else + if (has_memory) { + void *ptr = __coverity_alloc__(size); + __coverity_mark_as_uninitialized_buffer__(ptr); + __coverity_mark_as_afm_allocated__(ptr, "av_free"); + return ptr; + } else { return 0; + } +} + +void *av_mallocz(size_t size) { + int has_memory; + __coverity_negative_sink__(size); + if (has_memory) { + void *ptr = __coverity_alloc__(size); + __coverity_writeall0__(ptr); + __coverity_mark_as_afm_allocated__(ptr, "av_free"); + return ptr; + } else { + return 0; + } +} + +void *av_free(void *ptr) { + __coverity_free__(ptr); + __coverity_mark_as_afm_freed__(ptr, "av_free"); }

1 0

fate: Add test for mov displaymatrix
by git＠videolan.org 30 Nov '16

30 Nov '16

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara(a)gmail.com> | Fri Nov 18 14:34:43 2016 -0500| [115b834dcff0c0a3714c7251394db253d657623d] | committer: Vittorio Giovara fate: Add test for mov displaymatrix > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=115b834dcff0c0a37… --- tests/fate/mov.mak | 6 +++++- tests/ref/fate/mov-displaymatrix | 12 ++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index bb02d6b..71c9a1f 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -7,7 +7,8 @@ FATE_MOV = fate-mov-3elist \ fate-mov-2elist-elist1-ends-bframe \ fate-mov-zombie \ fate-mov-aac-2048-priming \ - fate-mp4-init-nonkeyframe + fate-mp4-init-nonkeyframe \ + fate-mov-displaymatrix \ FATE_SAMPLES_AVCONV += $(FATE_MOV) @@ -38,3 +39,6 @@ fate-mov-zombie: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_streams -show_packe fate-mp4-init-nonkeyframe: ffprobe$(PROGSSUF)$(EXESUF) fate-mp4-init-nonkeyframe: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_packets -print_format compact -select_streams v $(TARGET_SAMPLES)/mov/mp4-init-nonkeyframe.mp4 + +fate-mp4-displaymatrix: ffprobe$(PROGSSUF)$(EXESUF) +fate-mov-displaymatrix: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream_side_data_list -select_streams v -v 0 $(TARGET_SAMPLES)/mov/displaymatrix.mov diff --git a/tests/ref/fate/mov-displaymatrix b/tests/ref/fate/mov-displaymatrix new file mode 100644 index 0000000..86139fc --- /dev/null +++ b/tests/ref/fate/mov-displaymatrix @@ -0,0 +1,12 @@ +[STREAM] +[SIDE_DATA] +side_data_type=Display Matrix +side_data_size=36 +displaymatrix= +00000000: 0 131072 0 +00000001: -65536 0 0 +00000002: 47185920 0 1073741824 + +rotation=-90 +[/SIDE_DATA] +[/STREAM]

1 0