From: Zhao Zhili <zhiliz...@tencent.com> These fields in AVCodec are deprecated. For most codecs, it's cumbersome to implement get_supported_config only to export pix_fmts. --- libavcodec/avcodec.c | 6 ++++++ libavcodec/codec_internal.h | 9 +++++++++ 2 files changed, 15 insertions(+)
diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index e7e2c09222..f41d66d04f 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -765,11 +765,17 @@ int ff_default_get_supported_config(const AVCodecContext *avctx, const void **out_configs, int *out_num_configs) { + const FFCodec *codec2 = ffcodec(codec); + switch (config) { FF_DISABLE_DEPRECATION_WARNINGS case AV_CODEC_CONFIG_PIX_FORMAT: + if (codec2->pix_fmts) + WRAP_CONFIG(AVMEDIA_TYPE_VIDEO, codec2->pix_fmts, enum AVPixelFormat, AV_PIX_FMT_NONE); WRAP_CONFIG(AVMEDIA_TYPE_VIDEO, codec->pix_fmts, enum AVPixelFormat, AV_PIX_FMT_NONE); case AV_CODEC_CONFIG_FRAME_RATE: + if (codec2->supported_framerates) + WRAP_CONFIG(AVMEDIA_TYPE_VIDEO, codec2->supported_framerates, AVRational, {0}); WRAP_CONFIG(AVMEDIA_TYPE_VIDEO, codec->supported_framerates, AVRational, {0}); case AV_CODEC_CONFIG_SAMPLE_RATE: WRAP_CONFIG(AVMEDIA_TYPE_AUDIO, codec->supported_samplerates, int, 0); diff --git a/libavcodec/codec_internal.h b/libavcodec/codec_internal.h index 5b2db74590..a5ca72f2b6 100644 --- a/libavcodec/codec_internal.h +++ b/libavcodec/codec_internal.h @@ -274,6 +274,15 @@ typedef struct FFCodec { unsigned flags, const void **out_configs, int *out_num_configs); + /** + * Supported pixel format + * + * Can be null. If get_supported_config is null and this field isn't + * null, it will be used by ff_default_get_supported_config. + */ + const enum AVPixelFormat *pix_fmts; + + const AVRational *supported_framerates; } FFCodec; /** -- 2.46.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".