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/omx.c | |
| parent | a688f3c13ce55c2ba51dbbb344564649f1bb52fe (diff) | |
| download | ffmpeg-20f972701806be20a77f808db332d9489343bb78.tar.gz | |
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/omx.c')
| -rw-r--r-- | libavcodec/omx.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/libavcodec/omx.c b/libavcodec/omx.c index bc20b1db52..4bf3b4ffdd 100644 --- a/libavcodec/omx.c +++ b/libavcodec/omx.c @@ -936,19 +936,19 @@ static const AVClass omx_mpeg4enc_class = { .option = options, .version = LIBAVUTIL_VERSION_INT, }; -const AVCodec ff_mpeg4_omx_encoder = { - .name = "mpeg4_omx", - .long_name = NULL_IF_CONFIG_SMALL("OpenMAX IL MPEG-4 video encoder"), - .type = AVMEDIA_TYPE_VIDEO, - .id = AV_CODEC_ID_MPEG4, +const FFCodec ff_mpeg4_omx_encoder = { + .p.name = "mpeg4_omx", + .p.long_name = NULL_IF_CONFIG_SMALL("OpenMAX IL MPEG-4 video encoder"), + .p.type = AVMEDIA_TYPE_VIDEO, + .p.id = AV_CODEC_ID_MPEG4, .priv_data_size = sizeof(OMXCodecContext), .init = omx_encode_init, .encode2 = omx_encode_frame, .close = omx_encode_end, - .pix_fmts = omx_encoder_pix_fmts, - .capabilities = AV_CODEC_CAP_DELAY, + .p.pix_fmts = omx_encoder_pix_fmts, + .p.capabilities = AV_CODEC_CAP_DELAY, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, - .priv_class = &omx_mpeg4enc_class, + .p.priv_class = &omx_mpeg4enc_class, }; static const AVClass omx_h264enc_class = { @@ -957,17 +957,17 @@ static const AVClass omx_h264enc_class = { .option = options, .version = LIBAVUTIL_VERSION_INT, }; -const AVCodec ff_h264_omx_encoder = { - .name = "h264_omx", - .long_name = NULL_IF_CONFIG_SMALL("OpenMAX IL H.264 video encoder"), - .type = AVMEDIA_TYPE_VIDEO, - .id = AV_CODEC_ID_H264, +const FFCodec ff_h264_omx_encoder = { + .p.name = "h264_omx", + .p.long_name = NULL_IF_CONFIG_SMALL("OpenMAX IL H.264 video encoder"), + .p.type = AVMEDIA_TYPE_VIDEO, + .p.id = AV_CODEC_ID_H264, .priv_data_size = sizeof(OMXCodecContext), .init = omx_encode_init, .encode2 = omx_encode_frame, .close = omx_encode_end, - .pix_fmts = omx_encoder_pix_fmts, - .capabilities = AV_CODEC_CAP_DELAY, + .p.pix_fmts = omx_encoder_pix_fmts, + .p.capabilities = AV_CODEC_CAP_DELAY, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, - .priv_class = &omx_h264enc_class, + .p.priv_class = &omx_h264enc_class, }; |