From patchwork Tue Apr 9 12:57:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 47982 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9c8d:b0:1a7:a0dc:8de5 with SMTP id mj13csp333892pzb; Tue, 9 Apr 2024 06:01:35 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW07r/vK6trmjH13evloVZ33ESDCt4i5O1m+on0MldU77/SK9hoC3HmJTv1I0z8rabUU8EzQdisTpae2CvWeISqaWyYkTqsGIzjMA== X-Google-Smtp-Source: AGHT+IEBMcmfu9YPtMbD1EO+UEQ/9MM1eHCVQ55Xt2TZYphHwZ+jwOB6wIm36D+xAMlwiD0fzM4t X-Received: by 2002:a50:9313:0:b0:568:abe3:52b2 with SMTP id m19-20020a509313000000b00568abe352b2mr11561673eda.23.1712667695198; Tue, 09 Apr 2024 06:01:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712667695; cv=none; d=google.com; s=arc-20160816; b=TIy4mjw+kHiDvCxucoCFvuqWD3W5X/g8T2ri9WTLFnAUijw+lBX5LL76BjfwiR8zmS nMzuvt9tBAlN5mvhmRWnTa7+qvfmdn0W8MCppBYvZwGO8ipl9syPVvNIjul6JEx98SwN un1qMFi21ZxoutP4jkktL+py/qfAzW2sG98nSMLCegCeJihtoe+sGfLHx3m1WrJ4GBki XCnvpvSCd3E46ASZtm9U9Wvf1x9EpuIpnYXVHFYivIpdv8siWsJGtfKm+bjleTmnN/AW ivmx5gjrsO2hCpIvE8sPD1POcraYatRseGtQsmZfPc0hHhk9svdggmVWPGgHr8Z/5Hlo A36Q== 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=DrekKxU4nhzfxHvMn4NjWy6IxUYpHgvYCiCeyhRN8HA=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=CfTsOvB5GallZ2q591bOQkv+RK6lqXpHNucn1dT3FfIBJU+g6S+SjFkxCD+E9jiviK tBLMjI5uEdP5AxaN/xjw1VCxU3czX/aKUBMNgzS8OyQcrsBUusAnJO1R0WUBrR6Ey4UT Mfa7Ncls82PUskkUYUVondwCz91cerXQswosGinxOGi8Ve4+IezRbmHJV8WI7FILh4PV w4gtMn8fTceWK+Asub9vmz70w92YSbxWXrYvjsoBcviuEcMV1HFyn/kzpq9oJqMIFkcz 45EcZoUGBw7yDgwwPD9I3NFXOPAmREGmz1mLzlBvdAbxSy8uf/YR/jDsW/HVjWAjEvc+ k5Cg==; 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=l0Tm3zG5; 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 18-20020a508752000000b0056e21b42abasi4543272edv.331.2024.04.09.06.01.34; Tue, 09 Apr 2024 06:01:35 -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=l0Tm3zG5; 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 9D3AD68D202; Tue, 9 Apr 2024 15:59:34 +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 5103B68D193 for ; Tue, 9 Apr 2024 15:59:22 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1712667558; bh=D26IeK/FHDP85BTDRl0SAKE6L40z3IIdUnKmSngg+tQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l0Tm3zG5Bz0XVkV8Hs+xQ603ZnDfhV+LP3meQUoZopa1I/TekI3VQTR++O0GauKLl gob+ZDbGnwpxj8G1oazXKG9rtSuZDC54Gan/h74JHVp9IN9Mhorl1vAoq54U5ys+Pg idp2xO06PpbJco96kWonaG66kEMqWcKtUutS9NHU= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 842124344E; Tue, 9 Apr 2024 14:59:18 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Apr 2024 14:57:30 +0200 Message-ID: <20240409125914.61149-11-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240409125914.61149-1-ffmpeg@haasn.xyz> References: <20240409125914.61149-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 10/11] avcodec/libx265: 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: lTRVRoun7qdZ From: Niklas Haas libx265 supports these natively, we just need to attach the generated NALs to the x265picture, as well as setting the appropriate DV profile. --- libavcodec/libx265.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 0645cd20457..c4ceffff5d3 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -36,6 +36,7 @@ #include "libavutil/pixdesc.h" #include "avcodec.h" #include "codec_internal.h" +#include "dovi_rpu.h" #include "encode.h" #include "packet_internal.h" #include "atsc_a53.h" @@ -78,6 +79,8 @@ typedef struct libx265Context { * encounter a frame with ROI side data. */ int roi_warned; + + DOVIContext dovi; } libx265Context; static int is_keyframe(NalUnitType naltype) @@ -143,6 +146,8 @@ static av_cold int libx265_encode_close(AVCodecContext *avctx) if (ctx->encoder) ctx->api->encoder_close(ctx->encoder); + ff_dovi_ctx_unref(&ctx->dovi); + return 0; } @@ -526,6 +531,14 @@ FF_ENABLE_DEPRECATION_WARNINGS } } +#if X265_BUILD >= 167 + ctx->dovi.logctx = avctx; + if ((ret = ff_dovi_configure(&ctx->dovi, avctx)) < 0) + return ret; + ctx->params->dolbyProfile = ctx->dovi.cfg.dv_profile * 10 + + ctx->dovi.cfg.dv_bl_signal_compatibility_id; +#endif + ctx->encoder = ctx->api->encoder_open(ctx->params); if (!ctx->encoder) { av_log(avctx, AV_LOG_ERROR, "Cannot open libx265 encoder.\n"); @@ -629,6 +642,10 @@ static void free_picture(libx265Context *ctx, x265_picture *pic) for (int i = 0; i < sei->numPayloads; i++) av_free(sei->payloads[i].payload); +#if X265_BUILD >= 167 + av_free(pic->rpu.payload); +#endif + if (pic->userData) { int idx = (int)(intptr_t)pic->userData - 1; rd_release(ctx, idx); @@ -660,6 +677,7 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, sei->numPayloads = 0; if (pic) { + AVFrameSideData *sd; ReorderedData *rd; int rd_idx; @@ -760,6 +778,24 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, sei->numPayloads++; } } + +#if X265_BUILD >= 167 + sd = av_frame_get_side_data(pic, AV_FRAME_DATA_DOVI_METADATA); + if (ctx->dovi.cfg.dv_profile && sd) { + const AVDOVIMetadata *metadata = (const AVDOVIMetadata *)sd->data; + ret = ff_dovi_rpu_generate(&ctx->dovi, metadata, &x265pic.rpu.payload, + &x265pic.rpu.payloadSize); + if (ret < 0) { + free_picture(ctx, &x265pic); + return ret; + } + } 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"); + free_picture(ctx, &x265pic); + return AVERROR_INVALIDDATA; + } +#endif } ret = ctx->api->encoder_encode(ctx->encoder, &nal, &nnal, @@ -914,6 +950,10 @@ static const AVOption options[] = { { "udu_sei", "Use user data unregistered SEI if available", OFFSET(udu_sei), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { "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" }, +#endif { NULL } };