From patchwork Fri Apr 12 11:35:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 48022 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:670b:b0:1a9:af23:56c1 with SMTP id wh11csp202993pzb; Fri, 12 Apr 2024 04:37:37 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXZcEyebx10yYs+7Qkyl3ullOI47wOU1NCrRvkhv2kw92yvsWEP/Tw+TfSe296JWlbN5zW3+1MmAqhpf2pqFJTNSDnCewqzH+gSYw== X-Google-Smtp-Source: AGHT+IFjCkrkkNSZSkIekgno7vKBT8pN6TouSjct4G7PDZILKSkNTE76i1F8Sk00ax7PLPLgWBlX X-Received: by 2002:a17:907:38e:b0:a51:c975:f02a with SMTP id ss14-20020a170907038e00b00a51c975f02amr1428951ejb.65.1712921856850; Fri, 12 Apr 2024 04:37:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712921856; cv=none; d=google.com; s=arc-20160816; b=jxCqKDn99zLL5mNgv1/JoYyR/0UEFm5vJuuTarsLqydgLBvil36AQ7FjkbGazTU7jx WZsPUg4c6XHfOsG1moamaPgwb2N6TO4hYnHBXXNoqgc0lRsNE+cTl1rY9o8LGX5ngpEB GOS+fOHMH9uTTnDX2VN692FzSjnJNzc48x7/emKqviMk0p5pLF62IPp5Jaf1kWFFgCKI WZfcsr0mWjma7XnyFNNkfW2gnYOdJcTHNM9olkU2pxOC2tPMQsLCU61lIxN4tp3L2kFh g3i5qrnNvSAFF5h+VfW6ITO3RKSLOxEY6PL7ogPXfRZxR7WNt4AMCBzWCfFQInMeIHuP aQ5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=iZmVlDBMDDbBvSX31M4KXprsJqxGU+Lam9Dmo0nDrCA=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=eKqCE1iVyXo2JuU1qF/zFmbicddHIgoo4KYCMN2/c3ifrGzNrUFsiqoipt1vDesYa0 TbMGvpa2vhKYPsqOD0wNOYvcifCLlxCsQ+UK84uVT2CTbnWqa5R8ekZS49qD9VNckskm 9DtY1+62+9ljeRLqQ6eeCSQNmvVYwA0fOc0j1u8fMf+fQaF5ARi1s6Bvu69UK8NHrmdG tcuIc7WdFUEVIK1YXIeIXoX/jfWe9hUWMBITlSFNGLx+rXJA179Nt7BopaXm6SwtJ26a 1AhKd2unIIjWmJ1Sz08bsMvqkBycrTJ+o94Y/uAAn520UtFQKwqWu7CNZEaOGYhfBClG A8BA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b="pz/MXJBf"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f12-20020a170906048c00b00a520ce94de8si1616722eja.1009.2024.04.12.04.37.36; Fri, 12 Apr 2024 04:37:36 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b="pz/MXJBf"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2202868D287; Fri, 12 Apr 2024 14:36:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E629868D234 for ; Fri, 12 Apr 2024 14:36:28 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1712921785; bh=CpL0WlAqi0neNTEj7lJ8GJ9gQSfydRjXBq2vmg6NM60=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pz/MXJBfKJD85LrmeVCsfWLon4HS08n2U/OJdfdUhFyK2brlXR1zbMVHBneUZ4vQt Ws0B3mhdyDS+IvpaY1AAZJQH02jr/BFUM1X47Kmi6Le93c72qPDl6WA2cJrvwLzDH+ Ntbnu8ck0SK6nONEK9sY9SlcaLUUkOsOCqbTsdGI= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id C87AA43961; Fri, 12 Apr 2024 13:36:25 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 Apr 2024 13:35:27 +0200 Message-ID: <20240412113620.84013-14-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240412113620.84013-1-ffmpeg@haasn.xyz> References: <20240412113620.84013-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 13/13] avcodec/libsvtav1: implement dolby vision coding 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: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: nuqeJ0svlWLx From: Niklas Haas --- configure | 1 + libavcodec/libsvtav1.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/configure b/configure index cce37bb32e..6fbd0e44ff 100755 --- a/configure +++ b/configure @@ -3534,6 +3534,7 @@ libspeex_decoder_deps="libspeex" libspeex_encoder_deps="libspeex" libspeex_encoder_select="audio_frame_queue" libsvtav1_encoder_deps="libsvtav1" +libsvtav1_encoder_select="dovi_rpueenc" libtheora_encoder_deps="libtheora" libtwolame_encoder_deps="libtwolame" libuavs3d_decoder_deps="libuavs3d" diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c index 6ff893cf10..9bc165f0cf 100644 --- a/libavcodec/libsvtav1.c +++ b/libavcodec/libsvtav1.c @@ -23,6 +23,7 @@ #include #include #include +#include #include "libavutil/common.h" #include "libavutil/frame.h" @@ -35,6 +36,7 @@ #include "libavutil/avassert.h" #include "codec_internal.h" +#include "dovi_rpu.h" #include "encode.h" #include "packet_internal.h" #include "avcodec.h" @@ -62,6 +64,8 @@ typedef struct SvtContext { EOS_STATUS eos_flag; + DOVIContext dovi; + // User options. AVDictionary *svtav1_opts; int enc_mode; @@ -418,6 +422,7 @@ static int read_in_data(EbSvtAv1EncConfiguration *param, const AVFrame *frame, in_data->cr_stride = AV_CEIL_RSHIFT(frame->linesize[2], bytes_shift); header_ptr->n_filled_len = frame_size; + svt_metadata_array_free(&header_ptr->metadata); return 0; } @@ -451,6 +456,11 @@ static av_cold int eb_enc_init(AVCodecContext *avctx) return svt_print_error(avctx, svt_ret, "Error initializing encoder"); } + svt_enc->dovi.logctx = avctx; + ret = ff_dovi_configure(&svt_enc->dovi, avctx); + if (ret < 0) + return ret; + if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) { EbBufferHeaderType *headerPtr = NULL; @@ -486,6 +496,7 @@ static int eb_send_frame(AVCodecContext *avctx, const AVFrame *frame) { SvtContext *svt_enc = avctx->priv_data; EbBufferHeaderType *headerPtr = svt_enc->in_buf; + AVFrameSideData *sd; EbErrorType svt_ret; int ret; @@ -525,6 +536,24 @@ static int eb_send_frame(AVCodecContext *avctx, const AVFrame *frame) if (avctx->gop_size == 1) headerPtr->pic_type = EB_AV1_KEY_PICTURE; + sd = av_frame_get_side_data(frame, AV_FRAME_DATA_DOVI_METADATA); + if (svt_enc->dovi.cfg.dv_profile && sd) { + const AVDOVIMetadata *metadata = (const AVDOVIMetadata *)sd->data; + uint8_t *t35; + int size; + if ((ret = ff_dovi_rpu_generate(&svt_enc->dovi, metadata, &t35, &size)) < 0) + return ret; + ret = svt_add_metadata(headerPtr, EB_AV1_METADATA_TYPE_ITUT_T35, t35, size); + av_free(t35); + if (ret < 0) + return AVERROR(ENOMEM); + } else if (svt_enc->dovi.cfg.dv_profile) { + av_log(avctx, AV_LOG_ERROR, "Dolby Vision enabled, but received frame " + "without AV_FRAME_DATA_DOVI_METADATA\n"); + return AVERROR_INVALIDDATA; + } + + svt_ret = svt_av1_enc_send_picture(svt_enc->svt_handle, headerPtr); if (svt_ret != EB_ErrorNone) return svt_print_error(avctx, svt_ret, "Error sending a frame to encoder"); @@ -649,11 +678,13 @@ static av_cold int eb_enc_close(AVCodecContext *avctx) } if (svt_enc->in_buf) { av_free(svt_enc->in_buf->p_buffer); + svt_metadata_array_free(&svt_enc->in_buf->metadata); av_freep(&svt_enc->in_buf); } av_buffer_pool_uninit(&svt_enc->pool); av_frame_free(&svt_enc->frame); + ff_dovi_ctx_unref(&svt_enc->dovi); return 0; } @@ -700,6 +731,9 @@ 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" }, + {NULL}, };