February 2024 - ffmpeg-cvslog

avcodec/libsvtav1: add version guard for external param
by Gyan Doshi 27 Feb '24

27 Feb '24

ffmpeg | branch: release/6.1 | Gyan Doshi <ffmpeg(a)gyani.pro> | Wed Nov 8 10:33:19 2023 +0530| [25abb63bfc4f99d94124ccd7b80f1eec4a7e6f67] | committer: James Almer avcodec/libsvtav1: add version guard for external param Setting of external param 'force_key_frames' was added in 7bcc1b4eb8. It is available since v1.1.0 but ffmpeg allows linking against v0.9.0. (cherry picked from commit 67a2571a5547d39990e7f709f24d7a5b452ff8b9) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=25abb63bfc4f99d94… --- libavcodec/libsvtav1.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c index 8d2c7f3be4..862192945b 100644 --- a/libavcodec/libsvtav1.c +++ b/libavcodec/libsvtav1.c @@ -250,6 +250,7 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, if (avctx->gop_size > 1) param->intra_period_length = avctx->gop_size - 1; +#if SVT_AV1_CHECK_VERSION(1, 1, 0) // In order for SVT-AV1 to force keyframes by setting pic_type to // EB_AV1_KEY_PICTURE on any frame, force_key_frames has to be set. Note // that this does not force all frames to be keyframes (it only forces a @@ -260,6 +261,7 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, // to be updated to set force_key_frames accordingly. if (avctx->gop_size == 1) param->force_key_frames = 1; +#endif if (avctx->framerate.num > 0 && avctx->framerate.den > 0) { param->frame_rate_numerator = avctx->framerate.num;

1 0

avcodec/libsvtav1: send the EOS signal without a one frame delay to allow for the library to operate in a low-delay mode
by Cosmin Stejerean 27 Feb '24

27 Feb '24

ffmpeg | branch: master | Cosmin Stejerean <cosmin(a)cosmin.at> | Fri Feb 23 23:21:39 2024 +0000| [69dd1ce610fcffec453a0663c613c9b13165fd9e] | committer: James Almer avcodec/libsvtav1: send the EOS signal without a one frame delay to allow for the library to operate in a low-delay mode Co-authored-by: Amir Naghdinezhad <amir.naghdinezhad(a)intel.com> Signed-off-by: Cosmin Stejerean <cosmin(a)cosmin.at> Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=69dd1ce610fcffec4… --- libavcodec/libsvtav1.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c index 3b41f5a39e..1eda63200c 100644 --- a/libavcodec/libsvtav1.c +++ b/libavcodec/libsvtav1.c @@ -539,6 +539,14 @@ static int eb_receive_packet(AVCodecContext *avctx, AVPacket *pkt) if (svt_ret == EB_NoErrorEmptyQueue) return AVERROR(EAGAIN); +#if SVT_AV1_CHECK_VERSION(2, 0, 0) + if (headerPtr->flags & EB_BUFFERFLAG_EOS) { + svt_enc->eos_flag = EOS_RECEIVED; + svt_av1_enc_release_out_buffer(&headerPtr); + return AVERROR_EOF; + } +#endif + ref = get_output_ref(avctx, svt_enc, headerPtr->n_filled_len); if (!ref) { av_log(avctx, AV_LOG_ERROR, "Failed to allocate output packet.\n"); @@ -573,8 +581,10 @@ static int eb_receive_packet(AVCodecContext *avctx, AVPacket *pkt) if (headerPtr->pic_type == EB_AV1_NON_REF_PICTURE) pkt->flags |= AV_PKT_FLAG_DISPOSABLE; +#if !(SVT_AV1_CHECK_VERSION(2, 0, 0)) if (headerPtr->flags & EB_BUFFERFLAG_EOS) svt_enc->eos_flag = EOS_RECEIVED; +#endif ff_side_data_set_encoder_stats(pkt, headerPtr->qp * FF_QP2LAMBDA, NULL, 0, pict_type);

1 0

avcodec/dxvenc: Use proper alignment, write endian-independent output
by Andreas Rheinhardt 27 Feb '24

27 Feb '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Tue Feb 27 00:40:32 2024 +0100| [0c204ce9f6b6d1ac3c0ed399bb8b7aa8768d05d9] | committer: Andreas Rheinhardt avcodec/dxvenc: Use proper alignment, write endian-independent output Fixes the dxv3enc-dxt1 FATE test with UBSan and on big-endian hardware. Reviewed-by: James Almer <jamrial(a)gmail.com> Tested-by: Sean McGovern <gseanmcg(a)gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0c204ce9f6b6d1ac3… --- libavcodec/dxvenc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/dxvenc.c b/libavcodec/dxvenc.c index 1ce2b1d014..91f4ba7619 100644 --- a/libavcodec/dxvenc.c +++ b/libavcodec/dxvenc.c @@ -134,7 +134,7 @@ typedef struct DXVEncContext { if (bytestream2_get_bytes_left_p(pbc) < 4) { \ return AVERROR_INVALIDDATA; \ } \ - value = (uint32_t*)pbc->buffer; \ + value = pbc->buffer; \ bytestream2_put_le32(pbc, 0); \ state = 0; \ } \ @@ -149,7 +149,7 @@ typedef struct DXVEncContext { } else { \ op = 0; \ } \ - *value |= (op << (state * 2)); \ + AV_WL32(value, AV_RL32(value) | (op << (state * 2))); \ state++; \ } while (0) @@ -157,7 +157,7 @@ static int dxv_compress_dxt1(AVCodecContext *avctx) { DXVEncContext *ctx = avctx->priv_data; PutByteContext *pbc = &ctx->pbc; - uint32_t *value; + void *value; uint32_t color, lut, idx, color_idx, lut_idx, prev_pos, state = 16, pos = 2, op = 0; ht_init(ctx->color_lookback_ht);

1 0

