March 2019 - ffmpeg-cvslog - lists.ffmpeg.org

avformat/movenc: free eac3 private data only when closing the stream
by James Almer 31 Mar '19

31 Mar '19

ffmpeg | branch: release/4.1 | James Almer <jamrial(a)gmail.com> | Thu Mar 28 22:36:25 2019 -0300| [58cd70201edc57b46fb4ad8c0810725f0bf80c86] | committer: James Almer avformat/movenc: free eac3 private data only when closing the stream This makes sure the data is available when writing the moov atom during the second pass triggered by the faststart movflag. Fixes ticket #7780 Signed-off-by: James Almer <jamrial(a)gmail.com> (cherry picked from commit 27c94c57dc84da8125225fda7d241be57d19b391) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=58cd70201edc57b46… --- libavformat/movenc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 6dab5193b0..2a45302ebb 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -544,8 +544,7 @@ static int mov_write_eac3_tag(AVIOContext *pb, MOVTrack *track) size = 2 + ((34 * (info->num_ind_sub + 1) + 7) >> 3); buf = av_malloc(size); if (!buf) { - size = AVERROR(ENOMEM); - goto end; + return AVERROR(ENOMEM); } init_put_bits(&pbc, buf, size); @@ -576,10 +575,6 @@ static int mov_write_eac3_tag(AVIOContext *pb, MOVTrack *track) av_free(buf); -end: - av_packet_unref(&info->pkt); - av_freep(&track->eac3_priv); - return size; } @@ -5947,6 +5942,11 @@ static void mov_free(AVFormatContext *s) av_freep(&mov->tracks[i].frag_info); av_packet_unref(&mov->tracks[i].cover_image); + if (mov->tracks[i].eac3_priv) { + struct eac3_info *info = mov->tracks[i].eac3_priv; + av_packet_unref(&info->pkt); + av_freep(&mov->tracks[i].eac3_priv); + } if (mov->tracks[i].vos_len) av_freep(&mov->tracks[i].vos_data);

1 0

avformat/movenc: free eac3 private data only when closing the stream
by James Almer 31 Mar '19

31 Mar '19

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Thu Mar 28 22:36:25 2019 -0300| [27c94c57dc84da8125225fda7d241be57d19b391] | committer: James Almer avformat/movenc: free eac3 private data only when closing the stream This makes sure the data is available when writing the moov atom during the second pass triggered by the faststart movflag. Fixes ticket #7780 Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=27c94c57dc84da812… --- libavformat/movenc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 8969d5b170..26cb2e6ea1 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -552,8 +552,7 @@ static int mov_write_eac3_tag(AVIOContext *pb, MOVTrack *track) size = 2 + ((34 * (info->num_ind_sub + 1) + 7) >> 3); buf = av_malloc(size); if (!buf) { - size = AVERROR(ENOMEM); - goto end; + return AVERROR(ENOMEM); } init_put_bits(&pbc, buf, size); @@ -584,10 +583,6 @@ static int mov_write_eac3_tag(AVIOContext *pb, MOVTrack *track) av_free(buf); -end: - av_packet_unref(&info->pkt); - av_freep(&track->eac3_priv); - return size; } @@ -5973,6 +5968,11 @@ static void mov_free(AVFormatContext *s) av_freep(&mov->tracks[i].frag_info); av_packet_unref(&mov->tracks[i].cover_image); + if (mov->tracks[i].eac3_priv) { + struct eac3_info *info = mov->tracks[i].eac3_priv; + av_packet_unref(&info->pkt); + av_freep(&mov->tracks[i].eac3_priv); + } if (mov->tracks[i].vos_len) av_freep(&mov->tracks[i].vos_data);

1 0

Update for 4.1.3
by Michael Niedermayer 31 Mar '19

31 Mar '19

