July 2018 - ffmpeg-cvslog - lists.ffmpeg.org

tools/qt-faststart: Allow free atoms after moov atom.
by Carl Eugen Hoyos 31 Jul '18

31 Jul '18

ffmpeg | branch: master | Carl Eugen Hoyos <ceffmpeg(a)gmail.com> | Thu Jul 12 01:24:39 2018 +0200| [1ffd63a4457bbd09574de5cb8bc100734a7b8843] | committer: Carl Eugen Hoyos tools/qt-faststart: Allow free atoms after moov atom. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1ffd63a4457bbd095… --- tools/qt-faststart.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tools/qt-faststart.c b/tools/qt-faststart.c index 5e88c38e6b..46950a5cf4 100644 --- a/tools/qt-faststart.c +++ b/tools/qt-faststart.c @@ -443,6 +443,8 @@ int main(int argc, char *argv[]) int64_t start_offset = 0; unsigned char *copy_buffer = NULL; int bytes_to_copy; + uint64_t free_size = 0; + uint64_t moov_size = 0; if (argc != 3) { printf("Usage: qt-faststart <infile.mov> <outfile.mov>\n" @@ -535,6 +537,15 @@ int main(int argc, char *argv[]) * able to continue scanning sensibly after this atom, so break. */ if (atom_size < 8) break; + + if (atom_type == MOOV_ATOM) + moov_size = atom_size; + + if (moov_size && atom_type == FREE_ATOM) { + free_size += atom_size; + atom_type = MOOV_ATOM; + atom_size = moov_size; + } } if (atom_type != MOOV_ATOM) { @@ -551,7 +562,7 @@ int main(int argc, char *argv[]) /* moov atom was, in fact, the last atom in the chunk; load the whole * moov atom */ - if (fseeko(infile, -atom_size, SEEK_END)) { + if (fseeko(infile, -(atom_size + free_size), SEEK_END)) { perror(argv[1]); goto error_out; }

1 0

avutil/pixelutils: sad_32x32 sse2/avx2 optimizations.
by Jun Zhao 31 Jul '18

31 Jul '18

ffmpeg | branch: master | Jun Zhao <mypopydev(a)gmail.com> | Tue Jul 10 00:41:00 2018 +0800| [d36b8394f4fa95403afd194ca9b7edbd8f470076] | committer: Jun Zhao avutil/pixelutils: sad_32x32 sse2/avx2 optimizations. add ff_pixelutils_sad_32x32_sse2, ff_pixelutils_sad_{a,u}_32x32_sse2, ff_pixelutils_sad_32x32_avx22, ff_pixelutils_sad_{a,u}_32x32_avx2 use perf record/report profiling, get instructions:u for avx2 sad_32x32: 72.05% pixelutils pixelutils [.] block_sad_32x32_c 18.50% pixelutils pixelutils [.] block_sad_16x16_c 4.78% pixelutils pixelutils [.] block_sad_8x8_c 2.69% pixelutils pixelutils [.] block_sad_4x4_c 0.89% pixelutils pixelutils [.] block_sad_2x2_c 0.16% pixelutils pixelutils [.] ff_pixelutils_sad_32x32_avx2 0.16% pixelutils pixelutils [.] ff_pixelutils_sad_u_32x32_avx2 0.12% pixelutils pixelutils [.] ff_pixelutils_sad_a_32x32_avx2 sse2 sad_32x32 instructions:u like: 71.86% pixelutils pixelutils [.] block_sad_32x32_c 18.42% pixelutils pixelutils [.] block_sad_16x16_c 4.81% pixelutils pixelutils [.] block_sad_8x8_c 2.68% pixelutils pixelutils [.] block_sad_4x4_c 0.88% pixelutils pixelutils [.] block_sad_2x2_c 0.29% pixelutils pixelutils [.] ff_pixelutils_sad_32x32_sse2 0.26% pixelutils pixelutils [.] ff_pixelutils_sad_u_32x32_sse2 0.23% pixelutils pixelutils [.] ff_pixelutils_sad_a_32x32_sse2 Signed-off-by: Jun Zhao <mypopydev(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d36b8394f4fa95403… --- libavutil/x86/pixelutils.asm | 219 ++++++++++++++++++++++++++++++++++++++++ libavutil/x86/pixelutils_init.c | 30 ++++++ 2 files changed, 249 insertions(+) diff --git a/libavutil/x86/pixelutils.asm b/libavutil/x86/pixelutils.asm index 171a3d1491..bbecf0e68e 100644 --- a/libavutil/x86/pixelutils.asm +++ b/libavutil/x86/pixelutils.asm @@ -163,3 +163,222 @@ cglobal pixelutils_sad_%1_16x16, 4,4,3, src1, stride1, src2, stride2 SAD_XMM_16x16 a SAD_XMM_16x16 u + + +%macro PROCESS_SAD_32x4_U 0 + movu m1, [r2] + movu m2, [r2 + 16] + movu m3, [r0] + movu m4, [r0 + 16] + psadbw m1, m3 + psadbw m2, m4 + paddd m1, m2 + paddd m0, m1 + lea r2, [r2 + r3] + lea r0, [r0 + r1] + + movu m1, [r2] + movu m2, [r2 + 16] + movu m3, [r0] + movu m4, [r0 + 16] + psadbw m1, m3 + psadbw m2, m4 + paddd m1, m2 + paddd m0, m1 + lea r2, [r2 + r3] + lea r0, [r0 + r1] + + movu m1, [r2] + movu m2, [r2 + 16] + movu m3, [r0] + movu m4, [r0 + 16] + psadbw m1, m3 + psadbw m2, m4 + paddd m1, m2 + paddd m0, m1 + lea r2, [r2 + r3] + lea r0, [r0 + r1] + + movu m1, [r2] + movu m2, [r2 + 16] + movu m3, [r0] + movu m4, [r0 + 16] + psadbw m1, m3 + psadbw m2, m4 + paddd m1, m2 + paddd m0, m1 + lea r2, [r2 + r3] + lea r0, [r0 + r1] +%endmacro + +%macro PROCESS_SAD_32x4 1 + mov%1 m1, [r2] + mov%1 m2, [r2 + 16] + psadbw m1, [r0] + psadbw m2, [r0 + 16] + paddd m1, m2 + paddd m0, m1 + lea r2, [r2 + r3] + lea r0, [r0 + r1] + + mov%1 m1, [r2] + mov%1 m2, [r2 + 16] + psadbw m1, [r0] + psadbw m2, [r0 + 16] + paddd m1, m2 + paddd m0, m1 + lea r2, [r2 + r3] + lea r0, [r0 + r1] + + mov%1 m1, [r2] + mov%1 m2, [r2 + 16] + psadbw m1, [r0] + psadbw m2, [r0 + 16] + paddd m1, m2 + paddd m0, m1 + lea r2, [r2 + r3] + lea r0, [r0 + r1] + + mov%1 m1, [r2] + mov%1 m2, [r2 + 16] + psadbw m1, [r0] + psadbw m2, [r0 + 16] + paddd m1, m2 + paddd m0, m1 + lea r2, [r2 + r3] + lea r0, [r0 + r1] +%endmacro + +;----------------------------------------------------------------------------- +; int ff_pixelutils_sad_32x32_sse2(const uint8_t *src1, ptrdiff_t stride1, +; const uint8_t *src2, ptrdiff_t stride2); +;----------------------------------------------------------------------------- +INIT_XMM sse2 +cglobal pixelutils_sad_32x32, 4,5,5, src1, stride1, src2, stride2 + pxor m0, m0 + mov r4d, 4 +.loop: + PROCESS_SAD_32x4_U + PROCESS_SAD_32x4_U + dec r4d + jnz .loop + + movhlps m1, m0 + paddd m0, m1 + movd eax, m0 + RET + +;------------------------------------------------------------------------------- +; int ff_pixelutils_sad_[au]_32x32_sse2(const uint8_t *src1, ptrdiff_t stride1, +; const uint8_t *src2, ptrdiff_t stride2); +;------------------------------------------------------------------------------- +%macro SAD_XMM_32x32 1 +INIT_XMM sse2 +cglobal pixelutils_sad_%1_32x32, 4,5,3, src1, stride1, src2, stride2 + pxor m0, m0 + mov r4d, 4 +.loop: + PROCESS_SAD_32x4 %1 + PROCESS_SAD_32x4 %1 + dec r4d + jnz .loop + + movhlps m1, m0 + paddd m0, m1 + movd eax, m0 + RET +%endmacro + +SAD_XMM_32x32 a +SAD_XMM_32x32 u + +;------------------------------------------------------------------------------- +; int ff_pixelutils_sad_32x32_avx2(const uint8_t *src1, ptrdiff_t stride1, +; const uint8_t *src2, ptrdiff_t stride2); +;------------------------------------------------------------------------------- +INIT_YMM avx2 +cglobal pixelutils_sad_32x32, 4,7,5, src1, stride1, src2, stride2 + pxor m0, m0 + mov r4d, 32/4 + lea r5, [stride1q * 3] + lea r6, [stride2q * 3] + +.loop: + movu m1, [src1q] ; row 0 of pix0 + movu m2, [src2q] ; row 0 of pix1 + movu m3, [src1q + stride1q] ; row 1 of pix0 + movu m4, [src2q + stride2q] ; row 1 of pix1 + + psadbw m1, m2 + psadbw m3, m4 + paddd m0, m1 + paddd m0, m3 + + movu m1, [src1q + 2 * stride1q] ; row 2 of pix0 + movu m2, [src2q + 2 * stride2q] ; row 2 of pix1 + movu m3, [src1q + r5] ; row 3 of pix0 + movu m4, [src2q + r6] ; row 3 of pix1 + + psadbw m1, m2 + psadbw m3, m4 + paddd m0, m1 + paddd m0, m3 + + lea src2q, [src2q + 4 * stride2q] + lea src1q, [src1q + 4 * stride1q] + + dec r4d + jnz .loop + + vextracti128 xm1, m0, 1 + paddd xm0, xm1 + pshufd xm1, xm0, 2 + paddd xm0, xm1 + movd eax, xm0 + RET + +;------------------------------------------------------------------------------- +; int ff_pixelutils_sad_[au]_32x32_avx2(const uint8_t *src1, ptrdiff_t stride1, +; const uint8_t *src2, ptrdiff_t stride2); +;------------------------------------------------------------------------------- +%macro SAD_AVX2_32x32 1 +INIT_YMM avx2 +cglobal pixelutils_sad_%1_32x32, 4,7,3, src1, stride1, src2, stride2 + pxor m0, m0 + mov r4d, 32/4 + lea r5, [stride1q * 3] + lea r6, [stride2q * 3] + +.loop: + mov%1 m1, [src2q] ; row 0 of pix1 + psadbw m1, [src1q] + mov%1 m2, [src2q + stride2q] ; row 1 of pix1 + psadbw m2, [src1q + stride1q] + + paddd m0, m1 + paddd m0, m2 + + mov%1 m1, [src2q + 2 * stride2q] ; row 2 of pix1 + psadbw m1, [src1q + 2 * stride1q] + mov%1 m2, [src2q + r6] ; row 3 of pix1 + psadbw m2, [src1q + r5] + + paddd m0, m1 + paddd m0, m2 + + lea src2q, [src2q + 4 * stride2q] + lea src1q, [src1q + 4 * stride1q] + + dec r4d + jnz .loop + + vextracti128 xm1, m0, 1 + paddd xm0, xm1 + pshufd xm1, xm0, 2 + paddd xm0, xm1 + movd eax, xm0 + RET +%endmacro + +SAD_AVX2_32x32 a +SAD_AVX2_32x32 u diff --git a/libavutil/x86/pixelutils_init.c b/libavutil/x86/pixelutils_init.c index c24a533aea..dd05421b50 100644 --- a/libavutil/x86/pixelutils_init.c +++ b/libavutil/x86/pixelutils_init.c @@ -35,6 +35,20 @@ int ff_pixelutils_sad_a_16x16_sse2(const uint8_t *src1, ptrdiff_t stride1, int ff_pixelutils_sad_u_16x16_sse2(const uint8_t *src1, ptrdiff_t stride1, const uint8_t *src2, ptrdiff_t stride2); +int ff_pixelutils_sad_32x32_sse2(const uint8_t *src1, ptrdiff_t stride1, + const uint8_t *src2, ptrdiff_t stride2); +int ff_pixelutils_sad_a_32x32_sse2(const uint8_t *src1, ptrdiff_t stride1, + const uint8_t *src2, ptrdiff_t stride2); +int ff_pixelutils_sad_u_32x32_sse2(const uint8_t *src1, ptrdiff_t stride1, + const uint8_t *src2, ptrdiff_t stride2); + +int ff_pixelutils_sad_32x32_avx2(const uint8_t *src1, ptrdiff_t stride1, + const uint8_t *src2, ptrdiff_t stride2); +int ff_pixelutils_sad_a_32x32_avx2(const uint8_t *src1, ptrdiff_t stride1, + const uint8_t *src2, ptrdiff_t stride2); +int ff_pixelutils_sad_u_32x32_avx2(const uint8_t *src1, ptrdiff_t stride1, + const uint8_t *src2, ptrdiff_t stride2); + void ff_pixelutils_sad_init_x86(av_pixelutils_sad_fn *sad, int aligned) { int cpu_flags = av_get_cpu_flags(); @@ -61,4 +75,20 @@ void ff_pixelutils_sad_init_x86(av_pixelutils_sad_fn *sad, int aligned) case 2: sad[3] = ff_pixelutils_sad_a_16x16_sse2; break; // src1 aligned, src2 aligned } } + + if (EXTERNAL_SSE2(cpu_flags)) { + switch (aligned) { + case 0: sad[4] = ff_pixelutils_sad_32x32_sse2; break; // src1 unaligned, src2 unaligned + case 1: sad[4] = ff_pixelutils_sad_u_32x32_sse2; break; // src1 aligned, src2 unaligned + case 2: sad[4] = ff_pixelutils_sad_a_32x32_sse2; break; // src1 aligned, src2 aligned + } + } + + if (EXTERNAL_AVX2(cpu_flags)) { + switch (aligned) { + case 0: sad[4] = ff_pixelutils_sad_32x32_avx2; break; // src1 unaligned, src2 unaligned + case 1: sad[4] = ff_pixelutils_sad_u_32x32_avx2; break; // src1 aligned, src2 unaligned + case 2: sad[4] = ff_pixelutils_sad_a_32x32_avx2; break; // src1 aligned, src2 aligned + } + } }

1 0

lavutil/pixelutils: add sad_32x32 in pixelutils API.
by Jun Zhao 31 Jul '18

31 Jul '18

ffmpeg | branch: master | Jun Zhao <mypopydev(a)gmail.com> | Tue Jul 10 00:34:26 2018 +0800| [b8bf7408dc189668efa3e45b418349ce3a7c816e] | committer: Jun Zhao lavutil/pixelutils: add sad_32x32 in pixelutils API. add sad_32x32 in pixelutils API, and update the fate. Signed-off-by: Jun Zhao <mypopydev(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b8bf7408dc189668e… --- libavutil/pixelutils.c | 2 ++ libavutil/tests/pixelutils.c | 2 +- tests/ref/fate/pixelutils | 12 ++++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/libavutil/pixelutils.c b/libavutil/pixelutils.c index b663027b42..ebee3d6f90 100644 --- a/libavutil/pixelutils.c +++ b/libavutil/pixelutils.c @@ -51,12 +51,14 @@ DECLARE_BLOCK_FUNCTIONS(2) DECLARE_BLOCK_FUNCTIONS(4) DECLARE_BLOCK_FUNCTIONS(8) DECLARE_BLOCK_FUNCTIONS(16) +DECLARE_BLOCK_FUNCTIONS(32) static const av_pixelutils_sad_fn sad_c[] = { block_sad_2x2_c, block_sad_4x4_c, block_sad_8x8_c, block_sad_16x16_c, + block_sad_32x32_c, }; #endif /* CONFIG_PIXELUTILS */ diff --git a/libavutil/tests/pixelutils.c b/libavutil/tests/pixelutils.c index ec4dc8fe8f..2f807584b3 100644 --- a/libavutil/tests/pixelutils.c +++ b/libavutil/tests/pixelutils.c @@ -115,7 +115,7 @@ int main(void) goto end; /* Exact buffer sizes, to check for overreads */ - for (i = 1; i <= 4; i++) { + for (i = 1; i <= 5; i++) { for (align = 0; align < 3; align++) { int size1, size2; diff --git a/tests/ref/fate/pixelutils b/tests/ref/fate/pixelutils index 493497fb88..434904e477 100644 --- a/tests/ref/fate/pixelutils +++ b/tests/ref/fate/pixelutils @@ -2,38 +2,47 @@ [OK] [UU] SAD [random] 4x4=1370 ref=1370 [OK] [UU] SAD [random] 8x8=5178 ref=5178 [OK] [UU] SAD [random] 16x16=20946 ref=20946 +[OK] [UU] SAD [random] 32x32=83150 ref=83150 [OK] [AU] SAD [random] 2x2=320 ref=320 [OK] [AU] SAD [random] 4x4=1522 ref=1522 [OK] [AU] SAD [random] 8x8=5821 ref=5821 [OK] [AU] SAD [random] 16x16=21951 ref=21951 +[OK] [AU] SAD [random] 32x32=86983 ref=86983 [OK] [AA] SAD [random] 2x2=276 ref=276 [OK] [AA] SAD [random] 4x4=1521 ref=1521 [OK] [AA] SAD [random] 8x8=5130 ref=5130 [OK] [AA] SAD [random] 16x16=20775 ref=20775 +[OK] [AA] SAD [random] 32x32=83402 ref=83402 [OK] [UU] SAD [max] 2x2=1020 ref=1020 [OK] [UU] SAD [max] 4x4=4080 ref=4080 [OK] [UU] SAD [max] 8x8=16320 ref=16320 [OK] [UU] SAD [max] 16x16=65280 ref=65280 +[OK] [UU] SAD [max] 32x32=261120 ref=261120 [OK] [AU] SAD [max] 2x2=1020 ref=1020 [OK] [AU] SAD [max] 4x4=4080 ref=4080 [OK] [AU] SAD [max] 8x8=16320 ref=16320 [OK] [AU] SAD [max] 16x16=65280 ref=65280 +[OK] [AU] SAD [max] 32x32=261120 ref=261120 [OK] [AA] SAD [max] 2x2=1020 ref=1020 [OK] [AA] SAD [max] 4x4=4080 ref=4080 [OK] [AA] SAD [max] 8x8=16320 ref=16320 [OK] [AA] SAD [max] 16x16=65280 ref=65280 +[OK] [AA] SAD [max] 32x32=261120 ref=261120 [OK] [UU] SAD [min] 2x2=0 ref=0 [OK] [UU] SAD [min] 4x4=0 ref=0 [OK] [UU] SAD [min] 8x8=0 ref=0 [OK] [UU] SAD [min] 16x16=0 ref=0 +[OK] [UU] SAD [min] 32x32=0 ref=0 [OK] [AU] SAD [min] 2x2=0 ref=0 [OK] [AU] SAD [min] 4x4=0 ref=0 [OK] [AU] SAD [min] 8x8=0 ref=0 [OK] [AU] SAD [min] 16x16=0 ref=0 +[OK] [AU] SAD [min] 32x32=0 ref=0 [OK] [AA] SAD [min] 2x2=0 ref=0 [OK] [AA] SAD [min] 4x4=0 ref=0 [OK] [AA] SAD [min] 8x8=0 ref=0 [OK] [AA] SAD [min] 16x16=0 ref=0 +[OK] [AA] SAD [min] 32x32=0 ref=0 [OK] [UU] SAD [small] 2x2=400 ref=400 [OK] [AU] SAD [small] 2x2=384 ref=384 [OK] [AA] SAD [small] 2x2=409 ref=409 @@ -46,3 +55,6 @@ [OK] [UU] SAD [small] 16x16=19490 ref=19490 [OK] [AU] SAD [small] 16x16=21037 ref=21037 [OK] [AA] SAD [small] 16x16=22986 ref=22986 +[OK] [UU] SAD [small] 32x32=86550 ref=86550 +[OK] [AU] SAD [small] 32x32=83656 ref=83656 +[OK] [AA] SAD [small] 32x32=85164 ref=85164 \ No newline at end of file

1 0

avcodec/h264_mp4toannexb_bsf: use enum constants for the NAL unit type values
by James Almer 30 Jul '18

30 Jul '18

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Sun Jul 29 18:22:25 2018 -0300| [a9a433564d73b9d961c3ca16dbc74d8e090dd3fb] | committer: James Almer avcodec/h264_mp4toannexb_bsf: use enum constants for the NAL unit type values Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a9a433564d73b9d96… --- libavcodec/h264_mp4toannexb_bsf.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libavcodec/h264_mp4toannexb_bsf.c b/libavcodec/h264_mp4toannexb_bsf.c index 292d106433..794c82e650 100644 --- a/libavcodec/h264_mp4toannexb_bsf.c +++ b/libavcodec/h264_mp4toannexb_bsf.c @@ -26,6 +26,7 @@ #include "avcodec.h" #include "bsf.h" +#include "h264.h" typedef struct H264BSFContext { int32_t sps_offset; @@ -209,9 +210,9 @@ static int h264_mp4toannexb_filter(AVBSFContext *ctx, AVPacket *out) if (nal_size > buf_end - buf || nal_size < 0) goto fail; - if (unit_type == 7) + if (unit_type == H264_NAL_SPS) s->idr_sps_seen = s->new_idr = 1; - else if (unit_type == 8) { + else if (unit_type == H264_NAL_PPS) { s->idr_pps_seen = s->new_idr = 1; /* if SPS has not been seen yet, prepend the AVCC one to PPS */ if (!s->idr_sps_seen) { @@ -232,18 +233,18 @@ static int h264_mp4toannexb_filter(AVBSFContext *ctx, AVPacket *out) /* if this is a new IDR picture following an IDR picture, reset the idr flag. * Just check first_mb_in_slice to be 0 as this is the simplest solution. * This could be checking idr_pic_id instead, but would complexify the parsing. */ - if (!s->new_idr && unit_type == 5 && (buf[1] & 0x80)) + if (!s->new_idr && unit_type == H264_NAL_IDR_SLICE && (buf[1] & 0x80)) s->new_idr = 1; /* prepend only to the first type 5 NAL unit of an IDR picture, if no sps/pps are already present */ - if (s->new_idr && unit_type == 5 && !s->idr_sps_seen && !s->idr_pps_seen) { + if (s->new_idr && unit_type == H264_NAL_IDR_SLICE && !s->idr_sps_seen && !s->idr_pps_seen) { if ((ret=alloc_and_copy(out, ctx->par_out->extradata, ctx->par_out->extradata_size, buf, nal_size, 1)) < 0) goto fail; s->new_idr = 0; /* if only SPS has been seen, also insert PPS */ - } else if (s->new_idr && unit_type == 5 && s->idr_sps_seen && !s->idr_pps_seen) { + } else if (s->new_idr && unit_type == H264_NAL_IDR_SLICE && s->idr_sps_seen && !s->idr_pps_seen) { if (s->pps_offset == -1) { av_log(ctx, AV_LOG_WARNING, "PPS not present in the stream, nor in AVCC, stream may be unreadable\n"); if ((ret = alloc_and_copy(out, NULL, 0, buf, nal_size, 0)) < 0) @@ -253,9 +254,9 @@ static int h264_mp4toannexb_filter(AVBSFContext *ctx, AVPacket *out) buf, nal_size, 1)) < 0) goto fail; } else { - if ((ret=alloc_and_copy(out, NULL, 0, buf, nal_size, unit_type == 7 || unit_type == 8)) < 0) + if ((ret=alloc_and_copy(out, NULL, 0, buf, nal_size, unit_type == H264_NAL_SPS || unit_type == H264_NAL_PPS)) < 0) goto fail; - if (!s->new_idr && unit_type == 1) { + if (!s->new_idr && unit_type == H264_NAL_SLICE) { s->new_idr = 1; s->idr_sps_seen = 0; s->idr_pps_seen = 0;

1 0

fate: add tests for audio channel up-/downmixing with pan filter
by Tobias Rapp 30 Jul '18

30 Jul '18

ffmpeg | branch: master | Tobias Rapp <t.rapp(a)noa-archive.com> | Thu Jul 19 13:59:37 2018 +0200| [ec517ad9f9d4676e56c5f2e0054b9bb7b9c175ec] | committer: Tobias Rapp fate: add tests for audio channel up-/downmixing with pan filter Add tests for upmixing and downmixing with audio channel counts that have a corresponding default layout and also tests where there is no default layout. Update the existing "stereo4" test so it actually outputs stereo like the other stereo tests. Rename the previous "stereo4" test into "upmix1". Reviewed-by: Nicolas George <george(a)nsup.org> Signed-off-by: Tobias Rapp <t.rapp(a)noa-archive.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ec517ad9f9d4676e5… --- tests/fate/filter-audio.mak | 22 +++++++++++++++++++- tests/ref/fate/filter-pan-downmix1 | 26 +++++++++++++++++++++++ tests/ref/fate/filter-pan-downmix2 | 26 +++++++++++++++++++++++ tests/ref/fate/filter-pan-stereo4 | 42 +++++++++++++++++++------------------- tests/ref/fate/filter-pan-upmix1 | 26 +++++++++++++++++++++++ tests/ref/fate/filter-pan-upmix2 | 26 +++++++++++++++++++++++ 6 files changed, 146 insertions(+), 22 deletions(-) diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak index 6125a37f35..473b8ae9a5 100644 --- a/tests/fate/filter-audio.mak +++ b/tests/fate/filter-audio.mak @@ -156,7 +156,27 @@ fate-filter-pan-stereo3: CMD = framecrc -ss 3.14 -i $(SRC) -frames:a 20 -filter: FATE_AFILTER-$(call FILTERDEMDECENCMUX, PAN, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-pan-stereo4 fate-filter-pan-stereo4: tests/data/asynth-44100-2.wav fate-filter-pan-stereo4: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav -fate-filter-pan-stereo4: CMD = framecrc -ss 3.14 -guess_layout_max 0 -i $(SRC) -frames:a 20 -filter:a "pan=4C|c0=c0-0.5*c1|c1=c1+0.5*c0|c2=0*c0|c3=0*c0" +fate-filter-pan-stereo4: CMD = framecrc -ss 3.14 -guess_layout_max 0 -i $(SRC) -frames:a 20 -filter:a "pan=2C|c0=c0-0.5*c1|c1=c1+0.5*c0" + +FATE_AFILTER-$(call FILTERDEMDECENCMUX, PAN, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-pan-upmix1 +fate-filter-pan-upmix1: tests/data/asynth-44100-2.wav +fate-filter-pan-upmix1: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav +fate-filter-pan-upmix1: CMD = framecrc -ss 3.14 -guess_layout_max 0 -i $(SRC) -frames:a 20 -filter:a "pan=4C|c0=c0-0.5*c1|c1=c1+0.5*c0|c2=0*c0|c3=0*c0" + +FATE_AFILTER-$(call FILTERDEMDECENCMUX, PAN, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-pan-upmix2 +fate-filter-pan-upmix2: tests/data/asynth-44100-4.wav +fate-filter-pan-upmix2: SRC = $(TARGET_PATH)/tests/data/asynth-44100-4.wav +fate-filter-pan-upmix2: CMD = framecrc -ss 3.14 -i $(SRC) -frames:a 20 -filter:a "pan=9C|c0=c0-c1|c1=c2+c3|c2=c0+c1|c3=c2-c3|c4=c1-c0|c5=c3+c2|c6=c1+c0|c7=c3-c2|c8=c0-c3" + +FATE_AFILTER-$(call FILTERDEMDECENCMUX, PAN, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-pan-downmix1 +fate-filter-pan-downmix1: tests/data/asynth-44100-4.wav +fate-filter-pan-downmix1: SRC = $(TARGET_PATH)/tests/data/asynth-44100-4.wav +fate-filter-pan-downmix1: CMD = framecrc -ss 3.14 -i $(SRC) -frames:a 20 -filter:a "pan=2c|FL<FL+0.5*FC+0.6*BL+0.6*SL|FR<FR+0.5*FC+0.6*BR+0.6*SR" + +FATE_AFILTER-$(call FILTERDEMDECENCMUX, PAN, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-pan-downmix2 +fate-filter-pan-downmix2: tests/data/asynth-44100-11.wav +fate-filter-pan-downmix2: SRC = $(TARGET_PATH)/tests/data/asynth-44100-11.wav +fate-filter-pan-downmix2: CMD = framecrc -ss 3.14 -i $(SRC) -frames:a 20 -filter:a "pan=5C|c0=0.7*c0+0.7*c10|c1=c9|c2=c8|c3=c7|c4=c6" FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, SILENCEREMOVE, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-silenceremove fate-filter-silenceremove: SRC = $(TARGET_SAMPLES)/audio-reference/divertimenti_2ch_96kHz_s24.wav diff --git a/tests/ref/fate/filter-pan-downmix1 b/tests/ref/fate/filter-pan-downmix1 new file mode 100644 index 0000000000..47d5044dac --- /dev/null +++ b/tests/ref/fate/filter-pan-downmix1 @@ -0,0 +1,26 @@ +#tb 0: 1/44100 +#media_type 0: audio +#codec_id 0: pcm_s16le +#sample_rate 0: 44100 +#channel_layout 0: 3 +#channel_layout_name 0: stereo +0, 0, 0, 512, 2048, 0xccb10170 +0, 512, 512, 512, 2048, 0xc51cf8e7 +0, 1024, 1024, 512, 2048, 0x959eef2d +0, 1536, 1536, 512, 2048, 0x559f0751 +0, 2048, 2048, 512, 2048, 0x4c4c08e1 +0, 2560, 2560, 512, 2048, 0x41c3fd6f +0, 3072, 3072, 512, 2048, 0x4c92f8d2 +0, 3584, 3584, 512, 2048, 0x9defee05 +0, 4096, 4096, 512, 2048, 0x2d33f4dc +0, 4608, 4608, 512, 2048, 0xd854eeca +0, 5120, 5120, 512, 2048, 0xdb55eaf7 +0, 5632, 5632, 512, 2048, 0x2bac060d +0, 6144, 6144, 512, 2048, 0x91beec0f +0, 6656, 6656, 512, 2048, 0x3262f0da +0, 7168, 7168, 512, 2048, 0xf00708a6 +0, 7680, 7680, 512, 2048, 0xc90cfa02 +0, 8192, 8192, 512, 2048, 0x09e9f413 +0, 8704, 8704, 512, 2048, 0xcd0d0c36 +0, 9216, 9216, 512, 2048, 0x6f6bff82 +0, 9728, 9728, 512, 2048, 0x18a40912 diff --git a/tests/ref/fate/filter-pan-downmix2 b/tests/ref/fate/filter-pan-downmix2 new file mode 100644 index 0000000000..8d3ee10812 --- /dev/null +++ b/tests/ref/fate/filter-pan-downmix2 @@ -0,0 +1,26 @@ +#tb 0: 1/44100 +#media_type 0: audio +#codec_id 0: pcm_s16le +#sample_rate 0: 44100 +#channel_layout 0: 0 +#channel_layout_name 0: 5 channels +0, 0, 0, 186, 1860, 0x2480a20e +0, 186, 186, 186, 1860, 0xde9e9c40 +0, 372, 372, 186, 1860, 0xc497b2a0 +0, 558, 558, 186, 1860, 0xe5a8a2d7 +0, 744, 744, 186, 1860, 0x01c09b6a +0, 930, 930, 186, 1860, 0xb26fae2f +0, 1116, 1116, 186, 1860, 0x1292a9ab +0, 1302, 1302, 186, 1860, 0xe7a79136 +0, 1488, 1488, 186, 1860, 0x57dc81a3 +0, 1674, 1674, 186, 1860, 0xc13b9a1b +0, 1860, 1860, 186, 1860, 0xdf7c9fd6 +0, 2046, 2046, 186, 1860, 0x4d769cff +0, 2232, 2232, 186, 1860, 0xb8b79977 +0, 2418, 2418, 186, 1860, 0xd287989f +0, 2604, 2604, 186, 1860, 0xc2a38f03 +0, 2790, 2790, 186, 1860, 0xd7149438 +0, 2976, 2976, 186, 1860, 0xc3719081 +0, 3162, 3162, 186, 1860, 0xb9fba1a3 +0, 3348, 3348, 186, 1860, 0xe92cb2de +0, 3534, 3534, 186, 1860, 0x9dd9b272 diff --git a/tests/ref/fate/filter-pan-stereo4 b/tests/ref/fate/filter-pan-stereo4 index 87c70a7f1f..6d10ed62a8 100644 --- a/tests/ref/fate/filter-pan-stereo4 +++ b/tests/ref/fate/filter-pan-stereo4 @@ -3,24 +3,24 @@ #codec_id 0: pcm_s16le #sample_rate 0: 44100 #channel_layout 0: 0 -#channel_layout_name 0: 4 channels -0, 0, 0, 1024, 8192, 0xdaadfc44 -0, 1024, 1024, 1024, 8192, 0xe6d9ec37 -0, 2048, 2048, 1024, 8192, 0x5edfea64 -0, 3072, 3072, 1024, 8192, 0x7f7be38c -0, 4096, 4096, 1024, 8192, 0x3f60f5c9 -0, 5120, 5120, 1024, 8192, 0xcee4fe06 -0, 6144, 6144, 1024, 8192, 0xdb98fa3e -0, 7168, 7168, 1024, 8192, 0x4cb30687 -0, 8192, 8192, 1024, 8192, 0x00f6ecab -0, 9216, 9216, 1024, 8192, 0xa7b0e0db -0, 10240, 10240, 1024, 8192, 0xc2dcf89c -0, 11264, 11264, 1024, 8192, 0x30d6f2fe -0, 12288, 12288, 1024, 8192, 0xf83ae182 -0, 13312, 13312, 1024, 8192, 0xeecd05d1 -0, 14336, 14336, 1024, 8192, 0xfd3b0559 -0, 15360, 15360, 1024, 8192, 0xcd69e3e6 -0, 16384, 16384, 1024, 8192, 0xdf80fc29 -0, 17408, 17408, 1024, 8192, 0x7e8bf52b -0, 18432, 18432, 1024, 8192, 0xee07e5f7 -0, 19456, 19456, 1024, 8192, 0xc874f294 +#channel_layout_name 0: 2 channels +0, 0, 0, 1024, 4096, 0x7bd6fc44 +0, 1024, 1024, 1024, 4096, 0xed38ec37 +0, 2048, 2048, 1024, 4096, 0x4696ea64 +0, 3072, 3072, 1024, 4096, 0xf2c8e38c +0, 4096, 4096, 1024, 4096, 0x9aa8f5c9 +0, 5120, 5120, 1024, 4096, 0xfb46fe06 +0, 6144, 6144, 1024, 4096, 0x6700fa3e +0, 7168, 7168, 1024, 4096, 0x235e0687 +0, 8192, 8192, 1024, 4096, 0x8b9aecab +0, 9216, 9216, 1024, 4096, 0x62f3e0db +0, 10240, 10240, 1024, 4096, 0xe59ef89c +0, 11264, 11264, 1024, 4096, 0x1a48f2fe +0, 12288, 12288, 1024, 4096, 0x9026e182 +0, 13312, 13312, 1024, 4096, 0xec4d05d1 +0, 14336, 14336, 1024, 4096, 0x7ee70559 +0, 15360, 15360, 1024, 4096, 0x807ae3e6 +0, 16384, 16384, 1024, 4096, 0xf0d2fc29 +0, 17408, 17408, 1024, 4096, 0xd9e7f52b +0, 18432, 18432, 1024, 4096, 0x0f1ce5f7 +0, 19456, 19456, 1024, 4096, 0x6b3cf294 diff --git a/tests/ref/fate/filter-pan-upmix1 b/tests/ref/fate/filter-pan-upmix1 new file mode 100644 index 0000000000..87c70a7f1f --- /dev/null +++ b/tests/ref/fate/filter-pan-upmix1 @@ -0,0 +1,26 @@ +#tb 0: 1/44100 +#media_type 0: audio +#codec_id 0: pcm_s16le +#sample_rate 0: 44100 +#channel_layout 0: 0 +#channel_layout_name 0: 4 channels +0, 0, 0, 1024, 8192, 0xdaadfc44 +0, 1024, 1024, 1024, 8192, 0xe6d9ec37 +0, 2048, 2048, 1024, 8192, 0x5edfea64 +0, 3072, 3072, 1024, 8192, 0x7f7be38c +0, 4096, 4096, 1024, 8192, 0x3f60f5c9 +0, 5120, 5120, 1024, 8192, 0xcee4fe06 +0, 6144, 6144, 1024, 8192, 0xdb98fa3e +0, 7168, 7168, 1024, 8192, 0x4cb30687 +0, 8192, 8192, 1024, 8192, 0x00f6ecab +0, 9216, 9216, 1024, 8192, 0xa7b0e0db +0, 10240, 10240, 1024, 8192, 0xc2dcf89c +0, 11264, 11264, 1024, 8192, 0x30d6f2fe +0, 12288, 12288, 1024, 8192, 0xf83ae182 +0, 13312, 13312, 1024, 8192, 0xeecd05d1 +0, 14336, 14336, 1024, 8192, 0xfd3b0559 +0, 15360, 15360, 1024, 8192, 0xcd69e3e6 +0, 16384, 16384, 1024, 8192, 0xdf80fc29 +0, 17408, 17408, 1024, 8192, 0x7e8bf52b +0, 18432, 18432, 1024, 8192, 0xee07e5f7 +0, 19456, 19456, 1024, 8192, 0xc874f294 diff --git a/tests/ref/fate/filter-pan-upmix2 b/tests/ref/fate/filter-pan-upmix2 new file mode 100644 index 0000000000..56db1c17e1 --- /dev/null +++ b/tests/ref/fate/filter-pan-upmix2 @@ -0,0 +1,26 @@ +#tb 0: 1/44100 +#media_type 0: audio +#codec_id 0: pcm_s16le +#sample_rate 0: 44100 +#channel_layout 0: 0 +#channel_layout_name 0: 9 channels +0, 0, 0, 512, 9216, 0xd561bb2b +0, 512, 512, 512, 9216, 0x591805f9 +0, 1024, 1024, 512, 9216, 0xd46fecd6 +0, 1536, 1536, 512, 9216, 0x1e1f176b +0, 2048, 2048, 512, 9216, 0xe383f1a6 +0, 2560, 2560, 512, 9216, 0xc628c661 +0, 3072, 3072, 512, 9216, 0x1ad09914 +0, 3584, 3584, 512, 9216, 0x798533cc +0, 4096, 4096, 512, 9216, 0x4913d581 +0, 4608, 4608, 512, 9216, 0x59f506b3 +0, 5120, 5120, 512, 9216, 0x8885fa28 +0, 5632, 5632, 512, 9216, 0x769ffa95 +0, 6144, 6144, 512, 9216, 0xc636cc46 +0, 6656, 6656, 512, 9216, 0x4740f34b +0, 7168, 7168, 512, 9216, 0x00d2de28 +0, 7680, 7680, 512, 9216, 0x704a07fc +0, 8192, 8192, 512, 9216, 0x54a4f682 +0, 8704, 8704, 512, 9216, 0xd6dac181 +0, 9216, 9216, 512, 9216, 0xfcd6fe28 +0, 9728, 9728, 512, 9216, 0x5c41cbdc

1 0

tests/audiogen: raise channel count limit to 12
by Tobias Rapp 30 Jul '18

30 Jul '18

ffmpeg | branch: master | Tobias Rapp <t.rapp(a)noa-archive.com> | Thu Jul 19 11:49:33 2018 +0200| [b82632b59f1182a550f61013773d38e0dc9b4318] | committer: Tobias Rapp tests/audiogen: raise channel count limit to 12 Reviewed-by: Michael Niedermayer <michael(a)niedermayer.cc> Signed-off-by: Tobias Rapp <t.rapp(a)noa-archive.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b82632b59f1182a55… --- tests/audiogen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/audiogen.c b/tests/audiogen.c index 8d596b5108..c43bb70ff9 100644 --- a/tests/audiogen.c +++ b/tests/audiogen.c @@ -26,7 +26,7 @@ #include <stdio.h> #include <string.h> -#define MAX_CHANNELS 8 +#define MAX_CHANNELS 12 static unsigned int myrnd(unsigned int *seed_ptr, int n) {

1 0

libavformat/dashenc: Fix relative URI of HLS master playlist
by Antonio Morell 30 Jul '18

30 Jul '18

ffmpeg | branch: master | Antonio Morell <antonio.morell(a)system73.com> | Thu Jul 26 14:22:21 2018 +0100| [6f3e2913f52b573a9502cb722084d42a8de2d926] | committer: Karthick Jeyapal libavformat/dashenc: Fix relative URI of HLS master playlist > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6f3e2913f52b573a9… --- libavformat/dashenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index a9b8b1d4f6..ae57fd5493 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -868,7 +868,7 @@ static int write_manifest(AVFormatContext *s, int final) int max_audio_bitrate = 0; if (*c->dirname) - snprintf(filename_hls, sizeof(filename_hls), "%s/master.m3u8", c->dirname); + snprintf(filename_hls, sizeof(filename_hls), "%smaster.m3u8", c->dirname); else snprintf(filename_hls, sizeof(filename_hls), "master.m3u8");

1 0

doc/formats: Add documentation for skip_estimate_duration_from_pts
by Michael Niedermayer 30 Jul '18

30 Jul '18

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Wed Jul 25 00:49:39 2018 +0200| [67fb9c75efec9f069fc57b3ed211a35c63c686e5] | committer: Gyan Doshi doc/formats: Add documentation for skip_estimate_duration_from_pts Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> Signed-off-by: Gyan Doshi <ffmpeg(a)gyani.pro> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=67fb9c75efec9f069… --- doc/formats.texi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/formats.texi b/doc/formats.texi index a97d61063a..4f334e03c7 100644 --- a/doc/formats.texi +++ b/doc/formats.texi @@ -220,6 +220,10 @@ ffprobe -dump_separator " @item max_streams @var{integer} (@emph{input}) Specifies the maximum number of streams. This can be used to reject files that would require too many resources due to a large number of streams. + +@item skip_estimate_duration_from_pts @var{bool} (@emph{input}) +Skip estimation of input duration when calculated using PTS. +At present, applicable for MPEG-PS and MPEG-TS. @end table @c man end FORMAT OPTIONS

1 0

configure: add missing aandcttables dependency to asv1 and asv2 encoders
by James Almer 30 Jul '18

30 Jul '18

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Sun Jul 29 21:30:00 2018 -0300| [269daf5985db693012cf541beb450252193a9e6f] | committer: James Almer configure: add missing aandcttables dependency to asv1 and asv2 encoders Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=269daf5985db69301… --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index d6df466bd6..7e3121ead9 100755 --- a/configure +++ b/configure @@ -2563,9 +2563,9 @@ aptx_encoder_select="audio_frame_queue" aptx_hd_decoder_select="audio_frame_queue" aptx_hd_encoder_select="audio_frame_queue" asv1_decoder_select="blockdsp bswapdsp idctdsp" -asv1_encoder_select="bswapdsp fdctdsp pixblockdsp" +asv1_encoder_select="aandcttables bswapdsp fdctdsp pixblockdsp" asv2_decoder_select="blockdsp bswapdsp idctdsp" -asv2_encoder_select="bswapdsp fdctdsp pixblockdsp" +asv2_encoder_select="aandcttables bswapdsp fdctdsp pixblockdsp" atrac1_decoder_select="mdct sinewin" atrac3_decoder_select="mdct" atrac3p_decoder_select="mdct sinewin"

1 0

configure: add missing aandcttables dependency to mpegvideoenc
by James Almer 30 Jul '18

30 Jul '18

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Sun Jul 29 21:22:28 2018 -0300| [c38b9c2bf742834a597b5438da38d21b52242b57] | committer: James Almer configure: add missing aandcttables dependency to mpegvideoenc Also remove the superfluous aandcttables dependency from all the modules that only need it because of mpegvideoenc Fixes ticket #7333 Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c38b9c2bf742834a5… --- configure | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/configure b/configure index f57ef1844b..d6df466bd6 100755 --- a/configure +++ b/configure @@ -2532,7 +2532,7 @@ mpeg_er_select="error_resilience" mpegaudio_select="mpegaudiodsp mpegaudioheader" mpegaudiodsp_select="dct" mpegvideo_select="blockdsp h264chroma hpeldsp idctdsp me_cmp mpeg_er videodsp" -mpegvideoenc_select="me_cmp mpegvideo pixblockdsp qpeldsp" +mpegvideoenc_select="aandcttables me_cmp mpegvideo pixblockdsp qpeldsp" vc1dsp_select="h264chroma qpeldsp startcode" rdft_select="fft" @@ -2553,7 +2553,7 @@ als_decoder_select="bswapdsp" amrnb_decoder_select="lsp" amrwb_decoder_select="lsp" amv_decoder_select="sp5x_decoder exif" -amv_encoder_select="aandcttables jpegtables mpegvideoenc" +amv_encoder_select="jpegtables mpegvideoenc" ape_decoder_select="bswapdsp llauddsp" apng_decoder_deps="zlib" apng_encoder_deps="zlib" @@ -2585,7 +2585,7 @@ dca_decoder_select="mdct" dds_decoder_select="texturedsp" dirac_decoder_select="dirac_parse dwt golomb videodsp mpegvideoenc" dnxhd_decoder_select="blockdsp idctdsp" -dnxhd_encoder_select="aandcttables blockdsp fdctdsp idctdsp mpegvideoenc pixblockdsp" +dnxhd_encoder_select="blockdsp fdctdsp idctdsp mpegvideoenc pixblockdsp" dolby_e_decoder_select="mdct" dvvideo_decoder_select="dvprofile idctdsp" dvvideo_encoder_select="dvprofile fdctdsp me_cmp pixblockdsp" @@ -2616,9 +2616,9 @@ g2m_decoder_deps="zlib" g2m_decoder_select="blockdsp idctdsp jpegtables" g729_decoder_select="audiodsp" h261_decoder_select="mpegvideo" -h261_encoder_select="aandcttables mpegvideoenc" +h261_encoder_select="mpegvideoenc" h263_decoder_select="h263_parser h263dsp mpegvideo qpeldsp" -h263_encoder_select="aandcttables h263dsp mpegvideoenc" +h263_encoder_select="h263dsp mpegvideoenc" h263i_decoder_select="h263_decoder" h263p_decoder_select="h263_decoder" h263p_encoder_select="h263_encoder" @@ -2639,14 +2639,14 @@ interplay_video_decoder_select="hpeldsp" jpegls_decoder_select="mjpeg_decoder" jv_decoder_select="blockdsp" lagarith_decoder_select="llviddsp" -ljpeg_encoder_select="aandcttables idctdsp jpegtables mpegvideoenc" +ljpeg_encoder_select="idctdsp jpegtables mpegvideoenc" magicyuv_decoder_select="llviddsp" magicyuv_encoder_select="llvidencdsp" mdec_decoder_select="blockdsp idctdsp mpegvideo" metasound_decoder_select="lsp mdct sinewin" mimic_decoder_select="blockdsp bswapdsp hpeldsp idctdsp" mjpeg_decoder_select="blockdsp hpeldsp exif idctdsp jpegtables" -mjpeg_encoder_select="aandcttables jpegtables mpegvideoenc" +mjpeg_encoder_select="jpegtables mpegvideoenc" mjpegb_decoder_select="mjpeg_decoder" mlp_decoder_select="mlp_parser" mlp_encoder_select="lpc" @@ -2665,9 +2665,9 @@ mpc7_decoder_select="bswapdsp mpegaudiodsp" mpc8_decoder_select="mpegaudiodsp" mpegvideo_decoder_select="mpegvideo" mpeg1video_decoder_select="mpegvideo" -mpeg1video_encoder_select="aandcttables mpegvideoenc h263dsp" +mpeg1video_encoder_select="mpegvideoenc h263dsp" mpeg2video_decoder_select="mpegvideo" -mpeg2video_encoder_select="aandcttables mpegvideoenc h263dsp" +mpeg2video_encoder_select="mpegvideoenc h263dsp" mpeg4_decoder_select="h263_decoder mpeg4video_parser" mpeg4_encoder_select="h263_encoder" msa1_decoder_select="mss34dsp" @@ -2710,14 +2710,14 @@ screenpresso_decoder_deps="zlib" shorten_decoder_select="bswapdsp" sipr_decoder_select="lsp" snow_decoder_select="dwt h264qpel hpeldsp me_cmp rangecoder videodsp" -snow_encoder_select="aandcttables dwt h264qpel hpeldsp me_cmp mpegvideoenc rangecoder" +snow_encoder_select="dwt h264qpel hpeldsp me_cmp mpegvideoenc rangecoder" sonic_decoder_select="golomb rangecoder" sonic_encoder_select="golomb rangecoder" sonic_ls_encoder_select="golomb rangecoder" sp5x_decoder_select="mjpeg_decoder" srgc_decoder_deps="zlib" svq1_decoder_select="hpeldsp" -svq1_encoder_select="aandcttables hpeldsp me_cmp mpegvideoenc" +svq1_encoder_select="hpeldsp me_cmp mpegvideoenc" svq3_decoder_select="golomb h264dsp h264parse h264pred hpeldsp tpeldsp videodsp" svq3_decoder_suggest="zlib" tak_decoder_select="audiodsp"

1 0