avutil/mem: limit alignment to maximum simd align
by Timo Rothenpieler 27 Feb '24

27 Feb '24

ffmpeg | branch: master | Timo Rothenpieler <timo(a)rothenpieler.org> | Sun Dec 3 21:01:50 2023 +0100| [7945d30e91b96d2f4f5b612048169087d214d41e] | committer: Timo Rothenpieler avutil/mem: limit alignment to maximum simd align FFmpeg has instances of DECLARE_ALIGNED(32, ...) in a lot of structs, which then end up heap-allocated. By declaring any variable in a struct, or tree of structs, to be 32 byte aligned, it allows the compiler to safely assume the entire struct itself is also 32 byte aligned. This might make the compiler emit code which straight up crashes or misbehaves in other ways, and at least in one instances is now documented to actually do (see ticket 10549 on trac). The issue there is that an unrelated variable in SingleChannelElement is declared to have an alignment of 32 bytes. So if the compiler does a copy in decode_cpe() with avx instructions, but ffmpeg is built with --disable-avx, this results in a crash, since the memory is only 16 byte aligned. Mind you, even if the compiler does not emit avx instructions, the code is still invalid and could misbehave. It just happens not to. Declaring any variable in a struct with a 32 byte alignment promises 32 byte alignment of the whole struct to the compiler. This patch limits the maximum alignment to the maximum possible simd alignment according to configure. While not perfect, it at the very least gets rid of a lot of UB, by matching up the maximum DECLARE_ALIGNED value with the alignment of heap allocations done by lavu. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7945d30e91b96d2f4… --- libavutil/mem.c | 2 +- libavutil/mem_internal.h | 33 ++++++++++++++++++++++++++++----- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/libavutil/mem.c b/libavutil/mem.c index 36b8940a0c..62163b4cb3 100644 --- a/libavutil/mem.c +++ b/libavutil/mem.c @@ -62,7 +62,7 @@ void free(void *ptr); #endif /* MALLOC_PREFIX */ -#define ALIGN (HAVE_AVX512 ? 64 : (HAVE_AVX ? 32 : 16)) +#define ALIGN (HAVE_SIMD_ALIGN_64 ? 64 : (HAVE_SIMD_ALIGN_32 ? 32 : 16)) /* NOTE: if you want to override these functions with your own * implementations (not recommended) you have to link libav* as diff --git a/libavutil/mem_internal.h b/libavutil/mem_internal.h index 2448c606f1..b1d89a0605 100644 --- a/libavutil/mem_internal.h +++ b/libavutil/mem_internal.h @@ -76,27 +76,50 @@ */ #if defined(__INTEL_COMPILER) && __INTEL_COMPILER < 1110 || defined(__SUNPRO_C) - #define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v + #define DECLARE_ALIGNED_T(n,t,v) t __attribute__ ((aligned (n))) v #define DECLARE_ASM_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v #define DECLARE_ASM_CONST(n,t,v) const t __attribute__ ((aligned (n))) v #elif defined(__DJGPP__) - #define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (FFMIN(n, 16)))) v + #define DECLARE_ALIGNED_T(n,t,v) t __attribute__ ((aligned (FFMIN(n, 16)))) v #define DECLARE_ASM_ALIGNED(n,t,v) t av_used __attribute__ ((aligned (FFMIN(n, 16)))) v #define DECLARE_ASM_CONST(n,t,v) static const t av_used __attribute__ ((aligned (FFMIN(n, 16)))) v #elif defined(__GNUC__) || defined(__clang__) - #define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v + #define DECLARE_ALIGNED_T(n,t,v) t __attribute__ ((aligned (n))) v #define DECLARE_ASM_ALIGNED(n,t,v) t av_used __attribute__ ((aligned (n))) v #define DECLARE_ASM_CONST(n,t,v) static const t av_used __attribute__ ((aligned (n))) v #elif defined(_MSC_VER) - #define DECLARE_ALIGNED(n,t,v) __declspec(align(n)) t v + #define DECLARE_ALIGNED_T(n,t,v) __declspec(align(n)) t v #define DECLARE_ASM_ALIGNED(n,t,v) __declspec(align(n)) t v #define DECLARE_ASM_CONST(n,t,v) __declspec(align(n)) static const t v #else - #define DECLARE_ALIGNED(n,t,v) t v + #define DECLARE_ALIGNED_T(n,t,v) t v #define DECLARE_ASM_ALIGNED(n,t,v) t v #define DECLARE_ASM_CONST(n,t,v) static const t v #endif +#if HAVE_SIMD_ALIGN_64 + #define ALIGN_64 64 + #define ALIGN_32 32 +#elif HAVE_SIMD_ALIGN_32 + #define ALIGN_64 32 + #define ALIGN_32 32 +#else + #define ALIGN_64 16 + #define ALIGN_32 16 +#endif + +#define DECLARE_ALIGNED(n,t,v) DECLARE_ALIGNED_V(n,t,v) + +// Macro needs to be double-wrapped in order to expand +// possible other macros being passed for n. +#define DECLARE_ALIGNED_V(n,t,v) DECLARE_ALIGNED_##n(t,v) + +#define DECLARE_ALIGNED_4(t,v) DECLARE_ALIGNED_T( 4, t, v) +#define DECLARE_ALIGNED_8(t,v) DECLARE_ALIGNED_T( 8, t, v) +#define DECLARE_ALIGNED_16(t,v) DECLARE_ALIGNED_T( 16, t, v) +#define DECLARE_ALIGNED_32(t,v) DECLARE_ALIGNED_T(ALIGN_32, t, v) +#define DECLARE_ALIGNED_64(t,v) DECLARE_ALIGNED_T(ALIGN_64, t, v) + // Some broken preprocessors need a second expansion // to be forced to tokenize __VA_ARGS__ #define E1(x) x

1 0

lavc/dnxhdenc: add ff_dnxhdenc_init
by sunyuechi 27 Feb '24

27 Feb '24

