August 2018 - ffmpeg-cvslog - lists.ffmpeg.org

avcodec/libaomdec: auto insert dump_extra bitstream filter
by James Almer 02 Aug '18

02 Aug '18

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Mon Jul 23 12:32:47 2018 -0300| [e45ed15594a2553056a577177591fbe55694af44] | committer: James Almer avcodec/libaomdec: auto insert dump_extra bitstream filter Some containers, like Matroska, may propagate key frames with no Sequence Header OBU since it's provided in extradata instead. With this change, the Sequence Header will be appended to the packet data before calling aom_codec_decode(). Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e45ed15594a255305… --- configure | 1 + libavcodec/libaomdec.c | 1 + 2 files changed, 2 insertions(+) diff --git a/configure b/configure index 7e3121ead9..15a58935de 100755 --- a/configure +++ b/configure @@ -3049,6 +3049,7 @@ h264_videotoolbox_encoder_select="videotoolbox_encoder" hevc_videotoolbox_encoder_deps="pthreads" hevc_videotoolbox_encoder_select="videotoolbox_encoder" libaom_av1_decoder_deps="libaom" +libaom_av1_decoder_select="dump_extradata_bsf" libaom_av1_encoder_deps="libaom" libaom_av1_encoder_select="extract_extradata_bsf" libcelt_decoder_deps="libcelt" diff --git a/libavcodec/libaomdec.c b/libavcodec/libaomdec.c index 6a2de6d47a..ddfba8a023 100644 --- a/libavcodec/libaomdec.c +++ b/libavcodec/libaomdec.c @@ -232,4 +232,5 @@ AVCodec ff_libaom_av1_decoder = { .capabilities = AV_CODEC_CAP_AUTO_THREADS | AV_CODEC_CAP_DR1, .profiles = NULL_IF_CONFIG_SMALL(ff_av1_profiles), .wrapper_name = "libaom", + .bsfs = "dump_extra", };

1 0

avcodec/dump_extradata_bsf: don't allocate a new AVPacket per filtered packet
by James Almer 02 Aug '18

02 Aug '18

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Mon Jul 23 19:16:30 2018 -0300| [b98bd60bfa2605fd874d42f96804d1c999278a7e] | committer: James Almer avcodec/dump_extradata_bsf: don't allocate a new AVPacket per filtered packet ~4x speedup in dump_extradata() Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b98bd60bfa2605fd8… --- libavcodec/dump_extradata_bsf.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/dump_extradata_bsf.c b/libavcodec/dump_extradata_bsf.c index 98703749f7..188a1c619b 100644 --- a/libavcodec/dump_extradata_bsf.c +++ b/libavcodec/dump_extradata_bsf.c @@ -34,16 +34,17 @@ enum DumpFreq { typedef struct DumpExtradataContext { const AVClass *class; + AVPacket pkt; int freq; } DumpExtradataContext; static int dump_extradata(AVBSFContext *ctx, AVPacket *out) { DumpExtradataContext *s = ctx->priv_data; - AVPacket *in; + AVPacket *in = &s->pkt; int ret = 0; - ret = ff_bsf_get_packet(ctx, &in); + ret = ff_bsf_get_packet_ref(ctx, in); if (ret < 0) return ret; @@ -72,7 +73,7 @@ static int dump_extradata(AVBSFContext *ctx, AVPacket *out) } fail: - av_packet_free(&in); + av_packet_unref(in); return ret; }

1 0

avformat/avs: add descriptive name and url
by Gyan Doshi 02 Aug '18

02 Aug '18

ffmpeg | branch: master | Gyan Doshi <ffmpeg(a)gyani.pro> | Thu Aug 2 11:05:10 2018 +0530| [c9118d4d64a661fddd431a7437994c31eafb32c6] | committer: Gyan Doshi avformat/avs: add descriptive name and url AVS now more commonly refers to the Chinese AVS format. This demuxer processes video files for Creature Shock game > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c9118d4d64a661fdd… --- libavformat/avs.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavformat/avs.c b/libavformat/avs.c index 763ba63f64..62f5a42ac9 100644 --- a/libavformat/avs.c +++ b/libavformat/avs.c @@ -19,6 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +/** + * @file + * Argonaut Games' Creature Shock demuxer + * @see http://wiki.multimedia.cx/index.php?title=AVS + */ + #include "avformat.h" #include "voc.h" @@ -225,7 +231,7 @@ static int avs_read_close(AVFormatContext * s) AVInputFormat ff_avs_demuxer = { .name = "avs", - .long_name = NULL_IF_CONFIG_SMALL("AVS"), + .long_name = NULL_IF_CONFIG_SMALL("Argonaut Games Creature Shock"), .priv_data_size = sizeof(AvsFormat), .read_probe = avs_probe, .read_header = avs_read_header,

1 0

x86/pixelutils: don't use the AVX2 functions on CPUs known to be slow with them
by James Almer 01 Aug '18

01 Aug '18

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Tue Jul 31 22:14:53 2018 -0300| [481741ece040b0a938099b521fd431d537d7198a] | committer: James Almer x86/pixelutils: don't use the AVX2 functions on CPUs known to be slow with them Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=481741ece040b0a93… --- libavutil/x86/pixelutils_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/x86/pixelutils_init.c b/libavutil/x86/pixelutils_init.c index dd05421b50..184a3a4a9f 100644 --- a/libavutil/x86/pixelutils_init.c +++ b/libavutil/x86/pixelutils_init.c @@ -84,7 +84,7 @@ void ff_pixelutils_sad_init_x86(av_pixelutils_sad_fn *sad, int aligned) } } - if (EXTERNAL_AVX2(cpu_flags)) { + if (EXTERNAL_AVX2_FAST(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

1 0

x86/pixelutils: add missing preprocessor wrapper to the AVX2 functions
by James Almer 01 Aug '18

01 Aug '18

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Tue Jul 31 22:03:22 2018 -0300| [d5b3077ecffb94887c97cd2f1d34a2de4c991ec4] | committer: James Almer x86/pixelutils: add missing preprocessor wrapper to the AVX2 functions Should fix compilation with old yasm/nasm Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d5b3077ecffb94887… --- libavutil/x86/pixelutils.asm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavutil/x86/pixelutils.asm b/libavutil/x86/pixelutils.asm index bbecf0e68e..36c57c5f7f 100644 --- a/libavutil/x86/pixelutils.asm +++ b/libavutil/x86/pixelutils.asm @@ -292,6 +292,7 @@ cglobal pixelutils_sad_%1_32x32, 4,5,3, src1, stride1, src2, stride2 SAD_XMM_32x32 a SAD_XMM_32x32 u +%if HAVE_AVX2_EXTERNAL ;------------------------------------------------------------------------------- ; int ff_pixelutils_sad_32x32_avx2(const uint8_t *src1, ptrdiff_t stride1, ; const uint8_t *src2, ptrdiff_t stride2); @@ -382,3 +383,4 @@ cglobal pixelutils_sad_%1_32x32, 4,7,3, src1, stride1, src2, stride2 SAD_AVX2_32x32 a SAD_AVX2_32x32 u +%endif

1 0