@@ -1551,6 +1551,7 @@ static void av1_decode_flush(AVCodecContext *avctx)
static const AVOption av1_options[] = {
{ "operating_point", "Select an operating point of the scalable bitstream",
OFFSET(operating_point), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, AV1_MAX_OPERATING_POINTS - 1, VD },
+ { "dolbyvision", "Decode Dolby Vision RPUs", OFFSET(dovi.enable), AV_OPT_TYPE_BOOL, {.i64 = 1 }, 0, 1, VD },
{ NULL }
};
@@ -90,6 +90,9 @@ int ff_dovi_attach_side_data(DOVIContext *s, AVFrame *frame)
AVDOVIMetadata *dovi;
size_t dovi_size, ext_sz;
+ if (!s->enable)
+ return 0;
+
if (!s->mapping || !s->color)
return 0; /* incomplete dovi metadata */
@@ -558,6 +561,9 @@ int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size,
uint8_t use_nlq;
uint8_t profile;
+ if (!s->enable)
+ return 0;
+
if (rpu_size < 5)
goto fail;
@@ -37,6 +37,8 @@ typedef struct DOVIContext {
*
* For encoding, FF_DOVI_AUTOMATIC enables Dolby Vision only if
* avctx->decoded_side_data contains an AVDOVIMetadata.
+ *
+ * For decoding, FF_DOVI_AUTOMATIC has the same meaning as 1.
*/
#define FF_DOVI_AUTOMATIC -1
int enable;
@@ -3689,6 +3689,7 @@ static const AVOption options[] = {
AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, PAR },
{ "strict-displaywin", "stricly apply default display window size", OFFSET(apply_defdispwin),
AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, PAR },
+ { "dolbyvision", "Decode Dolby Vision RPUs", OFFSET(dovi_ctx.enable), AV_OPT_TYPE_BOOL, {.i64 = 1 }, 0, 1, PAR },
{ NULL },
};
@@ -674,6 +674,7 @@ static const AVOption libdav1d_options[] = {
{ "filmgrain", "Apply Film Grain", OFFSET(apply_grain), AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, VD | AV_OPT_FLAG_DEPRECATED },
{ "oppoint", "Select an operating point of the scalable bitstream", OFFSET(operating_point), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 31, VD },
{ "alllayers", "Output all spatial layers", OFFSET(all_layers), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VD },
+ { "dolbyvision", "Decode Dolby Vision RPUs", OFFSET(dovi.enable), AV_OPT_TYPE_BOOL, {.i64 = 1 }, 0, 1, VD },
{ NULL }
};
From: Niklas Haas <git@haasn.dev> This could be used by codecs to selectively disable parsing Dolby Vision RPUs, and is cheap to support. --- libavcodec/av1dec.c | 1 + libavcodec/dovi_rpu.c | 6 ++++++ libavcodec/dovi_rpu.h | 2 ++ libavcodec/hevcdec.c | 1 + libavcodec/libdav1d.c | 1 + 5 files changed, 11 insertions(+)