ffmpeg | branch: master | sunyuechi <sunyuechi(a)iscas.ac.cn> | Wed Dec 20 16:17:32 2023 +0800| [40911bc1a1975382891181c67417f24b8cdb2c46] | committer: Rémi Denis-Courmont lavc/dnxhdenc: add ff_dnxhdenc_init This is for clarity and use in testing, consistent with other parts of the code. Signed-off-by: Rémi Denis-Courmont <remi(a)remlab.net> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=40911bc1a19753828… --- libavcodec/dnxhdenc.c | 11 ++++++++--- libavcodec/dnxhdenc.h | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index dbe2618244..feb7a76636 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -445,9 +445,7 @@ static av_cold int dnxhd_encode_init(AVCodecContext *avctx) ctx->block_width_l2 = 3; } -#if ARCH_X86 - ff_dnxhdenc_init_x86(ctx); -#endif + ff_dnxhdenc_init(ctx); ctx->m.mb_height = (avctx->height + 15) / 16; ctx->m.mb_width = (avctx->width + 15) / 16; @@ -1377,3 +1375,10 @@ const FFCodec ff_dnxhd_encoder = { .p.profiles = NULL_IF_CONFIG_SMALL(ff_dnxhd_profiles), .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; + +void ff_dnxhdenc_init(DNXHDEncContext *ctx) +{ +#if ARCH_X86 + ff_dnxhdenc_init_x86(ctx); +#endif +} diff --git a/libavcodec/dnxhdenc.h b/libavcodec/dnxhdenc.h index e581312ce4..95aea83d28 100644 --- a/libavcodec/dnxhdenc.h +++ b/libavcodec/dnxhdenc.h @@ -111,6 +111,7 @@ typedef struct DNXHDEncContext { const uint8_t *pixels, ptrdiff_t line_size); } DNXHDEncContext; +void ff_dnxhdenc_init(DNXHDEncContext *ctx); void ff_dnxhdenc_init_x86(DNXHDEncContext *ctx); #endif /* AVCODEC_DNXHDENC_H */

1 0

lavc/me_cmp: R-V V nsse
by sunyuechi 27 Feb '24

27 Feb '24

