From patchwork Fri Apr 12 11:35:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 48023 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:670b:b0:1a9:af23:56c1 with SMTP id wh11csp203137pzb; Fri, 12 Apr 2024 04:37:54 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWqtaEJSAVM4MPcX28QrhPQ98Ag1WuifLVEjm9HIrDwhexc5EGjXUAm7lnoDe7dXj1aAyqzGFal4XtBbeE6evYUIh0upD7yDY/93w== X-Google-Smtp-Source: AGHT+IFtwrrnXB9j+lANJZeYyJntZJ1oBDZfU9mQVvEc6ZWn3gl1SOqPcel9BAfhX3c51tFGFHP8 X-Received: by 2002:a17:907:97c6:b0:a51:caf7:ccc2 with SMTP id js6-20020a17090797c600b00a51caf7ccc2mr2364409ejc.34.1712921874143; Fri, 12 Apr 2024 04:37:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712921874; cv=none; d=google.com; s=arc-20160816; b=0sqDUlAR2D0X6Byc8NtvZWO3LJkj7pCkWTVprVNzlnCM8vR2RPuvAeVyOUy0N4pjf/ Nf4G64fl8j5sa5vpgrsQBHyQSEbKXMGV7PyVlTc3P1S1fbFHmlLqYKMbsahEHT2D8Rpc 6fyZiti+AvY/VllBBYybMjAqgjx6zM3lSOY0VSCG7zB8RHWf1fbYhrSCDM3sEYjDybCv 4D5LzSxNqV3sYMMRl+8m5pTk+JDAPBwSf+xvx02SN1t0ut0U2KvssMme3eMjErJyJhE7 YmSpah2ZXhaFVmZBcT0taVNoThGjiAZ7+0UougW0L3IJKwKyQz9OQEwg5KVXQKfdDoTg JlJg== 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=hPzj/N26xRxvc23Kjcjc7JwJ/Z+ILZzfGfAiPDGmn+c=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=C/Yk2VrUZyHqZRuSJXXc9Ofq+mJqb+eCxm9cWyORaD+OwhbwCUKR6PNsanYuk3N0KA ikS3fDC5Ffyckz4TSnt1I05JYu/r+Bv2lL3vVguWmzIMJ5Vhg4aqFydmL69+IM6PO0IF S5lrePRNdn9ct7+qUZtr5rJqzRAFfDK5E+ZAFjfEItPbgKEcfDiKKcrtRI9oreQCpvAB 9d2toquHY8hzdi+5a91kHsE3lUISiXSRt0wACIGvQ0YWxYVYnNU4X75Ffh9jXw4xgqJF bhVNkyg+TnzAh4HghOf4ipvT6QH0vRrl8/TKs3R/D7zAE2NtUCntbJpyugOkYz9yAFnI D36g==; 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=WOCJNt8O; 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 he43-20020a1709073dab00b00a52322da81esi656745ejc.13.2024.04.12.04.37.53; Fri, 12 Apr 2024 04:37:54 -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=WOCJNt8O; 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 21C4668D164; Fri, 12 Apr 2024 14:36:39 +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 26C2668D258 for ; Fri, 12 Apr 2024 14:36:29 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1712921785; bh=EBHqSAg/ZkIrux7BWrquvVSxBZLMYoyjgIo5oieD1QU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WOCJNt8OeLYZcDpLsHzKXA+RrqPE8yW401mcMgb6djp5GAWreLZ6kAjWj2MsL3j4/ YuJiv4mrRu6M+EzEF9hcc84jycpGags7Dd+R4grSk8NprJVXYJ6aWfd0nBdAU68TlT aljcVwfOkOP5+266XmelyjRQCWIQQJHjqXJyG+a0= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 5DBC343682; Fri, 12 Apr 2024 13:36:25 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 Apr 2024 13:35:25 +0200 Message-ID: <20240412113620.84013-12-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 11/13] avcodec/libaomenc: 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: cM4n/u717G0N From: Niklas Haas --- configure | 2 +- libavcodec/libaomenc.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/configure b/configure index d25d0f6907..bf63c831af 100755 --- a/configure +++ b/configure @@ -3485,7 +3485,7 @@ prores_videotoolbox_encoder_deps="pthreads" prores_videotoolbox_encoder_select="videotoolbox_encoder" libaom_av1_decoder_deps="libaom" libaom_av1_encoder_deps="libaom" -libaom_av1_encoder_select="extract_extradata_bsf" +libaom_av1_encoder_select="extract_extradata_bsf dovi_rpuenc" libaribb24_decoder_deps="libaribb24" libaribcaption_decoder_deps="libaribcaption" libcelt_decoder_deps="libcelt" diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 4a71bba9c9..b43a902a38 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -43,6 +43,7 @@ #include "avcodec.h" #include "bsf.h" #include "codec_internal.h" +#include "dovi_rpu.h" #include "encode.h" #include "internal.h" #include "libaom.h" @@ -70,6 +71,7 @@ struct FrameListData { typedef struct AOMEncoderContext { AVClass *class; AVBSFContext *bsf; + DOVIContext dovi; struct aom_codec_ctx encoder; struct aom_image rawimg; struct aom_fixed_buf twopass_stats; @@ -421,6 +423,7 @@ static av_cold int aom_free(AVCodecContext *avctx) av_freep(&avctx->stats_out); free_frame_list(ctx->coded_frame_list); av_bsf_free(&ctx->bsf); + ff_dovi_ctx_unref(&ctx->dovi); return 0; } @@ -989,6 +992,10 @@ static av_cold int aom_init(AVCodecContext *avctx, if (!cpb_props) return AVERROR(ENOMEM); + ctx->dovi.logctx = avctx; + if ((res = ff_dovi_configure(&ctx->dovi, avctx)) < 0) + return res; + if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) { const AVBitStreamFilter *filter = av_bsf_get_by_name("extract_extradata"); int ret; @@ -1242,6 +1249,7 @@ static int aom_encode(AVCodecContext *avctx, AVPacket *pkt, unsigned long duration = 0; int res, coded_size; aom_enc_frame_flags_t flags = 0; + AVFrameSideData *sd; if (frame) { rawimg = &ctx->rawimg; @@ -1279,6 +1287,24 @@ FF_ENABLE_DEPRECATION_WARNINGS break; } + sd = av_frame_get_side_data(frame, AV_FRAME_DATA_DOVI_METADATA); + if (ctx->dovi.cfg.dv_profile && sd) { + const AVDOVIMetadata *metadata = (const AVDOVIMetadata *)sd->data; + uint8_t *t35; + int size; + if ((res = ff_dovi_rpu_generate(&ctx->dovi, metadata, &t35, &size)) < 0) + return res; + res = aom_img_add_metadata(rawimg, OBU_METADATA_TYPE_ITUT_T35, + t35, size, AOM_MIF_ANY_FRAME); + av_free(t35); + if (res != AOM_CODEC_OK) + return AVERROR(ENOMEM); + } else if (ctx->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; + } + if (frame->pict_type == AV_PICTURE_TYPE_I) flags |= AOM_EFLAG_FORCE_KF; } @@ -1459,6 +1485,8 @@ 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" }, { "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},