From: Cosmin Stejerean <cos...@cosmin.at>
not all clients support metadata compression, output when
vdr_dm_metadata_changed fails the DV verifier.
---
libavcodec/dovi_rpu.h | 10 ++++++++++
libavcodec/dovi_rpuenc.c | 8 ++++++--
libavcodec/libaomenc.c | 3 +--
libavcodec/libsvtav1.c | 3 +--
libavcodec/libx265.c | 3 +--
5 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/libavcodec/dovi_rpu.h b/libavcodec/dovi_rpu.h
index 8ce0c88e9d..dee34165c9 100644
--- a/libavcodec/dovi_rpu.h
+++ b/libavcodec/dovi_rpu.h
@@ -28,6 +28,11 @@
#include "libavutil/frame.h"
#include "avcodec.h"
+#define DOVI_ENCODING_OPTS \
+ { "dolbyvision", "Enable Dolby Vision RPU coding", OFFSET(dovi.enable),
AV_OPT_TYPE_BOOL, {.i64 = FF_DOVI_AUTOMATIC }, -1, 1, VE, .unit = "dovi" }, \
+ { "auto", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DOVI_AUTOMATIC}, .flags
= VE, .unit = "dovi" }, \
+ { "dv_enable_compression", "Enable Dolby Vision metadata compression",
OFFSET(dovi.enable_compression), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, VE },
+
#define DOVI_MAX_DM_ID 15
typedef struct DOVIContext {
void *logctx;
@@ -71,6 +76,11 @@ typedef struct DOVIContext {
AVDOVIDmData *ext_blocks;
int num_ext_blocks;
+ /**
+ * Enable metadata compression in the output. Currently this is
experimental.
+ */
+ int enable_compression;
+
/**
* Private fields internal to dovi_rpu.c
*/
diff --git a/libavcodec/dovi_rpuenc.c b/libavcodec/dovi_rpuenc.c
index 3c3e0f84c0..26ed25733a 100644
--- a/libavcodec/dovi_rpuenc.c
+++ b/libavcodec/dovi_rpuenc.c
@@ -512,8 +512,12 @@ int ff_dovi_rpu_generate(DOVIContext *s, const
AVDOVIMetadata *metadata,
}
}
- vdr_dm_metadata_changed = !s->color || memcmp(s->color, color,
sizeof(*color));
- use_prev_vdr_rpu = !memcmp(&s->vdr[vdr_rpu_id]->mapping, mapping,
sizeof(*mapping));
+ // the output when vdr_dm_metadata_changed is 0 fails the DV verifier
+ // force it to 1 until we can get some samples or documentation on correct
syntax
+ vdr_dm_metadata_changed = 1; // !s->color || memcmp(s->color, color,
sizeof(*color));
+
+ // not all clients support metadata compression
+ use_prev_vdr_rpu = s->enable_compression &&
!memcmp(&s->vdr[vdr_rpu_id]->mapping, mapping, sizeof(*mapping));
buffer_size = 12 /* vdr seq info */ + 5 /* CRC32 + terminator */;
buffer_size += num_ext_blocks_v1 * 13;
diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c
index dec74ebecd..3837eaaec2 100644
--- a/libavcodec/libaomenc.c
+++ b/libavcodec/libaomenc.c
@@ -1487,8 +1487,7 @@ static const AVOption options[] = {
{ "ssim", NULL, 0, AV_OPT_TYPE_CONST, {.i64 =
AOM_TUNE_SSIM}, 0, 0, VE, .unit = "tune"},
FF_AV1_PROFILE_OPTS
{ "still-picture", "Encode in single frame mode (typically used for still
AVIF images).", OFFSET(still_picture), AV_OPT_TYPE_BOOL, {.i64 = 0}, -1, 1, VE
},
- { "dolbyvision", "Enable Dolby Vision RPU coding",
OFFSET(dovi.enable), AV_OPT_TYPE_BOOL, {.i64 = FF_DOVI_AUTOMATIC }, -1, 1, VE,
.unit = "dovi" },
- { "auto", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DOVI_AUTOMATIC}, .flags
= VE, .unit = "dovi" },
+ DOVI_ENCODING_OPTS
{ "enable-rect-partitions", "Enable rectangular partitions",
OFFSET(enable_rect_partitions), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE},
{ "enable-1to4-partitions", "Enable 1:4/4:1 partitions",
OFFSET(enable_1to4_partitions), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE},
{ "enable-ab-partitions", "Enable ab shape partitions",
OFFSET(enable_ab_partitions), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE},
diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c
index 2fef8c8971..d747c31824 100644
--- a/libavcodec/libsvtav1.c
+++ b/libavcodec/libsvtav1.c
@@ -731,8 +731,7 @@ static const AVOption options[] = {
AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 63, VE },
{ "svtav1-params", "Set the SVT-AV1 configuration using a :-separated list
of key=value parameters", OFFSET(svtav1_opts), AV_OPT_TYPE_DICT, { 0 }, 0, 0,
VE },
- { "dolbyvision", "Enable Dolby Vision RPU coding", OFFSET(dovi.enable),
AV_OPT_TYPE_BOOL, {.i64 = FF_DOVI_AUTOMATIC }, -1, 1, VE, .unit = "dovi" },
- { "auto", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DOVI_AUTOMATIC}, .flags
= VE, .unit = "dovi" },
+ DOVI_ENCODING_OPTS
{NULL},
};
diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c
index ac1dbc4f97..30a0b3d205 100644
--- a/libavcodec/libx265.c
+++ b/libavcodec/libx265.c
@@ -951,8 +951,7 @@ static const AVOption options[] = {
{ "a53cc", "Use A53 Closed Captions (if available)",
OFFSET(a53_cc), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1,
VE },
{ "x265-params", "set the x265 configuration using a :-separated list of
key=value parameters", OFFSET(x265_opts), AV_OPT_TYPE_DICT, { 0 }, 0, 0, VE },
#if X265_BUILD >= 167
- { "dolbyvision", "Enable Dolby Vision RPU coding", OFFSET(dovi.enable),
AV_OPT_TYPE_BOOL, {.i64 = FF_DOVI_AUTOMATIC }, -1, 1, VE, .unit = "dovi" },
- { "auto", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DOVI_AUTOMATIC}, .flags
= VE, .unit = "dovi" },
+ DOVI_ENCODING_OPTS
#endif
{ NULL }
};
--
2.42.1
_______________________________________________
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".