ffmpeg | branch: master | sunyuechi <sunyuechi(a)iscas.ac.cn> | Tue Feb 6 22:51:47 2024 +0800| [a7ad76fbbfae29eaf8c9372b34051edf4f835fd9] | committer: Rémi Denis-Courmont lavc/me_cmp: R-V V nsse C908: nsse_0_c: 1990.0 nsse_0_rvv_i32: 572.0 nsse_1_c: 910.0 nsse_1_rvv_i32: 456.0 Signed-off-by: Rémi Denis-Courmont <remi(a)remlab.net> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a7ad76fbbfae29eaf… --- libavcodec/riscv/me_cmp_init.c | 25 +++++++++ libavcodec/riscv/me_cmp_rvv.S | 118 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+) diff --git a/libavcodec/riscv/me_cmp_init.c b/libavcodec/riscv/me_cmp_init.c index 24e78e3eeb..858e2ccdb8 100644 --- a/libavcodec/riscv/me_cmp_init.c +++ b/libavcodec/riscv/me_cmp_init.c @@ -54,6 +54,28 @@ int ff_vsad16_rvv(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, ptrdi int ff_vsad8_rvv(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride, int h); int ff_vsad_intra16_rvv(MpegEncContext *c, const uint8_t *s, const uint8_t *dummy, ptrdiff_t stride, int h); int ff_vsad_intra8_rvv(MpegEncContext *c, const uint8_t *s, const uint8_t *dummy, ptrdiff_t stride, int h); +int ff_nsse16_rvv(int multiplier, const uint8_t *s1, const uint8_t *s2, + ptrdiff_t stride, int h); +int ff_nsse8_rvv(int multiplier, const uint8_t *s1, const uint8_t *s2, + ptrdiff_t stride, int h); + +static int nsse16_rvv_wrapper(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, + ptrdiff_t stride, int h) +{ + if (c) + return ff_nsse16_rvv(c->avctx->nsse_weight, s1, s2, stride, h); + else + return ff_nsse16_rvv(8, s1, s2, stride, h); +} + +static int nsse8_rvv_wrapper(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, + ptrdiff_t stride, int h) +{ + if (c) + return ff_nsse8_rvv(c->avctx->nsse_weight, s1, s2, stride, h); + else + return ff_nsse8_rvv(8, s1, s2, stride, h); +} av_cold void ff_me_cmp_init_riscv(MECmpContext *c, AVCodecContext *avctx) { @@ -82,6 +104,9 @@ av_cold void ff_me_cmp_init_riscv(MECmpContext *c, AVCodecContext *avctx) c->vsad[1] = ff_vsad8_rvv; c->vsad[4] = ff_vsad_intra16_rvv; c->vsad[5] = ff_vsad_intra8_rvv; + + c->nsse[0] = nsse16_rvv_wrapper; + c->nsse[1] = nsse8_rvv_wrapper; } #endif } diff --git a/libavcodec/riscv/me_cmp_rvv.S b/libavcodec/riscv/me_cmp_rvv.S index f32ae6b259..c9ae5bb6fc 100644 --- a/libavcodec/riscv/me_cmp_rvv.S +++ b/libavcodec/riscv/me_cmp_rvv.S @@ -407,3 +407,121 @@ endfunc func ff_vsad_intra8_rvv, zve32x vsad_vsse_intra8 abs endfunc + +func ff_nsse16_rvv, zve32x + .macro squarediff16 + vsetivli zero, 16, e8, m1, tu, ma + vle8.v v4, (a1) + vle8.v v12, (a2) + vwsubu.vv v16, v4, v12 + vsetvli zero, zero, e16, m2, tu, ma + vwmacc.vv v24, v16, v16 + .endm + + .macro gradiff16 srcx srcv + vsetivli zero, 16, e8, m1, tu, ma + vle8.v v8, (\srcx) + vslide1down.vx v0, \srcv, t5 + vslide1down.vx v16, v8, t5 + vwsubu.vv v20, \srcv, v0 + vwsubu.wv v0, v20, v8 + vwaddu.wv v20, v0, v16 + vsetivli zero, 15, e16, m2, tu, ma + vneg.v v0, v20 + vmax.vv v0, v20, v0 + .endm + + csrwi vxrm, 0 + vsetivli t0, 16, e32, m4, ta, ma + addi a4, a4, -1 + li t5, 1 + vmv.v.x v24, zero + vmv.v.x v28, zero +1: + add t1, a1, a3 + add t2, a2, a3 + addi a4, a4, -1 + squarediff16 + gradiff16 t1, v4 + vwaddu.wv v28, v28, v0 + gradiff16 t2, v12 + vwsubu.wv v28, v28, v0 + add a1, a1, a3 + add a2, a2, a3 + bnez a4, 1b + + squarediff16 + vsetivli zero, 16, e32, m4, tu, ma + vmv.s.x v0, zero + vmv.s.x v4, zero + vredsum.vs v0, v24, v0 + vredsum.vs v4, v28, v4 + vmv.x.s t1, v0 + vmv.x.s t2, v4 + srai t3, t2, 31 + xor t2, t3, t2 + sub t2, t2, t3 + mul t2, t2, a0 + add a0, t2, t1 + + ret +endfunc + +func ff_nsse8_rvv, zve32x + .macro squarediff8 + vsetivli zero, 8, e8, mf2, tu, ma + vle8.v v4, (a1) + vle8.v v12, (a2) + vwsubu.vv v16, v4, v12 + vsetvli zero, zero, e16, m1, tu, ma + vwmacc.vv v24, v16, v16 + .endm + + .macro gradiff8 srcx srcv + vsetivli zero, 8, e8, mf2, tu, ma + vle8.v v8, (\srcx) + vslide1down.vx v0, \srcv, t5 + vslide1down.vx v16, v8, t5 + vwsubu.vv v20, \srcv, v0 + vwsubu.wv v0, v20, v8 + vwaddu.wv v20, v0, v16 + vsetivli zero, 7, e16, m1, tu, ma + vneg.v v0, v20 + vmax.vv v0, v20, v0 + .endm + + csrwi vxrm, 0 + vsetivli t0, 8, e32, m2, ta, ma + addi a4, a4, -1 + li t5, 1 + vmv.v.x v24, zero + vmv.v.x v28, zero +1: + add t1, a1, a3 + add t2, a2, a3 + addi a4, a4, -1 + squarediff8 + gradiff8 t1, v4 + vwaddu.wv v28, v28, v0 + gradiff8 t2, v12 + vwsubu.wv v28, v28, v0 + add a1, a1, a3 + add a2, a2, a3 + bnez a4, 1b + + squarediff8 + vsetivli zero, 8, e32, m2, tu, ma + vmv.s.x v0, zero + vmv.s.x v4, zero + vredsum.vs v0, v24, v0 + vredsum.vs v4, v28, v4 + vmv.x.s t1, v0 + vmv.x.s t2, v4 + srai t3, t2, 31 + xor t2, t3, t2 + sub t2, t2, t3 + mul t2, t2, a0 + add a0, t2, t1 + + ret +endfunc

1 0

avformat/mov: Don't use entry[-1] in pointer arithmetic
by Andreas Rheinhardt 27 Feb '24

27 Feb '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Mon Feb 26 22:37:04 2024 +0100| [1bb7d5ca9fc6dc1b961014255ada03dee40bac31] | committer: Andreas Rheinhardt avformat/mov: Don't use entry[-1] in pointer arithmetic It is undefined behaviour. Fixes many failed tests with UBSan and GCC 13 like "src/libavformat/mov.c:4229:44: runtime error: store to address 0x5572abe20f80 with insufficient space for an object of type 'struct MOVIndexRange'" (The line number does not refer to the line where &entry[-1] is assigned.) Reviewed-by: James Almer <jamrial(a)gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1bb7d5ca9fc6dc1b9… --- libavformat/mov.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 71e8f7ae8f..97caaa7723 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4022,7 +4022,7 @@ static void mov_fix_index(MOVContext *mov, AVStream *st) int num_discarded_begin = 0; int first_non_zero_audio_edit = -1; int packet_skip_samples = 0; - MOVIndexRange *current_index_range; + MOVIndexRange *current_index_range = NULL; int found_keyframe_after_edit = 0; int found_non_empty_edit = 0; @@ -4038,7 +4038,6 @@ static void mov_fix_index(MOVContext *mov, AVStream *st) return; } msc->current_index_range = msc->index_ranges; - current_index_range = msc->index_ranges - 1; // Clean AVStream from traces of old index sti->index_entries = NULL; @@ -4225,8 +4224,9 @@ static void mov_fix_index(MOVContext *mov, AVStream *st) } // Update the index ranges array - if (current_index_range < msc->index_ranges || index != current_index_range->end) { - current_index_range++; + if (!current_index_range || index != current_index_range->end) { + current_index_range = current_index_range ? current_index_range + 1 + : msc->index_ranges; current_index_range->start = index; } current_index_range->end = index + 1; @@ -4289,7 +4289,8 @@ static void mov_fix_index(MOVContext *mov, AVStream *st) av_freep(&frame_duration_buffer); // Null terminate the index ranges array - current_index_range++; + current_index_range = current_index_range ? current_index_range + 1 + : msc->index_ranges; current_index_range->start = 0; current_index_range->end = 0; msc->current_index = msc->index_ranges[0].start;

1 0

Revert "avformat/mov: zero initialize the index ranges buffer"
by Andreas Rheinhardt 26 Feb '24

