mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
ac3enc: prefer passing AC3EncodeContext rather than AVCodecContext
This commit is contained in:
parent
f501157e53
commit
82cea7cb6c
@ -1535,10 +1535,10 @@ void ff_ac3_output_frame(AC3EncodeContext *s, unsigned char *frame)
|
||||
}
|
||||
|
||||
|
||||
static void dprint_options(AVCodecContext *avctx)
|
||||
static void dprint_options(AC3EncodeContext *s)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
AC3EncodeContext *s = avctx->priv_data;
|
||||
AVCodecContext *avctx = s->avctx;
|
||||
AC3EncOptions *opt = &s->options;
|
||||
char strbuf[32];
|
||||
|
||||
@ -1689,9 +1689,9 @@ static void validate_mix_level(void *log_ctx, const char *opt_name,
|
||||
* Validate metadata options as set by AVOption system.
|
||||
* These values can optionally be changed per-frame.
|
||||
*/
|
||||
int ff_ac3_validate_metadata(AVCodecContext *avctx)
|
||||
int ff_ac3_validate_metadata(AC3EncodeContext *s)
|
||||
{
|
||||
AC3EncodeContext *s = avctx->priv_data;
|
||||
AVCodecContext *avctx = s->avctx;
|
||||
AC3EncOptions *opt = &s->options;
|
||||
|
||||
/* validate mixing levels */
|
||||
@ -1892,8 +1892,9 @@ static av_cold int set_channel_info(AC3EncodeContext *s, int channels,
|
||||
}
|
||||
|
||||
|
||||
static av_cold int validate_options(AVCodecContext *avctx, AC3EncodeContext *s)
|
||||
static av_cold int validate_options(AC3EncodeContext *s)
|
||||
{
|
||||
AVCodecContext *avctx = s->avctx;
|
||||
int i, ret, max_sr;
|
||||
|
||||
/* validate channel layout */
|
||||
@ -1998,7 +1999,7 @@ static av_cold int validate_options(AVCodecContext *avctx, AC3EncodeContext *s)
|
||||
}
|
||||
|
||||
if (!s->eac3) {
|
||||
ret = ff_ac3_validate_metadata(avctx);
|
||||
ret = ff_ac3_validate_metadata(s);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
@ -2085,10 +2086,10 @@ static av_cold void set_bandwidth(AC3EncodeContext *s)
|
||||
}
|
||||
|
||||
|
||||
static av_cold int allocate_buffers(AVCodecContext *avctx)
|
||||
static av_cold int allocate_buffers(AC3EncodeContext *s)
|
||||
{
|
||||
AVCodecContext *avctx = s->avctx;
|
||||
int blk, ch;
|
||||
AC3EncodeContext *s = avctx->priv_data;
|
||||
int channels = s->channels + 1; /* includes coupling channel */
|
||||
|
||||
if (s->allocate_sample_buffers(s))
|
||||
@ -2201,7 +2202,7 @@ av_cold int ff_ac3_encode_init(AVCodecContext *avctx)
|
||||
|
||||
ff_ac3_common_init();
|
||||
|
||||
ret = validate_options(avctx, s);
|
||||
ret = validate_options(s);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
@ -2246,7 +2247,7 @@ av_cold int ff_ac3_encode_init(AVCodecContext *avctx)
|
||||
if (ret)
|
||||
goto init_fail;
|
||||
|
||||
ret = allocate_buffers(avctx);
|
||||
ret = allocate_buffers(s);
|
||||
if (ret)
|
||||
goto init_fail;
|
||||
|
||||
@ -2255,7 +2256,7 @@ av_cold int ff_ac3_encode_init(AVCodecContext *avctx)
|
||||
dsputil_init(&s->dsp, avctx);
|
||||
ff_ac3dsp_init(&s->ac3dsp, avctx->flags & CODEC_FLAG_BITEXACT);
|
||||
|
||||
dprint_options(avctx);
|
||||
dprint_options(s);
|
||||
|
||||
return 0;
|
||||
init_fail:
|
||||
|
@ -243,7 +243,7 @@ int ff_ac3_encode_init(AVCodecContext *avctx);
|
||||
|
||||
int ff_ac3_encode_close(AVCodecContext *avctx);
|
||||
|
||||
int ff_ac3_validate_metadata(AVCodecContext *avctx);
|
||||
int ff_ac3_validate_metadata(AC3EncodeContext *s);
|
||||
|
||||
void ff_ac3_adjust_frame_size(AC3EncodeContext *s);
|
||||
|
||||
|
@ -424,7 +424,7 @@ int AC3_NAME(encode_frame)(AVCodecContext *avctx, unsigned char *frame,
|
||||
int ret;
|
||||
|
||||
if (!s->eac3 && s->options.allow_per_frame_metadata) {
|
||||
ret = ff_ac3_validate_metadata(avctx);
|
||||
ret = ff_ac3_validate_metadata(s);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user