[FFmpeg-cvslog] avcodec/ac3enc_template: Perform compile-time checks at compile-time
Andreas Rheinhardt
git at videolan.org
Sat Jan 9 05:44:02 EET 2021
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Thu Dec 3 04:44:21 2020 +0100| [49a12ac4af32f82643b840c40d2af2f9e2623729] | committer: Andreas Rheinhardt
avcodec/ac3enc_template: Perform compile-time checks at compile-time
Runtime checks for whether the encoder is fixed-point or not are
unnecessary here as this is a template; furthermore, there is no
fixed-point EAC-3 encoder, so some checks for whether one is in EAC-3
mode can be omitted when doing fixed-point encoding.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=49a12ac4af32f82643b840c40d2af2f9e2623729
---
libavcodec/ac3enc_template.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/libavcodec/ac3enc_template.c b/libavcodec/ac3enc_template.c
index 0d99bd84c8..a486c95c8e 100644
--- a/libavcodec/ac3enc_template.c
+++ b/libavcodec/ac3enc_template.c
@@ -98,8 +98,7 @@ static void apply_mdct(AC3EncodeContext *s)
s->ac3dsp.apply_window_int16(s->windowed_samples, input_samples,
s->mdct_window, AC3_WINDOW_SIZE);
- if (s->fixed_point)
- block->coeff_shift[ch+1] = normalize_samples(s);
+ block->coeff_shift[ch + 1] = normalize_samples(s);
#endif
s->mdct.mdct_calcw(&s->mdct, block->mdct_coef[ch+1],
@@ -312,7 +311,7 @@ static void apply_channel_coupling(AC3EncodeContext *s)
}
}
- if (CONFIG_EAC3_ENCODER && s->eac3)
+ if (AC3ENC_FLOAT && CONFIG_EAC3_ENCODER && s->eac3)
ff_eac3_set_cpl_states(s);
}
@@ -384,14 +383,14 @@ int AC3_NAME(encode_frame)(AVCodecContext *avctx, AVPacket *avpkt,
return ret;
}
- if (s->bit_alloc.sr_code == 1 || s->eac3)
+ if (s->bit_alloc.sr_code == 1 || (AC3ENC_FLOAT && s->eac3))
ff_ac3_adjust_frame_size(s);
copy_input_samples(s, (SampleType **)frame->extended_data);
apply_mdct(s);
- if (s->fixed_point)
+ if (!AC3ENC_FLOAT)
scale_coefficients(s);
clip_coefficients(&s->adsp, s->blocks[0].mdct_coef[1],
@@ -405,7 +404,7 @@ int AC3_NAME(encode_frame)(AVCodecContext *avctx, AVPacket *avpkt,
compute_rematrixing_strategy(s);
- if (!s->fixed_point)
+ if (AC3ENC_FLOAT)
scale_coefficients(s);
ff_ac3_apply_rematrixing(s);
More information about the ffmpeg-cvslog
mailing list