diff options
| author | Niklas Haas <git@haasn.dev> | 2024-04-06 15:07:26 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2024-04-09 14:36:41 +0200 |
| commit | 4d7bef2a904c0fbcaf92b1f97a6166e3d141786d (patch) | |
| tree | a44d5fc5acc93e7a0baff6ff4fde7caa4925043c | |
| parent | 60460ddf5a95d9886cbebbacd0ded816fb1888be (diff) | |
avcodec/mjpegenc: switch to get_supported_config()
This codec's capabilities should be set dynamically based on the value
of strict_std_compliance, when available. This will allow us to finally
get rid of the strictness hack in ffmpeg_filter.c.
| -rw-r--r-- | libavcodec/mjpegenc.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index 137b68a98d..0473ad132b 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -640,7 +640,24 @@ static const AVClass mjpeg_class = { .version = LIBAVUTIL_VERSION_INT, }; -const FFCodec ff_mjpeg_encoder = { +static int mjpeg_get_supported_config(const AVCodecContext *avctx, + const AVCodec *codec, + enum AVCodecConfig config, + unsigned flags, const void **out) +{ + if (config == AV_CODEC_CONFIG_COLOR_RANGE) { + static const enum AVColorRange mjpeg_ranges[] = { + AVCOL_RANGE_MPEG, AVCOL_RANGE_JPEG, AVCOL_RANGE_UNSPECIFIED, + }; + int strict = avctx ? avctx->strict_std_compliance : 0; + *out = &mjpeg_ranges[strict > FF_COMPLIANCE_UNOFFICIAL ? 1 : 0]; + return 0; + } + + return ff_default_get_supported_config(avctx, codec, config, flags, out); +} + +FFCodec ff_mjpeg_encoder = { .p.name = "mjpeg", CODEC_LONG_NAME("MJPEG (Motion JPEG)"), .p.type = AVMEDIA_TYPE_VIDEO, @@ -657,9 +674,9 @@ const FFCodec ff_mjpeg_encoder = { AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_NONE }, - .color_ranges = AVCOL_RANGE_MPEG | AVCOL_RANGE_JPEG, .p.priv_class = &mjpeg_class, .p.profiles = NULL_IF_CONFIG_SMALL(ff_mjpeg_profiles), + .get_supported_config = mjpeg_get_supported_config, }; #endif |