ffmpeg | branch: release/4.1 | Michael Niedermayer <michael(a)niedermayer.cc> | Sun Mar 31 23:31:47 2019 +0200| [1d720b37f0f3ae3d8e9fa2a991a8dca7deac7490] | committer: Michael Niedermayer Update for 4.1.3 Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1d720b37f0f3ae3d8… --- Changelog | 9 +++++++++ RELEASE | 2 +- doc/Doxyfile | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 7df4e199bf..6f4a623552 100644 --- a/Changelog +++ b/Changelog @@ -1,6 +1,15 @@ Entries are sorted chronologically from oldest to youngest within each release, releases are sorted from youngest to oldest. +version 4.1.3: +- avcodec/hevcdec: Avoid only partly skiping duplicate first slices +- lavc/bmp: Avoid a heap buffer overwrite for 1bpp input. +- avcodec/mpegpicture: Check size of edge_emu_buffer +- avformat/mov: Fix potential integer overflow in entry check in mov_read_trun() +- avcodec/truemotion2: Fix integer overflow in tm2_null_res_block() +- avcodec/cbs_av1: fix range of values for Mastering Display Color Volume Metadata OBUs +- avcodec/av1_parser: don't abort parsing the first frame if extradata parsing fails + version 4.1.2: - avcodec/dfa: Check the chunk header is not truncated - avcodec/clearvideo: Check remaining data in P frames diff --git a/RELEASE b/RELEASE index 4d0dcda01c..de197cc337 100644 --- a/RELEASE +++ b/RELEASE @@ -1 +1 @@ -4.1.2 +4.1.3 diff --git a/doc/Doxyfile b/doc/Doxyfile index 730c4c36b5..f7b277adf6 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = FFmpeg # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 4.1.2 +PROJECT_NUMBER = 4.1.3 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a

1 0

avcodec/hevcdec: Avoid only partly skiping duplicate first slices
by Michael Niedermayer 31 Mar '19

31 Mar '19

ffmpeg | branch: release/4.1 | Michael Niedermayer <michael(a)niedermayer.cc> | Sat Mar 23 20:55:08 2019 +0100| [f1ecebcdb72b5928b585ec8f07c3847927b4bf1d] | committer: Michael Niedermayer avcodec/hevcdec: Avoid only partly skiping duplicate first slices Fixes: NULL pointer dereference and out of array access Fixes: 13871/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-5746167087890432 Fixes: 13845/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-5650370728034304 This also fixes the return code for explode mode Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: James Almer <jamrial(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 54655623a82632e7624714d7b2a3e039dc5faa7e) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f1ecebcdb72b5928b… --- libavcodec/hevcdec.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 0dee673dac..afb3b1b554 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -485,6 +485,11 @@ static int hls_slice_header(HEVCContext *s) // Coded parameters sh->first_slice_in_pic_flag = get_bits1(gb); + if (s->ref && sh->first_slice_in_pic_flag) { + av_log(s->avctx, AV_LOG_ERROR, "Two slices reporting being the first in the same frame.\n"); + return 1; // This slice will be skiped later, do not corrupt state + } + if ((IS_IDR(s) || IS_BLA(s)) && sh->first_slice_in_pic_flag) { s->seq_decode = (s->seq_decode + 1) & 0xff; s->max_ra = INT_MAX; @@ -2915,6 +2920,11 @@ static int decode_nal_unit(HEVCContext *s, const H2645NAL *nal) ret = hls_slice_header(s); if (ret < 0) return ret; + if (ret == 1) { + ret = AVERROR_INVALIDDATA; + goto fail; + } + if ( (s->avctx->skip_frame >= AVDISCARD_BIDIR && s->sh.slice_type == HEVC_SLICE_B) || @@ -2924,10 +2934,6 @@ static int decode_nal_unit(HEVCContext *s, const H2645NAL *nal) } if (s->sh.first_slice_in_pic_flag) { - if (s->ref) { - av_log(s->avctx, AV_LOG_ERROR, "Two slices reporting being the first in the same frame.\n"); - goto fail; - } if (s->max_ra == INT_MAX) { if (s->nal_unit_type == HEVC_NAL_CRA_NUT || IS_BLA(s)) { s->max_ra = s->poc;

1 0

lavc/bmp: Avoid a heap buffer overwrite for 1bpp input.
by Carl Eugen Hoyos 31 Mar '19

