MrBesen
/
ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/ac3enc: Move EAC-3 specific initialization to eac3enc.c 

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2024-04-07 20:04:20 +02:00
parent 2281ab5c24
commit 28ffc39808
3 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/ac3enc.c
View File

@ -2555,8 +2555,6 @@ av_cold int ff_ac3_encode_init(AVCodecContext *avctx)
s->avctx = avctx;
s->eac3 = avctx->codec_id == AV_CODEC_ID_EAC3;
ret = validate_options(s);
if (ret)
return ret;
@ -2579,11 +2577,7 @@ av_cold int ff_ac3_encode_init(AVCodecContext *avctx)
s->crc_inv[1] = pow_poly((CRC16_POLY >> 1), (8 * frame_size_58) - 16, CRC16_POLY);
}
if (CONFIG_EAC3_ENCODER && s->eac3) {
static AVOnce init_static_once_eac3 = AV_ONCE_INIT;
ff_thread_once(&init_static_once_eac3, ff_eac3_exponent_init);
s->output_frame_header = ff_eac3_output_frame_header;
} else
if (!s->output_frame_header)
s->output_frame_header = ac3_output_frame_header;
set_bandwidth(s);

26
libavcodec/eac3enc.c
View File

@ -27,6 +27,7 @@
#define AC3ENC_FLOAT 1
#include "libavutil/attributes.h"
#include "libavutil/thread.h"
#include "ac3enc.h"
#include "codec_internal.h"
#include "eac3enc.h"
@ -47,7 +48,10 @@ static const AVClass eac3enc_class = {
static int8_t eac3_frame_expstr_index_tab[3][4][4][4][4][4];
av_cold void ff_eac3_exponent_init(void)
/**
* Initialize E-AC-3 exponent tables.
*/
static av_cold void eac3_exponent_init(void)
{
int i;
@ -122,8 +126,10 @@ void ff_eac3_set_cpl_states(AC3EncodeContext *s)
}
}
void ff_eac3_output_frame_header(AC3EncodeContext *s)
/**
* Write the E-AC-3 frame header to the output bitstream.
*/
static void eac3_output_frame_header(AC3EncodeContext *s)
{
int blk, ch;
AC3EncOptions *opt = &s->options;
@ -243,6 +249,18 @@ void ff_eac3_output_frame_header(AC3EncodeContext *s)
put_bits(&s->pb, 1, 0);
}
static av_cold int eac3_encode_init(AVCodecContext *avctx)
{
static AVOnce init_static_once = AV_ONCE_INIT;
AC3EncodeContext *s = avctx->priv_data;
s->eac3 = 1;
s->output_frame_header = eac3_output_frame_header;
ff_thread_once(&init_static_once, eac3_exponent_init);
return ff_ac3_float_encode_init(avctx);
}
const FFCodec ff_eac3_encoder = {
.p.name = "eac3",
@ -251,7 +269,7 @@ const FFCodec ff_eac3_encoder = {
.p.id = AV_CODEC_ID_EAC3,
.p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE,
.priv_data_size = sizeof(AC3EncodeContext),
.init = ff_ac3_float_encode_init,
.init = eac3_encode_init,
FF_CODEC_ENCODE_CB(ff_ac3_encode_frame),
.close = ff_ac3_encode_close,
.p.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP,

10
libavcodec/eac3enc.h
View File

@ -29,11 +29,6 @@
#include "ac3enc.h"
/**
* Initialize E-AC-3 exponent tables.
*/
void ff_eac3_exponent_init(void);
/**
* Determine frame exponent strategy use and indices.
*/
@ -46,9 +41,4 @@ void ff_eac3_get_frame_exp_strategy(AC3EncodeContext *s);
*/
void ff_eac3_set_cpl_states(AC3EncodeContext *s);
/**
* Write the E-AC-3 frame header to the output bitstream.
*/
void ff_eac3_output_frame_header(AC3EncodeContext *s);
#endif /* AVCODEC_EAC3ENC_H */