From patchwork Wed Apr 3 15:43:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 47759 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp485544pzb; Wed, 3 Apr 2024 08:44:45 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUVFgs2GRQ7aB//inHdUulER4dD2MGi89u6BqQCshq9p/8lVQuHHpVOjmRu7lyeh9jkg+BG1AuUR9CZbzo6nXUHJMA0jlYAL0ad+A== X-Google-Smtp-Source: AGHT+IEPjuGTb54dAW9MAlFW3RZdy2tqnu4yJ4hvMVB1Wx9CbCW2kHT8Qsk+EFC4Ve6QH8/8ed7T X-Received: by 2002:a17:906:830d:b0:a51:585b:7996 with SMTP id j13-20020a170906830d00b00a51585b7996mr867847ejx.2.1712159085014; Wed, 03 Apr 2024 08:44:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712159085; cv=none; d=google.com; s=arc-20160816; b=ONMfWpjBCLet6Xiz2r1T84kisn98Y4X1SfmjnyhpfcS148ABPBjxcWxDuYzIzgtcfJ c0rDAE+2wCUIqQgvcK7k17U4j4A1NxhpvmS7mc1vt46TkyLQCtTjXzRBM1CJdtXpY6AW UiDIFNYZjKt5nXIUEuxVEnvsLm2MXB/NQl6ET0Nhe3+R/+wosPchVR2pKDRJYo1GPoKQ xZrFg/gNE3TQnM/Jxh+jky7kHxuDzkkOJI+sSsv/Ve0uq6tlrG/BoYBP+uQFwk/VX/04 CuBkif/BDzRU5ChUVgbh7lnBUjjXxvLv/qCNZhwXuxs/2gS45ZWkO3Pu7mgAYvqb+tKv KLCg== 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=xLDPFNT13whP/AQHgnI0+9mbP8NtxYZ5vNXFB5jgcZc=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=P48krrQeOBlNrPFhJvj6PoRUZkPk6JgkJp1/q/z8x0lpXWjMBw9I4oOOOAXko+YRF2 Lv3eG0eO9sSFUX+MFF5NKY/WRx3uuvRxgcqDwDSJk67tklvzWari2uYXIBLdRl5SGczw 0vzjtyqinRq0IW88TbtFi6nznGuq6A5Ca073xLe8ZfkeZLN1LSrQMNHvuQCQOzJIgvac 0JqZAIZL5UlY62ZnPXHQHHoZEBKGGQ2kbx+f+0hP4//sgnqMRddqfAuzcKW5w1jyXKab ivFeZ5aL3M32vftMBMVzUCr5KnLErNFzcav3Jwkd9+wpQ4bZUdiVkaynDjSZCNSasGrD 9t1g==; 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=C7LHjBZM; 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 hs14-20020a1709073e8e00b00a4e4e730f4dsi4764311ejc.710.2024.04.03.08.44.44; Wed, 03 Apr 2024 08:44:45 -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=C7LHjBZM; 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 CB5C568D1F2; Wed, 3 Apr 2024 18:43:47 +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 7E3FC68D1C9 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=C8EZIcVgsjSPb5LBbAhDhxww0WaTSSXR/IhDgfgFfog=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C7LHjBZM4uls8K8MPr8Q1rhfSoX1XISSdLnY26Y/mFeoCQGaRKb7eNZkTA6pu1jYU tdvVHRfRMzeYiDyne+Jvx/YmZFFetHypfu2SbTbpDiuoF7Xx7yVPnZUplmO9eqsurp QzAObWGx2W8niePLezEdgIEDm81Ge/MV5JA6d4WY= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id A5B1443756; Wed, 3 Apr 2024 17:43:36 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Apr 2024 17:43:29 +0200 Message-ID: <20240403154330.71585-9-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 09/10] 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: T73QPMkYU06S 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 | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 40ddce60306..b525b4ed59f 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; } @@ -529,6 +534,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"); @@ -632,6 +645,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); @@ -663,6 +680,7 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, sei->numPayloads = 0; if (pic) { + AVFrameSideData *sd; ReorderedData *rd; int rd_idx; @@ -763,6 +781,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,