31 Mar '19

ffmpeg | branch: release/4.1 | Carl Eugen Hoyos <ceffmpeg(a)gmail.com> | Tue Mar 26 13:32:11 2019 +0100| [daca529112d8cefa9d1f661b3493def303ba63c5] | committer: Michael Niedermayer lavc/bmp: Avoid a heap buffer overwrite for 1bpp input. Found by Mingi Cho, Seoyoung Kim, and Taekyoung Kwon of the Information Security Lab, Yonsei University. (cherry picked from commit 1e34014010dba9325fc5430934b51a61a5007c63) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=daca529112d8cefa9… --- libavcodec/bmp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c index 65d239e4f8..40010ac46f 100644 --- a/libavcodec/bmp.c +++ b/libavcodec/bmp.c @@ -291,7 +291,7 @@ static int bmp_decode_frame(AVCodecContext *avctx, case 1: for (i = 0; i < avctx->height; i++) { int j; - for (j = 0; j < n; j++) { + for (j = 0; j < avctx->width >> 3; j++) { ptr[j*8+0] = buf[j] >> 7; ptr[j*8+1] = (buf[j] >> 6) & 1; ptr[j*8+2] = (buf[j] >> 5) & 1; @@ -301,6 +301,9 @@ static int bmp_decode_frame(AVCodecContext *avctx, ptr[j*8+6] = (buf[j] >> 1) & 1; ptr[j*8+7] = buf[j] & 1; } + for (j = 0; j < (avctx->width & 7); j++) { + ptr[avctx->width - (avctx->width & 7) + j] = buf[avctx->width >> 3] >> (7 - j) & 1; + } buf += n; ptr += linesize; }

1 0

avcodec/mpegpicture: Check size of edge_emu_buffer
by Michael Niedermayer 31 Mar '19

31 Mar '19

ffmpeg | branch: release/4.1 | Michael Niedermayer <michael(a)niedermayer.cc> | Sun Mar 17 15:18:20 2019 +0100| [65f94b732a27cd7479c3fcff337bc247442016d8] | committer: Michael Niedermayer avcodec/mpegpicture: Check size of edge_emu_buffer Fixes: OOM Fixes: 13710/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG4_fuzzer-5633152942342144 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 635067b75fce06928431ce9b9fcaee0c9b6b7280) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=65f94b732a27cd747… --- libavcodec/mpegpicture.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/mpegpicture.c b/libavcodec/mpegpicture.c index c0e06900fe..ecbd77d50e 100644 --- a/libavcodec/mpegpicture.c +++ b/libavcodec/mpegpicture.c @@ -23,6 +23,7 @@ #include "libavutil/avassert.h" #include "libavutil/common.h" #include "libavutil/pixdesc.h" +#include "libavutil/imgutils.h" #include "avcodec.h" #include "motion_est.h" @@ -57,6 +58,7 @@ do {\ int ff_mpeg_framesize_alloc(AVCodecContext *avctx, MotionEstContext *me, ScratchpadContext *sc, int linesize) { +# define EMU_EDGE_HEIGHT (4 * 70) int alloc_size = FFALIGN(FFABS(linesize) + 64, 32); if (avctx->hwaccel) @@ -67,13 +69,16 @@ int ff_mpeg_framesize_alloc(AVCodecContext *avctx, MotionEstContext *me, return AVERROR_PATCHWELCOME; } + if (av_image_check_size2(alloc_size, EMU_EDGE_HEIGHT, avctx->max_pixels, AV_PIX_FMT_NONE, 0, avctx) < 0) + return AVERROR(ENOMEM); + // edge emu needs blocksize + filter length - 1 // (= 17x17 for halfpel / 21x21 for H.264) // VC-1 computes luma and chroma simultaneously and needs 19X19 + 9x9 // at uvlinesize. It supports only YUV420 so 24x24 is enough // linesize * interlaced * MBsize // we also use this buffer for encoding in encode_mb_internal() needig an additional 32 lines - FF_ALLOCZ_ARRAY_OR_GOTO(avctx, sc->edge_emu_buffer, alloc_size, 4 * 70, + FF_ALLOCZ_ARRAY_OR_GOTO(avctx, sc->edge_emu_buffer, alloc_size, EMU_EDGE_HEIGHT, fail); FF_ALLOCZ_ARRAY_OR_GOTO(avctx, me->scratchpad, alloc_size, 4 * 16 * 2,

1 0

avformat/mov: Fix potential integer overflow in entry check in mov_read_trun()
by Michael Niedermayer 31 Mar '19

31 Mar '19

ffmpeg | branch: release/4.1 | Michael Niedermayer <michael(a)niedermayer.cc> | Sun Mar 17 11:14:26 2019 +0100| [ad0f4a7d10f91c63cceeb25010bec83311ad84fa] | committer: Michael Niedermayer avformat/mov: Fix potential integer overflow in entry check in mov_read_trun() No testcase Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit ff13a92a6f8413402f5b3cacedda7c10d350b487) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ad0f4a7d10f91c63c… --- libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 60309b4869..caba256161 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4781,7 +4781,7 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom) av_log(c->fc, AV_LOG_TRACE, "first sample flags 0x%x\n", first_sample_flags); // realloc space for new index entries - if((unsigned)st->nb_index_entries + entries >= UINT_MAX / sizeof(AVIndexEntry)) { + if((uint64_t)st->nb_index_entries + entries >= UINT_MAX / sizeof(AVIndexEntry)) { entries = UINT_MAX / sizeof(AVIndexEntry) - st->nb_index_entries; av_log(c->fc, AV_LOG_ERROR, "Failed to add index entry\n"); }

