From: Niklas Haas <g...@haasn.dev>
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.
---
libavcodec/mjpegenc.c | 24 ++++++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c
index b3bc355501..40da602a6d 100644
--- a/libavcodec/mjpegenc.c
+++ b/libavcodec/mjpegenc.c
@@ -640,7 +640,27 @@ 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,
+ int *out_num)
+{
+ 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;
+ int index = strict > FF_COMPLIANCE_UNOFFICIAL ? 1 : 0;
+ *out = &mjpeg_ranges[index];
+ *out_num = FF_ARRAY_ELEMS(mjpeg_ranges) - index - 1;
+ return 0;
+ }
+
+ return ff_default_get_supported_config(avctx, codec, config, flags, out,
out_num);
+}
+
+FFCodec ff_mjpeg_encoder = {
.p.name = "mjpeg",
CODEC_LONG_NAME("MJPEG (Motion JPEG)"),
.p.type = AVMEDIA_TYPE_VIDEO,
@@ -657,9 +677,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
--
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".
