From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id A383749B96 for ; Wed, 3 Apr 2024 15:44:42 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9770768D1F0; Wed, 3 Apr 2024 18:43:47 +0300 (EEST) 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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, -- 2.44.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".