26 Feb '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Mon Feb 26 22:58:58 2024 +0100| [9d7d03ea4598484e2d200976d0064df41186a630] | committer: Andreas Rheinhardt Revert "avformat/mov: zero initialize the index ranges buffer" This reverts commit eee3b7e2fb0664b889e58c03f76e19ef23e4d1d8. It has been made in an attempt to fix UBSan test failures with GCC 13 (see e.g. [1]), but it did not help at all. So revert it, but use av_malloc_array() instead of going back to av_malloc(). [1]: https://fate.ffmpeg.org/report.cgi?slot=x86_64-archlinux-gcc-ubsan&time=202… Reviewed-by: James Almer <jamrial(a)gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9d7d03ea4598484e2… --- libavformat/mov.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index effa46120f..71e8f7ae8f 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4031,7 +4031,8 @@ static void mov_fix_index(MOVContext *mov, AVStream *st) } // allocate the index ranges array - msc->index_ranges = av_calloc((msc->elst_count + 1), sizeof(msc->index_ranges[0])); + msc->index_ranges = av_malloc_array(msc->elst_count + 1, + sizeof(msc->index_ranges[0])); if (!msc->index_ranges) { av_log(mov->fc, AV_LOG_ERROR, "Cannot allocate index ranges buffer\n"); return;

1 0

avcodec/aac: Split ChannelElement in decoder and encoder structs
by Andreas Rheinhardt 26 Feb '24

