From patchwork Fri Apr 12 11:35:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 48020 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:670b:b0:1a9:af23:56c1 with SMTP id wh11csp202877pzb; Fri, 12 Apr 2024 04:37:20 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVCx5EmyYk43YjkCGeUY7n00wtjld9lTnzG0bJ8Kh5fsya9GH192uPl4XLuhAuHUuavRTR4AIFTt/TOmJasvmhbD3QKB74lCpduyQ== X-Google-Smtp-Source: AGHT+IHn1QULgS9Oj0V4SPyWVKqSww/8iRIUGXDaexFVPWKxMGVZ1MVeqL9zwJZoMFnZr1VCBh/g X-Received: by 2002:a17:906:1c99:b0:a52:2c4f:7957 with SMTP id g25-20020a1709061c9900b00a522c4f7957mr1902334ejh.66.1712921839830; Fri, 12 Apr 2024 04:37:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712921839; cv=none; d=google.com; s=arc-20160816; b=GQC0aDrfyvVeqVZ6EsJIe+LAaJr6BEuu1+LB78QJbcUqigWqYbmrfWAqv7UqqyfGPe 9HwXVKaeIPVDkNmlnAn0lm/ZVVAbr2+YHBOrpyQj+dRD/02d9BSgVBRgLV7WojvuPoLn +1rGocdkkrDSkx6gXcbp96Ph23PHmUs6c+NqoA171xQD+By7CcVcsy7P86y/KSe5uFFr YuODDkIa8g3hzt/mbO6Oou/uOHiej4Zr7L+EY7NrDISu1QWbGbu9WmBf/tNW/qZqaOX7 b0RCe9+u2T4qbvj22fnf4Huu/v7n3GcSyv9zNwmjzFMXABdZrduN4YsCdRlO52sDY+yY 5jOA== 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=0A/HZQMJDSAAHACeypQ2oFnG5Wts+3O5dMRG6EAybQU=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=Z5VumTH5RJLSqIFlw+d0YSw6YhNp6uQYdQG2aIx6oBTygpGA0SJFSdz03O9z9G1Stx 8d3XQDspD2tU7ivyKX3em3OzUUe+ohnkNvb4gbkOjZ+w0fi4bKk2ZSjiM6z6Q2D8AORV IjWhQsg1MR4RkedFFpkj2Tj6eTe6KNIPh7CiicT6J2loCR72n4B1Uu023f0EkKV20OAX 3OSB68XxWrMa/HmHyBh+7lfb/i2fvm99pL8ONYFfY5bHdxa/R83+7OFWQtI4n4FVa/4w eotC6rSst79YGWYIcQrMpDgNWs2eFSE6NY0R9JFuNBYPDuO9Ciq3vek3oszUyqWRXHSX UU4Q==; 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=i4uHXC+b; 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 gf1-20020a170906e20100b00a43db2d8b90si1655331ejb.325.2024.04.12.04.37.19; Fri, 12 Apr 2024 04:37:19 -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=i4uHXC+b; 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 402D668D229; Fri, 12 Apr 2024 14:36:35 +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 E58E368D229 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=w3pv8gWU6av4+5l8YNlchcuNsRw7IJ+K+h87z2ojNHQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i4uHXC+bnefgUpPVulcx/SEnPqXY6q68c89kJWpVnz8tsEl4K+aEF9qzYaX++4b3C j5pNsjstAvZyfq192L9HkwuJ36zdIGpyjSnLjhMHePZbxTiXJ/YvjeKf2aBS4CWfnB qM71HRLLw0oqcV/3k5ulNMdJZf546JP5dsZSfm30= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 9108743756; Fri, 12 Apr 2024 13:36:25 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 Apr 2024 13:35:26 +0200 Message-ID: <20240412113620.84013-13-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 12/13] 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: 73VmBgvkb4AN 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. --- configure | 2 +- libavcodec/libx265.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/configure b/configure index bf63c831af..cce37bb32e 100755 --- a/configure +++ b/configure @@ -3553,7 +3553,7 @@ libx264_encoder_select="atsc_a53 golomb" libx264rgb_encoder_deps="libx264" libx264rgb_encoder_select="libx264_encoder" libx265_encoder_deps="libx265" -libx265_encoder_select="atsc_a53" +libx265_encoder_select="atsc_a53 dovi_rpueenc" libxavs_encoder_deps="libxavs" libxavs2_encoder_deps="libxavs2" libxevd_decoder_deps="libxevd" diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 0645cd2045..c4ceffff5d 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 } };