From patchwork Wed Apr 3 15:43:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 47760 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp485617pzb; Wed, 3 Apr 2024 08:44:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXp4ANY/5NpoPVbFEYwbjpsqAk5p4Rj27GXiZbDlQDx2lNR1rjEfSO6HwsD3wQGLj1sSRiG+atlZOCdQpj4yXWgreoY38SZg3aX7A== X-Google-Smtp-Source: AGHT+IEJQa6R/2poC2TyqKOAMCq5CjHxW17/8b1rxRnjQ1uGeZVoQ7GugcA1HJ+VOFDc7GuFYJGe X-Received: by 2002:a17:906:f207:b0:a4e:1597:eb39 with SMTP id gt7-20020a170906f20700b00a4e1597eb39mr9448138ejb.74.1712159093233; Wed, 03 Apr 2024 08:44:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712159093; cv=none; d=google.com; s=arc-20160816; b=ItOQ895UNQG0KYd3moZVhGWmx0XFVxwP7li4Bg+FjTShV3t0j146tOu8A0JW1ZR5fo sJHhAmeIGl6GjVMAKvOqJjjh4NIkyYBW54opSCNVvL50ogISQl8VdmjK0aaHxUcOBD8u 1cDFeVshprtjb3XXxtg0Lx3tEFCP9p85c5qB5v/t0u6oA5XmYvveEzkAUISMcEcF29X3 Rdm+Zaa1EJLV+P5Q1i92rw6qWMWMuQDYmGF8PxxLjQ9Z8mM4eMB0JdinWvTe6qxNHMlD 5bN1opLv/YlWPcCi70TtTFN+OKGgeulhorCivYYphlpzqZRv/qjcQEKUAd6ioiFumQLY zDTg== 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=k5B37fw31r7wWnpjIaCWi/+o2T727XXAgAr8TNaP9MI=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=ZbNkpHFhldMVM6YY2Cfv+y8II7WgX47fIwk5O80a95d+NFWZ7E23Se16wCgTFTQaLW ENQMDu51JTmScN/CCS1UoMQmSItn2QMns7ikuif7d6qyse3nuP8AX/1I9I5WkxpDdVUT 4DnupcGaqIxqE3jXEmDXHuzS6fvl/lJy7evwgLQMOgWs2VkUcyKiAl4Nwmg+LNqHLGey yUjyUdjGwzmMY2B1WWTpyN3U5BGW0DYa5UUTJmJ7dVvUq2L+IXpPtC2PMKHj3i2Xi8pW Is5TPiC9VPPbtJMj3lJn+de78N7X4OyICZYVq2d9p+VjZ2SrLQxpmJDQdMjsbkYG70pv E0WA==; 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=kyymERiQ; 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 b16-20020a17090636d000b00a4635b643afsi6647568ejc.985.2024.04.03.08.44.52; Wed, 03 Apr 2024 08:44:53 -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=kyymERiQ; 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 D5AE268D1FB; Wed, 3 Apr 2024 18:43:48 +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 7863E68D1C8 for ; Wed, 3 Apr 2024 18:43:39 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1712159016; bh=lfFyYU4Fc421MxN5VnGFOyRCRKgE3MURMVIa/sC2iqg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kyymERiQbl3uvdyXgXCauNSewvfA9Q+8dJ1Lasuk890kVJZXpp27syhPNsDUKo4Pd y9BX3cxYUCIK/6DO80qR6/oajYPbADe5s3/UCkOkTYHux6tsqOw64DO1EGojh4cRkT nQO+lyLpkYD8TdQpMk14/zK3rjA2T9dHknFV5yrk= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 3C0A14301F; Wed, 3 Apr 2024 17:43:36 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Apr 2024 17:43:28 +0200 Message-ID: <20240403154330.71585-8-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240403154330.71585-1-ffmpeg@haasn.xyz> References: <20240403154330.71585-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/10] 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: FsVRDr2sTL0D From: Niklas Haas --- libavcodec/libaomenc.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index d660afab4ec..6bc46ec6e28 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; @@ -437,6 +439,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; } @@ -1023,6 +1026,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; @@ -1282,6 +1289,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; @@ -1319,6 +1327,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"); + return AVERROR_INVALIDDATA; + } + if (frame->pict_type == AV_PICTURE_TYPE_I) flags |= AOM_EFLAG_FORCE_KF; }