From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id A5C914AEED for ; Thu, 23 May 2024 11:01:27 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8D77368D436; Thu, 23 May 2024 14:01:24 +0300 (EEST) Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7BA4D68D307 for ; Thu, 23 May 2024 14:01:18 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1716462077; bh=C8yqQsPEa6XagITeQsJWU/rlxjgvZ+vwXcSIXRdw2vQ=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=UAEtbYjjXFXIXDvVVKg6+HyJhfOMI9WlqwYsIexkJeegMQ2q2LfyINMZZmPkhU4b2 stIDkB/vQS1BjPV/2/H0uYiW/9Yq7NOnD52xUpOOkLpPP+OO0eiLWVlNqz4qAiQoJz Cm2cArKyXOt3ICXZuE78Q0j4uOkowXgYxNeKnP7I= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id C2DB0417DE; Thu, 23 May 2024 13:01:17 +0200 (CEST) Date: Thu, 23 May 2024 13:01:17 +0200 Message-ID: <20240523130117.GB3903@haasn.xyz> From: Niklas Haas To: Cosmin Stejerean via ffmpeg-devel , "ffmpeg-devel@ffmpeg.org" In-Reply-To: <0101018fa38e031b-b9f59614-db2b-42f8-9d91-7892329ea5fa-000000@us-west-2.amazonses.com> References: <20240523034540.39960-1-cosmin@cosmin.at> <0101018fa38e031b-b9f59614-db2b-42f8-9d91-7892329ea5fa-000000@us-west-2.amazonses.com> MIME-Version: 1.0 Content-Disposition: inline Subject: Re: [FFmpeg-devel] [PATCH v2] avcodec/dovi - disable metadata compression by default X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Cosmin Stejerean Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Thu, 23 May 2024 03:45:44 +0000 Cosmin Stejerean via ffmpeg-devel wrote: > From: Cosmin Stejerean > > 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 }, > + Nit: I would probably parametrize the base struct location (what you hard-coded as `dovi`), just to avoid leaking per-encoder implementation specifics. (Maybe somebody will decide to rename or move this struct down the line) Introducing this macro could probably be a separate commit also. > #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-request@ffmpeg.org with subject "unsubscribe". _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".