26 Feb '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Mon Feb 26 00:24:33 2024 +0100| [a6aa043baa06c1b3296b02245c9d71aca273f2ef] | committer: Andreas Rheinhardt avcodec/aac: Split ChannelElement in decoder and encoder structs The AAC decoders share no common code with the AAC encoder, so they are not restricted to using the same structures. This implies that one can use different structs for each component and remove elements not used by the decoders/ the encoder. This leads to quite sizeable savings: sizeof(ChannelElement) for the encoder went down to 134432B here from 547552B; for the decoder it went down to 512800B. Reviewed-by: Lynne <dev(a)lynne.ee> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a6aa043baa06c1b32… --- libavcodec/aac.h | 125 ------------------------------------------- libavcodec/aacdec.h | 102 +++++++++++++++++++++++++++++++++++ libavcodec/aacenc.h | 89 ++++++++++++++++++++++++++++++ libavcodec/aacenc_utils.h | 2 +- libavcodec/aacenctab.h | 1 + libavcodec/sbrdsp_template.c | 2 + 6 files changed, 195 insertions(+), 126 deletions(-) diff --git a/libavcodec/aac.h b/libavcodec/aac.h index da683b0071..89f838eab5 100644 --- a/libavcodec/aac.h +++ b/libavcodec/aac.h @@ -32,11 +32,6 @@ #include "aac_defines.h" -#include "libavutil/channel_layout.h" -#include "libavutil/mem_internal.h" -#include "sbr.h" - -#include <stdint.h> #define MAX_CHANNELS 64 #define MAX_ELEM_ID 16 @@ -44,8 +39,6 @@ #define TNS_MAX_ORDER 20 #define MAX_LTP_LONG_SFB 40 -#define CLIP_AVOIDANCE_FACTOR 0.95f - enum RawDataBlockType { TYPE_SCE, TYPE_CPE, @@ -83,8 +76,6 @@ enum BandType { INTENSITY_BT = 15, ///< Scalefactor data are intensity stereo positions (in phase). }; -#define IS_CODEBOOK_UNSIGNED(x) (((x) - 1) & 10) - enum ChannelPosition { AAC_CHANNEL_OFF = 0, AAC_CHANNEL_FRONT = 1, @@ -94,15 +85,6 @@ enum ChannelPosition { AAC_CHANNEL_CC = 5, }; -/** - * The point during decoding at which channel coupling is applied. - */ -enum CouplingPoint { - BEFORE_TNS, - BETWEEN_TNS_AND_IMDCT, - AFTER_IMDCT = 3, -}; - /** * Predictor State */ @@ -131,54 +113,6 @@ typedef struct PredictorState { #define NOISE_PRE_BITS 9 ///< length of preamble #define NOISE_OFFSET 90 ///< subtracted from global gain, used as offset for the preamble -/** - * Long Term Prediction - */ -typedef struct LongTermPrediction { - int8_t present; - int16_t lag; - int coef_idx; - INTFLOAT coef; - int8_t used[MAX_LTP_LONG_SFB]; -} LongTermPrediction; - -/** - * Individual Channel Stream - */ -typedef struct IndividualChannelStream { - uint8_t max_sfb; ///< number of scalefactor bands per group - enum WindowSequence window_sequence[2]; - uint8_t use_kb_window[2]; ///< If set, use Kaiser-Bessel window, otherwise use a sine window. - int num_window_groups; - uint8_t group_len[8]; - LongTermPrediction ltp; - const uint16_t *swb_offset; ///< table of offsets to the lowest spectral coefficient of a scalefactor band, sfb, for a particular window - const uint8_t *swb_sizes; ///< table of scalefactor band sizes for a particular window - int num_swb; ///< number of scalefactor window bands - int num_windows; - int tns_max_bands; - int predictor_present; - int predictor_initialized; - int predictor_reset_group; - int predictor_reset_count[31]; ///< used by encoder to count prediction resets - uint8_t prediction_used[41]; - uint8_t window_clipping[8]; ///< set if a certain window is near clipping - float clip_avoidance_factor; ///< set if any window is near clipping to the necessary atennuation factor to avoid it -} IndividualChannelStream; - -/** - * Temporal Noise Shaping - */ -typedef struct TemporalNoiseShaping { - int present; - int n_filt[8]; - int length[8][4]; - int direction[8][4]; - int order[8][4]; - int coef_idx[8][4][TNS_MAX_ORDER]; - INTFLOAT coef[8][4][TNS_MAX_ORDER]; -} TemporalNoiseShaping; - typedef struct Pulse { int num_pulse; int start; @@ -186,63 +120,4 @@ typedef struct Pulse { int amp[4]; } Pulse; -/** - * coupling parameters - */ -typedef struct ChannelCoupling { - enum CouplingPoint coupling_point; ///< The point during decoding at which coupling is applied. - int num_coupled; ///< number of target elements - enum RawDataBlockType type[8]; ///< Type of channel element to be coupled - SCE or CPE. - int id_select[8]; ///< element id - int ch_select[8]; /**< [0] shared list of gains; [1] list of gains for right channel; - * [2] list of gains for left channel; [3] lists of gains for both channels - */ - INTFLOAT gain[16][120]; -} ChannelCoupling; - -/** - * Single Channel Element - used for both SCE and LFE elements. - */ -typedef struct SingleChannelElement { - IndividualChannelStream ics; - TemporalNoiseShaping tns; - Pulse pulse; - enum BandType band_type[128]; ///< band types - enum BandType band_alt[128]; ///< alternative band type (used by encoder) - int band_type_run_end[120]; ///< band type run end points - INTFLOAT sf[120]; ///< scalefactors - int sf_idx[128]; ///< scalefactor indices (used by encoder) - uint8_t zeroes[128]; ///< band is not coded (used by encoder) - uint8_t can_pns[128]; ///< band is allowed to PNS (informative) - float is_ener[128]; ///< Intensity stereo pos (used by encoder) - float pns_ener[128]; ///< Noise energy values (used by encoder) - DECLARE_ALIGNED(32, INTFLOAT, pcoeffs)[1024]; ///< coefficients for IMDCT, pristine - DECLARE_ALIGNED(32, INTFLOAT, coeffs)[1024]; ///< coefficients for IMDCT, maybe processed - DECLARE_ALIGNED(32, INTFLOAT, saved)[1536]; ///< overlap - DECLARE_ALIGNED(32, INTFLOAT, ret_buf)[2048]; ///< PCM output buffer - DECLARE_ALIGNED(16, INTFLOAT, ltp_state)[3072]; ///< time signal for LTP - DECLARE_ALIGNED(32, AAC_FLOAT, lcoeffs)[1024]; ///< MDCT of LTP coefficients (used by encoder) - DECLARE_ALIGNED(32, AAC_FLOAT, prcoeffs)[1024]; ///< Main prediction coefs (used by encoder) - PredictorState predictor_state[MAX_PREDICTORS]; - INTFLOAT *ret; ///< PCM output -} SingleChannelElement; - -/** - * channel element - generic struct for SCE/CPE/CCE/LFE - */ -typedef struct ChannelElement { - int present; - // CPE specific - int common_window; ///< Set if channels share a common 'IndividualChannelStream' in bitstream. - int ms_mode; ///< Signals mid/side stereo flags coding mode (used by encoder) - uint8_t is_mode; ///< Set if any bands have been encoded using intensity stereo (used by encoder) - uint8_t ms_mask[128]; ///< Set if mid/side stereo is used for each scalefactor window band - uint8_t is_mask[128]; ///< Set if intensity stereo is used (used by encoder) - // shared - SingleChannelElement ch[2]; - // CCE specific - ChannelCoupling coup; - SpectralBandReplication sbr; -} ChannelElement; - #endif /* AVCODEC_AAC_H */ diff --git a/libavcodec/aacdec.h b/libavcodec/aacdec.h index 37a318659e..e23310b5b1 100644 --- a/libavcodec/aacdec.h +++ b/libavcodec/aacdec.h @@ -30,13 +30,18 @@ #ifndef AVCODEC_AACDEC_H #define AVCODEC_AACDEC_H +#include <stdint.h> + +#include "libavutil/channel_layout.h" #include "libavutil/float_dsp.h" #include "libavutil/fixed_dsp.h" #include "libavutil/mem_internal.h" #include "libavutil/tx.h" #include "aac.h" +#include "aac_defines.h" #include "mpeg4audio.h" +#include "sbr.h" /** * Output configuration status @@ -54,6 +59,103 @@ enum AACOutputChannelOrder { CHANNEL_ORDER_CODED, }; +/** + * The point during decoding at which channel coupling is applied. + */ +enum CouplingPoint { + BEFORE_TNS, + BETWEEN_TNS_AND_IMDCT, + AFTER_IMDCT = 3, +}; + +/** + * Long Term Prediction + */ +typedef struct LongTermPrediction { + int8_t present; + int16_t lag; + INTFLOAT coef; + int8_t used[MAX_LTP_LONG_SFB]; +} LongTermPrediction; + +/** + * Individual Channel Stream + */ +typedef struct IndividualChannelStream { + uint8_t max_sfb; ///< number of scalefactor bands per group + enum WindowSequence window_sequence[2]; + uint8_t use_kb_window[2]; ///< If set, use Kaiser-Bessel window, otherwise use a sine window. + int num_window_groups; + uint8_t group_len[8]; + LongTermPrediction ltp; + const uint16_t *swb_offset; ///< table of offsets to the lowest spectral coefficient of a scalefactor band, sfb, for a particular window + int num_swb; ///< number of scalefactor window bands + int num_windows; + int tns_max_bands; + int predictor_present; + int predictor_initialized; + int predictor_reset_group; + uint8_t prediction_used[41]; + uint8_t window_clipping[8]; ///< set if a certain window is near clipping +} IndividualChannelStream; + +/** + * Temporal Noise Shaping + */ +typedef struct TemporalNoiseShaping { + int present; + int n_filt[8]; + int length[8][4]; + int direction[8][4]; + int order[8][4]; + INTFLOAT coef[8][4][TNS_MAX_ORDER]; +} TemporalNoiseShaping; + +/** + * coupling parameters + */ +typedef struct ChannelCoupling { + enum CouplingPoint coupling_point; ///< The point during decoding at which coupling is applied. + int num_coupled; ///< number of target elements + enum RawDataBlockType type[8]; ///< Type of channel element to be coupled - SCE or CPE. + int id_select[8]; ///< element id + int ch_select[8]; /**< [0] shared list of gains; [1] list of gains for right channel; + * [2] list of gains for left channel; [3] lists of gains for both channels + */ + INTFLOAT gain[16][120]; +} ChannelCoupling; + +/** + * Single Channel Element - used for both SCE and LFE elements. + */ +typedef struct SingleChannelElement { + IndividualChannelStream ics; + TemporalNoiseShaping tns; + enum BandType band_type[128]; ///< band types + int band_type_run_end[120]; ///< band type run end points + INTFLOAT sf[120]; ///< scalefactors + DECLARE_ALIGNED(32, INTFLOAT, coeffs)[1024]; ///< coefficients for IMDCT, maybe processed + DECLARE_ALIGNED(32, INTFLOAT, saved)[1536]; ///< overlap + DECLARE_ALIGNED(32, INTFLOAT, ret_buf)[2048]; ///< PCM output buffer + DECLARE_ALIGNED(16, INTFLOAT, ltp_state)[3072]; ///< time signal for LTP + PredictorState predictor_state[MAX_PREDICTORS]; + INTFLOAT *ret; ///< PCM output +} SingleChannelElement; + +/** + * channel element - generic struct for SCE/CPE/CCE/LFE + */ +typedef struct ChannelElement { + int present; + // CPE specific + uint8_t ms_mask[128]; ///< Set if mid/side stereo is used for each scalefactor window band + // shared + SingleChannelElement ch[2]; + // CCE specific + ChannelCoupling coup; + SpectralBandReplication sbr; +} ChannelElement; + typedef struct OutputConfiguration { MPEG4AudioConfig m4ac; uint8_t layout_map[MAX_ELEM_ID*4][3]; diff --git a/libavcodec/aacenc.h b/libavcodec/aacenc.h index 18b424736d..752f1c26b2 100644 --- a/libavcodec/aacenc.h +++ b/libavcodec/aacenc.h @@ -22,9 +22,12 @@ #ifndef AVCODEC_AACENC_H #define AVCODEC_AACENC_H +#include <stdint.h> + #include "libavutil/channel_layout.h" #include "libavutil/float_dsp.h" #include "libavutil/mem_internal.h" +#include "libavutil/tx.h" #include "avcodec.h" #include "put_bits.h" @@ -35,6 +38,8 @@ #include "lpc.h" +#define CLIP_AVOIDANCE_FACTOR 0.95f + typedef enum AACCoder { AAC_CODER_ANMR = 0, AAC_CODER_TWOLOOP, @@ -54,6 +59,90 @@ typedef struct AACEncOptions { int intensity_stereo; } AACEncOptions; +/** + * Long Term Prediction + */ +typedef struct LongTermPrediction { + int8_t present; + int16_t lag; + int coef_idx; + float coef; + int8_t used[MAX_LTP_LONG_SFB]; +} LongTermPrediction; + +/** + * Individual Channel Stream + */ +typedef struct IndividualChannelStream { + uint8_t max_sfb; ///< number of scalefactor bands per group + enum WindowSequence window_sequence[2]; + uint8_t use_kb_window[2]; ///< If set, use Kaiser-Bessel window, otherwise use a sine window. + uint8_t group_len[8]; + LongTermPrediction ltp; + const uint16_t *swb_offset; ///< table of offsets to the lowest spectral coefficient of a scalefactor band, sfb, for a particular window + const uint8_t *swb_sizes; ///< table of scalefactor band sizes for a particular window + int num_swb; ///< number of scalefactor window bands + int num_windows; + int tns_max_bands; + int predictor_present; + int predictor_initialized; + int predictor_reset_group; + int predictor_reset_count[31]; ///< used to count prediction resets + uint8_t prediction_used[41]; + uint8_t window_clipping[8]; ///< set if a certain window is near clipping + float clip_avoidance_factor; ///< set if any window is near clipping to the necessary atennuation factor to avoid it +} IndividualChannelStream; + +/** + * Temporal Noise Shaping + */ +typedef struct TemporalNoiseShaping { + int present; + int n_filt[8]; + int length[8][4]; + int direction[8][4]; + int order[8][4]; + int coef_idx[8][4][TNS_MAX_ORDER]; + float coef[8][4][TNS_MAX_ORDER]; +} TemporalNoiseShaping; + +/** + * Single Channel Element - used for both SCE and LFE elements. + */ +typedef struct SingleChannelElement { + IndividualChannelStream ics; + TemporalNoiseShaping tns; + Pulse pulse; + enum BandType band_type[128]; ///< band types + enum BandType band_alt[128]; ///< alternative band type + int sf_idx[128]; ///< scalefactor indices + uint8_t zeroes[128]; ///< band is not coded + uint8_t can_pns[128]; ///< band is allowed to PNS (informative) + float is_ener[128]; ///< Intensity stereo pos + float pns_ener[128]; ///< Noise energy values + DECLARE_ALIGNED(32, float, pcoeffs)[1024]; ///< coefficients for IMDCT, pristine + DECLARE_ALIGNED(32, float, coeffs)[1024]; ///< coefficients for IMDCT, maybe processed + DECLARE_ALIGNED(32, float, ret_buf)[2048]; ///< PCM output buffer + DECLARE_ALIGNED(16, float, ltp_state)[3072]; ///< time signal for LTP + DECLARE_ALIGNED(32, float, lcoeffs)[1024]; ///< MDCT of LTP coefficients + DECLARE_ALIGNED(32, float, prcoeffs)[1024]; ///< Main prediction coefs + PredictorState predictor_state[MAX_PREDICTORS]; +} SingleChannelElement; + +/** + * channel element - generic struct for SCE/CPE/CCE/LFE + */ +typedef struct ChannelElement { + // CPE specific + int common_window; ///< Set if channels share a common 'IndividualChannelStream' in bitstream. + int ms_mode; ///< Signals mid/side stereo flags coding mode + uint8_t is_mode; ///< Set if any bands have been encoded using intensity stereo + uint8_t ms_mask[128]; ///< Set if mid/side stereo is used for each scalefactor window band + uint8_t is_mask[128]; ///< Set if intensity stereo is used + // shared + SingleChannelElement ch[2]; +} ChannelElement; + struct AACEncContext; typedef struct AACCoefficientsEncoder { diff --git a/libavcodec/aacenc_utils.h b/libavcodec/aacenc_utils.h index bef4c103f3..ef2218e036 100644 --- a/libavcodec/aacenc_utils.h +++ b/libavcodec/aacenc_utils.h @@ -29,7 +29,7 @@ #define AVCODEC_AACENC_UTILS_H #include "libavutil/ffmath.h" -#include "aac.h" +#include "aacenc.h" #include "aacenctab.h" #include "aactab.h" diff --git a/libavcodec/aacenctab.h b/libavcodec/aacenctab.h index 20e47ea900..f2d6f597bc 100644 --- a/libavcodec/aacenctab.h +++ b/libavcodec/aacenctab.h @@ -30,6 +30,7 @@ #include "libavutil/channel_layout.h" #include "aac.h" +#include "defs.h" /** Total number of usable codebooks **/ #define CB_TOT 12 diff --git a/libavcodec/sbrdsp_template.c b/libavcodec/sbrdsp_template.c index 79cd2156d9..c1e583ea56 100644 --- a/libavcodec/sbrdsp_template.c +++ b/libavcodec/sbrdsp_template.c @@ -20,7 +20,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "libavutil/attributes_internal.h" +#include "libavutil/mem_internal.h" static void sbr_sum64x5_c(INTFLOAT *z) {