1 0

avcodec/truemotion2: Fix integer overflow in tm2_null_res_block()
by Michael Niedermayer 31 Mar '19

31 Mar '19

ffmpeg | branch: release/4.1 | Michael Niedermayer <michael(a)niedermayer.cc> | Sat Mar 16 02:30:57 2019 +0100| [cb4768e7f20b6bc6eef28266ee9a3361967e65df] | committer: Michael Niedermayer avcodec/truemotion2: Fix integer overflow in tm2_null_res_block() Fixes: signed integer overflow: 1111638592 - -2122219136 cannot be represented in type 'int' Fixes: 13441/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TRUEMOTION2_fuzzer-5732769815068672 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 1223696c725a8ea7e80498e6ccfab37eea179b76) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cb4768e7f20b6bc6e… --- libavcodec/truemotion2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/truemotion2.c b/libavcodec/truemotion2.c index c583ff4032..1aa7a4b870 100644 --- a/libavcodec/truemotion2.c +++ b/libavcodec/truemotion2.c @@ -591,7 +591,8 @@ static inline void tm2_null_res_block(TM2Context *ctx, AVFrame *pic, int bx, int { int i; int ct; - int left, right, diff; + unsigned left, right; + int diff; int deltas[16]; TM2_INIT_POINTERS();

1 0

x86/opusdsp: implement FMA3 accelerated postfilter and deemphasis
by Lynne 31 Mar '19

31 Mar '19

ffmpeg | branch: master | Lynne <dev(a)lynne.ee> | Fri Mar 15 14:43:04 2019 +0000| [605e3303109e7945a841c5fb5ff60881393933a3] | committer: Carl Eugen Hoyos x86/opusdsp: implement FMA3 accelerated postfilter and deemphasis 58893 decicycles in deemphasis_c, 130548 runs, 524 skips 9475 decicycles in deemphasis_fma3, 130686 runs, 386 skips -> 6.21x speedup 24866 decicycles in postfilter_c, 65386 runs, 150 skips 5268 decicycles in postfilter_fma3, 65505 runs, 31 skips -> 4.72x speedup Total decoder speedup: ~14% Deemphasis SIMD based on the following unrolling: const float c1 = CELT_EMPH_COEFF, c2 = c1*c1, c3 = c2*c1, c4 = c3*c1; float state = coeff; for (int i = 0; i < len; i += 4) { y[0] = x[0] + c1*state; y[1] = x[1] + c2*state + c1*x[0]; y[2] = x[2] + c3*state + c1*x[1] + c2*x[0]; y[3] = x[3] + c4*state + c1*x[2] + c2*x[1] + c3*x[0]; state = y[3]; y += 4; x += 4; } > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=605e3303109e7945a… --- libavcodec/opusdsp.c | 3 ++ libavcodec/opusdsp.h | 2 + libavcodec/x86/Makefile | 2 + libavcodec/x86/opusdsp.asm | 114 ++++++++++++++++++++++++++++++++++++++++++ libavcodec/x86/opusdsp_init.c | 35 +++++++++++++ 5 files changed, 156 insertions(+) diff --git a/libavcodec/opusdsp.c b/libavcodec/opusdsp.c index 615e7d6816..17e819f977 100644 --- a/libavcodec/opusdsp.c +++ b/libavcodec/opusdsp.c @@ -58,4 +58,7 @@ av_cold void ff_opus_dsp_init(OpusDSP *ctx) { ctx->postfilter = postfilter_c; ctx->deemphasis = deemphasis_c; + + if (ARCH_X86) + ff_opus_dsp_init_x86(ctx); } diff --git a/libavcodec/opusdsp.h b/libavcodec/opusdsp.h index 05bf2ba1a4..e3eb457f1b 100644 --- a/libavcodec/opusdsp.h +++ b/libavcodec/opusdsp.h @@ -30,4 +30,6 @@ typedef struct OpusDSP { void ff_opus_dsp_init(OpusDSP *ctx); +void ff_opus_dsp_init_x86(OpusDSP *ctx); + #endif /* AVCODEC_OPUSDSP_H */ diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 2697431781..f63f7cfed3 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -53,6 +53,7 @@ OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsdsp.o OBJS-$(CONFIG_DCA_DECODER) += x86/dcadsp_init.o x86/synth_filter_init.o OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhdenc_init.o OBJS-$(CONFIG_EXR_DECODER) += x86/exrdsp_init.o +OBJS-$(CONFIG_OPUS_DECODER) += x86/opusdsp_init.o OBJS-$(CONFIG_OPUS_ENCODER) += x86/celt_pvq_init.o OBJS-$(CONFIG_HEVC_DECODER) += x86/hevcdsp_init.o OBJS-$(CONFIG_JPEG2000_DECODER) += x86/jpeg2000dsp_init.o @@ -126,6 +127,7 @@ X86ASM-OBJS-$(CONFIG_MDCT15) += x86/mdct15.o X86ASM-OBJS-$(CONFIG_ME_CMP) += x86/me_cmp.o X86ASM-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/imdct36.o X86ASM-OBJS-$(CONFIG_MPEGVIDEOENC) += x86/mpegvideoencdsp.o +X86ASM-OBJS-$(CONFIG_OPUS_DECODER) += x86/opusdsp.o X86ASM-OBJS-$(CONFIG_OPUS_ENCODER) += x86/celt_pvq_search.o X86ASM-OBJS-$(CONFIG_PIXBLOCKDSP) += x86/pixblockdsp.o X86ASM-OBJS-$(CONFIG_QPELDSP) += x86/qpeldsp.o \ diff --git a/libavcodec/x86/opusdsp.asm b/libavcodec/x86/opusdsp.asm new file mode 100644 index 0000000000..ed65614e06 --- /dev/null +++ b/libavcodec/x86/opusdsp.asm @@ -0,0 +1,114 @@ +;****************************************************************************** +;* Opus SIMD functions +;* +;* This file is part of FFmpeg. +;* +;* FFmpeg 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. +;* +;* FFmpeg 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 FFmpeg; if not, write to the Free Software +;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +;****************************************************************************** + +%include "libavutil/x86/x86util.asm" + +SECTION_RODATA + + ; 0.85..^1 0.85..^2 0.85..^3 0.85..^4 +tab_st: dd 0x3f599a00, 0x3f38f671, 0x3f1d382a, 0x3f05a32f +tab_x0: dd 0x0, 0x3f599a00, 0x3f599a00, 0x3f599a00 +tab_x1: dd 0x0, 0x0, 0x3f38f671, 0x3f38f671 +tab_x2: dd 0x0, 0x0, 0x0, 0x3f1d382a + +SECTION .text + +INIT_XMM fma3 +%if UNIX64 +cglobal opus_deemphasis, 3, 3, 8, out, in, len +%else +cglobal opus_deemphasis, 4, 4, 8, out, in, coeff, len +%endif +%if ARCH_X86_32 + VBROADCASTSS m0, coeffm +%else +%if WIN64 + SWAP 0, 2 +%endif + shufps m0, m0, 0 +%endif + + movaps m4, [tab_st] + movaps m5, [tab_x0] + movaps m6, [tab_x1] + movaps m7, [tab_x2] + +.loop: + movaps m1, [inq] ; x0, x1, x2, x3 + + pslldq m2, m1, 4 ; 0, x0, x1, x2 + pslldq m3, m1, 8 ; 0, 0, x0, x1 + + fmaddps m2, m2, m5, m1 ; x + c1*x[0-2] + pslldq m1, 12 ; 0, 0, 0, x0 + + fmaddps m2, m3, m6, m2 ; x + c1*x[0-2] + c2*x[0-1] + fmaddps m1, m1, m7, m2 ; x + c1*x[0-2] + c2*x[0-1] + c3*x[0] + fmaddps m0, m0, m4, m1 ; x + c1*x[0-2] + c2*x[0-1] + c3*x[0] + c*s + + movaps [outq], m0 + shufps m0, m0, q3333 ; new state + + add inq, mmsize + add outq, mmsize + sub lenq, mmsize >> 2 + jg .loop + +%if ARCH_X86_64 == 0 + movss r0m, m0 + fld dword r0m +%endif + RET + + +INIT_XMM fma3 +cglobal opus_postfilter, 4, 4, 8, data, period, gains, len + VBROADCASTSS m0, [gainsq + 0] + VBROADCASTSS m1, [gainsq + 4] + VBROADCASTSS m2, [gainsq + 8] + + lea periodq, [periodq*4 + 8] + neg periodq + + movups m3, [dataq + periodq] + mulps m3, m2 + +.loop: + movups m4, [dataq + periodq + 4] + movups m5, [dataq + periodq + 8] + movups m6, [dataq + periodq + 12] + movups m7, [dataq + periodq + 16] + + fmaddps m3, m7, m2, m3 + addps m6, m4 + + fmaddps m5, m5, m0, [dataq] + fmaddps m6, m6, m1, m3 + + addps m5, m6 + mulps m3, m7, m2 + + movaps [dataq], m5 + + add dataq, mmsize + sub lenq, mmsize >> 2 + jg .loop + + RET diff --git a/libavcodec/x86/opusdsp_init.c b/libavcodec/x86/opusdsp_init.c new file mode 100644 index 0000000000..6834c4e6a4 --- /dev/null +++ b/libavcodec/x86/opusdsp_init.c @@ -0,0 +1,35 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg 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. + * + * FFmpeg 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 FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "config.h" + +#include "libavutil/x86/cpu.h" +#include "libavcodec/opusdsp.h" + +void ff_opus_postfilter_fma3(float *data, int period, float *gains, int len); +float ff_opus_deemphasis_fma3(float *out, float *in, float coeff, int len); + +av_cold void ff_opus_dsp_init_x86(OpusDSP *ctx) +{ + int cpu_flags = av_get_cpu_flags(); + + if (EXTERNAL_FMA3_FAST(cpu_flags)) { + ctx->postfilter = ff_opus_postfilter_fma3; + ctx->deemphasis = ff_opus_deemphasis_fma3; + } +}

1 0

opusdsp: create and move deemphasis and postfiltering from opus_celt
by Lynne 31 Mar '19

31 Mar '19

ffmpeg | branch: master | Lynne <dev(a)lynne.ee> | Fri Mar 15 14:35:03 2019 +0000| [0cea3ca8943b5a3f28a3672037f424b4d03853b8] | committer: Carl Eugen Hoyos opusdsp: create and move deemphasis and postfiltering from opus_celt > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0cea3ca8943b5a3f2… --- libavcodec/Makefile | 3 ++- libavcodec/opus_celt.c | 53 +++++++++---------------------------------- libavcodec/opus_celt.h | 3 ++- libavcodec/opusdsp.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++ libavcodec/opusdsp.h | 33 +++++++++++++++++++++++++++ 5 files changed, 109 insertions(+), 44 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index ad347ec0a2..de873c1643 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -496,7 +496,8 @@ OBJS-$(CONFIG_NELLYMOSER_ENCODER) += nellymoserenc.o nellymoser.o OBJS-$(CONFIG_NUV_DECODER) += nuv.o rtjpeg.o OBJS-$(CONFIG_ON2AVC_DECODER) += on2avc.o on2avcdata.o OBJS-$(CONFIG_OPUS_DECODER) += opusdec.o opus.o opus_celt.o opus_rc.o \ - opus_pvq.o opus_silk.o opustab.o vorbis_data.o + opus_pvq.o opus_silk.o opustab.o vorbis_data.o \ + opusdsp.o OBJS-$(CONFIG_OPUS_ENCODER) += opusenc.o opus.o opus_rc.o opustab.o opus_pvq.o \ opusenc_psy.o OBJS-$(CONFIG_PAF_AUDIO_DECODER) += pafaudio.o diff --git a/libavcodec/opus_celt.c b/libavcodec/opus_celt.c index 115dd8c63e..4655172b09 100644 --- a/libavcodec/opus_celt.c +++ b/libavcodec/opus_celt.c @@ -202,40 +202,10 @@ static void celt_postfilter_apply_transition(CeltBlock *block, float *data) } } -static void celt_postfilter_apply(CeltBlock *block, float *data, int len) -{ - const int T = block->pf_period; - float g0, g1, g2; - float x0, x1, x2, x3, x4; - int i; - - if (block->pf_gains[0] == 0.0 || len <= 0) - return; - - g0 = block->pf_gains[0]; - g1 = block->pf_gains[1]; - g2 = block->pf_gains[2]; - - x4 = data[-T - 2]; - x3 = data[-T - 1]; - x2 = data[-T]; - x1 = data[-T + 1]; - - for (i = 0; i < len; i++) { - x0 = data[i - T + 2]; - data[i] += g0 * x2 + - g1 * (x1 + x3) + - g2 * (x0 + x4); - x4 = x3; - x3 = x2; - x2 = x1; - x1 = x0; - } -} - static void celt_postfilter(CeltFrame *f, CeltBlock *block) { int len = f->blocksize * f->blocks; + const int filter_len = len - 2 * CELT_OVERLAP; celt_postfilter_apply_transition(block, block->buf + 1024); @@ -247,8 +217,11 @@ static void celt_postfilter(CeltFrame *f, CeltBlock *block) if (len > CELT_OVERLAP) { celt_postfilter_apply_transition(block, block->buf + 1024 + CELT_OVERLAP); - celt_postfilter_apply(block, block->buf + 1024 + 2 * CELT_OVERLAP, - len - 2 * CELT_OVERLAP); + + if (block->pf_gains[0] > FLT_EPSILON && filter_len > 0) + f->opusdsp.postfilter(block->buf + 1024 + 2 * CELT_OVERLAP, + block->pf_period, block->pf_gains, + filter_len); block->pf_period_old = block->pf_period; memcpy(block->pf_gains_old, block->pf_gains, sizeof(block->pf_gains)); @@ -462,7 +435,6 @@ int ff_celt_decode_frame(CeltFrame *f, OpusRangeCoder *rc, /* transform and output for each output channel */ for (i = 0; i < f->output_channels; i++) { CeltBlock *block = &f->block[i]; - float m = block->emph_coeff; /* iMDCT and overlap-add */ for (j = 0; j < f->blocks; j++) { @@ -480,14 +452,10 @@ int ff_celt_decode_frame(CeltFrame *f, OpusRangeCoder *rc, /* postfilter */ celt_postfilter(f, block); - /* deemphasis and output scaling */ - for (j = 0; j < frame_size; j++) { - const float tmp = block->buf[1024 - frame_size + j] + m; - m = tmp * CELT_EMPH_COEFF; - output[i][j] = tmp; - } - - block->emph_coeff = m; + /* deemphasis */ + block->emph_coeff = f->opusdsp.deemphasis(output[i], + &block->buf[1024 - frame_size], + block->emph_coeff, frame_size); } if (channels == 1) @@ -596,6 +564,7 @@ int ff_celt_init(AVCodecContext *avctx, CeltFrame **f, int output_channels, goto fail; } + ff_opus_dsp_init(&frm->opusdsp); ff_celt_flush(frm); *f = frm; diff --git a/libavcodec/opus_celt.h b/libavcodec/opus_celt.h index 9289a1867a..7c1c5316b9 100644 --- a/libavcodec/opus_celt.h +++ b/libavcodec/opus_celt.h @@ -28,6 +28,7 @@ #include "opus.h" #include "opus_pvq.h" +#include "opusdsp.h" #include "mdct15.h" #include "libavutil/float_dsp.h" @@ -40,7 +41,6 @@ #define CELT_NORM_SCALE 16384 #define CELT_QTHETA_OFFSET 4 #define CELT_QTHETA_OFFSET_TWOPHASE 16 -#define CELT_EMPH_COEFF 0.85000610f #define CELT_POSTFILTER_MINPERIOD 15 #define CELT_ENERGY_SILENCE (-28.0f) @@ -96,6 +96,7 @@ struct CeltFrame { AVFloatDSPContext *dsp; CeltBlock block[2]; CeltPVQ *pvq; + OpusDSP opusdsp; int channels; int output_channels; int apply_phase_inv; diff --git a/libavcodec/opusdsp.c b/libavcodec/opusdsp.c new file mode 100644 index 0000000000..615e7d6816 --- /dev/null +++ b/libavcodec/opusdsp.c @@ -0,0 +1,61 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg 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. + * + * FFmpeg 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 FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "opusdsp.h" + +static void postfilter_c(float *data, int period, float *gains, int len) +{ + const float g0 = gains[0]; + const float g1 = gains[1]; + const float g2 = gains[2]; + + float x4 = data[-period - 2]; + float x3 = data[-period - 1]; + float x2 = data[-period + 0]; + float x1 = data[-period + 1]; + + for (int i = 0; i < len; i++) { + float x0 = data[i - period + 2]; + data[i] += g0 * x2 + + g1 * (x1 + x3) + + g2 * (x0 + x4); + x4 = x3; + x3 = x2; + x2 = x1; + x1 = x0; + } +} + +static float deemphasis_c(float *y, float *x, float coeff, int len) +{ + float state = coeff; + + for (int i = 0; i < len; i++) { + const float tmp = x[i] + state; + state = tmp * CELT_EMPH_COEFF; + y[i] = tmp; + } + + return state; +} + +av_cold void ff_opus_dsp_init(OpusDSP *ctx) +{ + ctx->postfilter = postfilter_c; + ctx->deemphasis = deemphasis_c; +} diff --git a/libavcodec/opusdsp.h b/libavcodec/opusdsp.h new file mode 100644 index 0000000000..05bf2ba1a4 --- /dev/null +++ b/libavcodec/opusdsp.h @@ -0,0 +1,33 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg 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. + * + * FFmpeg 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 FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_OPUSDSP_H +#define AVCODEC_OPUSDSP_H + +#include "libavutil/common.h" + +#define CELT_EMPH_COEFF 0.8500061035f + +typedef struct OpusDSP { + void (*postfilter)(float *data, int period, float *gains, int len); + float (*deemphasis)(float *out, float *in, float coeff, int len); +} OpusDSP; + +void ff_opus_dsp_init(OpusDSP *ctx); + +#endif /* AVCODEC_OPUSDSP_H */

1 0