diff options
author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-03-16 21:09:54 +0100 |
---|---|---|
committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-03-21 01:33:09 +0100 |
commit | 20f972701806be20a77f808db332d9489343bb78 (patch) | |
tree | 8d8b588c0ca06fa652518a5685db8280b0bf532d /libavcodec/sonic.c | |
parent | a688f3c13ce55c2ba51dbbb344564649f1bb52fe (diff) |
avcodec/codec_internal: Add FFCodec, hide internal part of AVCodec
Up until now, codec.h contains both public and private parts
of AVCodec. This exposes the internals of AVCodec to users
and leads them into the temptation of actually using them
and forces us to forward-declare structures and types that
users can't use at all.
This commit changes this by adding a new structure FFCodec to
codec_internal.h that extends AVCodec, i.e. contains the public
AVCodec as first member; the private fields of AVCodec are moved
to this structure, leaving codec.h clean.
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/sonic.c')
-rw-r--r-- | libavcodec/sonic.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/libavcodec/sonic.c b/libavcodec/sonic.c index d1ded0fcea..264a5ff2b3 100644 --- a/libavcodec/sonic.c +++ b/libavcodec/sonic.c @@ -1078,47 +1078,47 @@ static int sonic_decode_frame(AVCodecContext *avctx, return buf_size; } -const AVCodec ff_sonic_decoder = { - .name = "sonic", - .long_name = NULL_IF_CONFIG_SMALL("Sonic"), - .type = AVMEDIA_TYPE_AUDIO, - .id = AV_CODEC_ID_SONIC, +const FFCodec ff_sonic_decoder = { + .p.name = "sonic", + .p.long_name = NULL_IF_CONFIG_SMALL("Sonic"), + .p.type = AVMEDIA_TYPE_AUDIO, + .p.id = AV_CODEC_ID_SONIC, .priv_data_size = sizeof(SonicContext), .init = sonic_decode_init, .close = sonic_decode_close, .decode = sonic_decode_frame, - .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_EXPERIMENTAL | AV_CODEC_CAP_CHANNEL_CONF, + .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_EXPERIMENTAL | AV_CODEC_CAP_CHANNEL_CONF, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; #endif /* CONFIG_SONIC_DECODER */ #if CONFIG_SONIC_ENCODER -const AVCodec ff_sonic_encoder = { - .name = "sonic", - .long_name = NULL_IF_CONFIG_SMALL("Sonic"), - .type = AVMEDIA_TYPE_AUDIO, - .id = AV_CODEC_ID_SONIC, +const FFCodec ff_sonic_encoder = { + .p.name = "sonic", + .p.long_name = NULL_IF_CONFIG_SMALL("Sonic"), + .p.type = AVMEDIA_TYPE_AUDIO, + .p.id = AV_CODEC_ID_SONIC, .priv_data_size = sizeof(SonicContext), .init = sonic_encode_init, .encode2 = sonic_encode_frame, - .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, - .capabilities = AV_CODEC_CAP_EXPERIMENTAL, + .p.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, + .p.capabilities = AV_CODEC_CAP_EXPERIMENTAL, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, .close = sonic_encode_close, }; #endif #if CONFIG_SONIC_LS_ENCODER -const AVCodec ff_sonic_ls_encoder = { - .name = "sonicls", - .long_name = NULL_IF_CONFIG_SMALL("Sonic lossless"), - .type = AVMEDIA_TYPE_AUDIO, - .id = AV_CODEC_ID_SONIC_LS, +const FFCodec ff_sonic_ls_encoder = { + .p.name = "sonicls", + .p.long_name = NULL_IF_CONFIG_SMALL("Sonic lossless"), + .p.type = AVMEDIA_TYPE_AUDIO, + .p.id = AV_CODEC_ID_SONIC_LS, .priv_data_size = sizeof(SonicContext), .init = sonic_encode_init, .encode2 = sonic_encode_frame, - .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, - .capabilities = AV_CODEC_CAP_EXPERIMENTAL, + .p.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, + .p.capabilities = AV_CODEC_CAP_EXPERIMENTAL, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, .close = sonic_encode_close, }; |