1 0

avcodec/sbr: Remove unused AACDecContext* parameter from sbr_lf_gen_mips
by Andreas Rheinhardt 26 Feb '24

26 Feb '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sun Feb 25 23:12:34 2024 +0100| [6c92347ab9fb1a07664577a1b68e0a1724799e2b] | committer: Andreas Rheinhardt avcodec/sbr: Remove unused AACDecContext* parameter from sbr_lf_gen_mips Reviewed-by: Lynne <dev(a)lynne.ee> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6c92347ab9fb1a076… --- libavcodec/aacsbr.h | 2 ++ libavcodec/aacsbr_template.c | 4 ++-- libavcodec/mips/aacsbr_mips.c | 2 +- libavcodec/sbr.h | 4 +--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/aacsbr.h b/libavcodec/aacsbr.h index ad4935d734..cb680cc548 100644 --- a/libavcodec/aacsbr.h +++ b/libavcodec/aacsbr.h @@ -36,6 +36,8 @@ #define ENVELOPE_ADJUSTMENT_OFFSET 2 #define NOISE_FLOOR_OFFSET 6 +struct AACDecContext; + /** * SBR VLC tables */ diff --git a/libavcodec/aacsbr_template.c b/libavcodec/aacsbr_template.c index ce3834e2dc..cdfaed636b 100644 --- a/libavcodec/aacsbr_template.c +++ b/libavcodec/aacsbr_template.c @@ -1243,7 +1243,7 @@ static void sbr_qmf_synthesis(AVTXContext *mdct, av_tx_fn mdct_fn, #endif /// Generate the subband filtered lowband -static int sbr_lf_gen(AACDecContext *ac, SpectralBandReplication *sbr, +static int sbr_lf_gen(SpectralBandReplication *sbr, INTFLOAT X_low[32][40][2], const INTFLOAT W[2][32][32][2], int buf_idx) { @@ -1493,7 +1493,7 @@ void AAC_RENAME(ff_sbr_apply)(AACDecContext *ac, SpectralBandReplication *sbr, i ch ? R : L, sbr->data[ch].analysis_filterbank_samples, (INTFLOAT*)sbr->qmf_filter_scratch, sbr->data[ch].W, sbr->data[ch].Ypos); - sbr->c.sbr_lf_gen(ac, sbr, sbr->X_low, + sbr->c.sbr_lf_gen(sbr, sbr->X_low, (const INTFLOAT (*)[32][32][2]) sbr->data[ch].W, sbr->data[ch].Ypos); sbr->data[ch].Ypos ^= 1; diff --git a/libavcodec/mips/aacsbr_mips.c b/libavcodec/mips/aacsbr_mips.c index 0dc09130b7..e0715491e6 100644 --- a/libavcodec/mips/aacsbr_mips.c +++ b/libavcodec/mips/aacsbr_mips.c @@ -60,7 +60,7 @@ #if HAVE_INLINE_ASM #if HAVE_MIPSFPU -static int sbr_lf_gen_mips(AACDecContext *ac, SpectralBandReplication *sbr, +static int sbr_lf_gen_mips(SpectralBandReplication *sbr, float X_low[32][40][2], const float W[2][32][32][2], int buf_idx) { diff --git a/libavcodec/sbr.h b/libavcodec/sbr.h index 46c68615c8..fe3a39603a 100644 --- a/libavcodec/sbr.h +++ b/libavcodec/sbr.h @@ -37,8 +37,6 @@ #include "aacps.h" #include "sbrdsp.h" -struct AACDecContext; - /** * Spectral Band Replication header - spectrum parameters that invoke a reset if they differ from the previous header. */ @@ -121,7 +119,7 @@ typedef struct SpectralBandReplication SpectralBandReplication; * aacsbr functions pointers */ typedef struct AACSBRContext { - int (*sbr_lf_gen)(struct AACDecContext *ac, SpectralBandReplication *sbr, + int (*sbr_lf_gen)(SpectralBandReplication *sbr, INTFLOAT X_low[32][40][2], const INTFLOAT W[2][32][32][2], int buf_idx); void (*sbr_hf_assemble)(INTFLOAT Y1[38][64][2],

1 0