From patchwork Tue Mar 19 19:16:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 47228 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:958e:b0:1a3:31a3:7958 with SMTP id iu14csp1880792pzb; Tue, 19 Mar 2024 12:17:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUgm1l5t5rmGzRiB7aAnqdt4KIn1iZSmrT457543OlyThPGDYcDWY/4XZb6pdBMvmvnz1rsv2pW8sS7rVq1Nbca+xbGZBXc3aIiYQ== X-Google-Smtp-Source: AGHT+IGL3DldvranxIM02U8p3uJMsLEskzKYylOheTux+/e37qcLE+M1KSBbj3Cqg5ejb4s/eJ1O X-Received: by 2002:a2e:80c2:0:b0:2d4:76d6:e9ca with SMTP id r2-20020a2e80c2000000b002d476d6e9camr10864796ljg.28.1710875827065; Tue, 19 Mar 2024 12:17:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710875827; cv=none; d=google.com; s=arc-20160816; b=nOaHH7Z3HwYbooVyxw3p//D2iKk1ptYgbjznFBw64u1cH1k5RmUkNJOmvqlfXUMF3f MVgRL5mBChZ9vr4UE3ws/e4/t0vXtW4q2zZv9wHD8DC+bPxEmzezgpMct3r6rXVm2X/7 FYaj+B3dMj/4LmnCXnmhosAW4lHbT2n8G1zKh+U4SCc+KqAUsxFGmGUTyS3rjBpI0BUK YObyJxfQ4RnkNlDb6Xy7kDSHf7HDg+Pln0SV1ziyZz378uCVx2SW2qpHn5L0XUJy7pBt 7oLO+sARrLe3v9pQgjlReilgXXyRbTAvhyqrcT8Qe3SVOfgKEs5Bmy3Cm7LCYj+7r4yz q/bA== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=fMt8vc8soBCROrzUEbttHpHscy1zvM3KFXjFvNIpkqk=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=lVw11lolR3oBp+LuER0VKgw7wmfNb9Py0GwGzDXyPsW7A/wAVeq8OVn+puBsGYtYhY 4Oelm1/YPFSAE9mtjYE1ESD147EwljgiGt3vkkcwMhF/Y1wDgHE87QB6gV2MIwcL2/sZ 1vddBl/DumghhjP2ePu2kxq0XtotIudJd+oqE0uLhuHL71aDzCHtGMawmC+vKtlthQsX SUucP0l+PE+3wa8+q+GbcknZygyEt3PJK4E8kSR37QDt3t15Disf24/ddBmF22YXfbY0 fd7LCIY4e4Xq7B0VsQv/1j5roY+rDFWNXqbsPTi9id/+vsj6riINeni5vyLUzeN2CVmE o4AQ==; 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=d+Fxc57q; 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 p7-20020a056402500700b0056739aba263si5725349eda.440.2024.03.19.12.17.06; Tue, 19 Mar 2024 12:17:07 -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=d+Fxc57q; 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 C775968D2E9; Tue, 19 Mar 2024 21:16:55 +0200 (EET) 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 12FDA68D2E9 for ; Tue, 19 Mar 2024 21:16:48 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1710875807; bh=o8sHkckAWoYsTvDu7nJczWp5oVH/hYNUAOvDwpIMDus=; h=From:To:Cc:Subject:Date:From; b=d+Fxc57q39BZSdKOIab+FG9os9HFnfJdzcu1QvXCCOjrxxHzz7D0HFVoim4paA4FY ZdVu1erF6p9QtRrO3Vzb1ENoPPJRjnwJeS+mlHB9SD2Uh+5J4iD2W1XV6s/LyorNGe 4Pdi9ByXSr0Vumo05CPfKOrKjR0sSJWwB5rdsTqY= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 8CD9A40292; Tue, 19 Mar 2024 20:16:47 +0100 (CET) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 Mar 2024 20:16:39 +0100 Message-ID: <20240319191642.95217-1-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] fftools/ffmpeg_enc: strip DOVI config record for AV1 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: 6QdIp4NLhimc From: Niklas Haas AV1 streams don't use configuration records, so delete them when encoding to AV1. Ideally this would be, as the comment suggests, handled at the frame-level (and stripped by the av1 encoder), but given the status quo of copying the packet-level data here directly, we should definitely make an effort to strip it. --- fftools/ffmpeg_enc.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index c9a12af1393..0c21acfafc6 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -354,17 +354,20 @@ int enc_open(void *opaque, const AVFrame *frame) */ if (ist) { for (int i = 0; i < ist->st->codecpar->nb_coded_side_data; i++) { - AVPacketSideData *sd_src = &ist->st->codecpar->coded_side_data[i]; - if (sd_src->type != AV_PKT_DATA_CPB_PROPERTIES) { - AVPacketSideData *sd_dst = av_packet_side_data_new(&ost->par_in->coded_side_data, - &ost->par_in->nb_coded_side_data, - sd_src->type, sd_src->size, 0); - if (!sd_dst) - return AVERROR(ENOMEM); - memcpy(sd_dst->data, sd_src->data, sd_src->size); - if (ist->autorotate && sd_src->type == AV_PKT_DATA_DISPLAYMATRIX) - av_display_rotation_set((int32_t *)sd_dst->data, 0); - } + AVPacketSideData *sd_src, *sd_dst; + sd_src = &ist->st->codecpar->coded_side_data[i]; + if (sd_src->type == AV_PKT_DATA_CPB_PROPERTIES) + continue; + if (sd_src->type == AV_PKT_DATA_DOVI_CONF && enc->id == AV_CODEC_ID_AV1) + continue; /* AV1 doesn't use DOVI configuration records */ + sd_dst = av_packet_side_data_new(&ost->par_in->coded_side_data, + &ost->par_in->nb_coded_side_data, + sd_src->type, sd_src->size, 0); + if (!sd_dst) + return AVERROR(ENOMEM); + memcpy(sd_dst->data, sd_src->data, sd_src->size); + if (ist->autorotate && sd_src->type == AV_PKT_DATA_DISPLAYMATRIX) + av_display_rotation_set((int32_t *)sd_dst->data, 0); } } From patchwork Tue Mar 19 19:16:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 47227 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:958e:b0:1a3:31a3:7958 with SMTP id iu14csp1880713pzb; Tue, 19 Mar 2024 12:16:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXDBwwDjcvsr9Wcm/VOPzStF3D9wt5rb1jb8eoGsOcKqqG51l0WTTEPDBfmmXhgZaSiyLCnEjQBleRmjsXE8ADLfZeTlXmzSv03BQ== X-Google-Smtp-Source: AGHT+IG+v4qsWIYOhjM2qvOf4Rtkt2Z5ogzuYTuBPw9YGoXfQOW0N0UspMR1dHgdxba3Nituk1qR X-Received: by 2002:a17:907:7284:b0:a46:9e7d:a3e4 with SMTP id dt4-20020a170907728400b00a469e7da3e4mr8404456ejc.46.1710875818161; Tue, 19 Mar 2024 12:16:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710875818; cv=none; d=google.com; s=arc-20160816; b=tegNVpGqq/dCyh1HaA5C1cTU5oDkq049ot4BCFyGSv8NIYW4JTjwrKNd5dnjulPLfS WWs10thKuMaAkygxuDvfZwteLIGmscB4XqDTMhBn8MPITasmnQdGMfyOQNUf98b+RoVA +CUSwYHVr7W4+xIeRMqFleTxS51StDfkETz/L/EWgiT9pzYudo8i8K7FzgRyEF3jiZig 73d1r0g7YNtrZDpzCnlmp+/rONQLR6ZHWjyIO2iYpa6a30fPWCeqpXh85pCVdiU+CAlH AuTBzTZoO+0WMEMKn+znlRLZOaxfDnXBADIfLqlq8i/jccB5F0IisrVqbiit3NGrtquX lIHQ== 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=UHCq0qpWRhYjM+/g8CjmbiLM2nnYnw/aI7NfUduSQ2A=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=B/5eu7FqKSOqKyXHTPxecDLQLD3L/bUUj3i9KHhhD1rQbB0OhQ+r/uQLOts6mPzCeI yQhQ7Rc4/75I+Ywbi4CL3GV2EFm1TLgODpwJQxhZas5IUzaLJBMOW55eLDPVpeq5sVF9 cVpr04oI2BU4cO8HwD0iDkvUkyIfQaHuJXJKj0dE+7fVJRlpVtz4RqI/h7jt7ax3AErj 9cCguWpPcuWZgUXM6yuAVrbU8MaVr6l1JzBu9633zM9KDohPtU3sWk8AS1c7+at+zvz1 suLEceidANR3PbJAZ71SQGJt63z3RN9NwIUpJuEVJ9K6p344AEXEPpJlYBaqdtPNAE9P 0CqQ==; 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=poWq0uyO; 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 y10-20020a170906470a00b00a46a4a61562si3511075ejq.668.2024.03.19.12.16.57; Tue, 19 Mar 2024 12:16:58 -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=poWq0uyO; 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 C113B68D41F; Tue, 19 Mar 2024 21:16:54 +0200 (EET) 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 1331B68D316 for ; Tue, 19 Mar 2024 21:16:48 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1710875807; bh=BVUH1HVJ4JhNMtV5zkpWJx6wcHOdsomuQw88W0mbZ8A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=poWq0uyO4XtZcAaBW++qrr1Pyls56bL5M+ioNeac5cIGluiSzptjk/60vSkB5PF8V shMEVuEXUHcfbpW/Tlx/sVAVCTTm8tVDkb0GZYQFlqeZ/6n9hCucXaxzSCC0YzKxQa f5lxdVpZ2+an1/X0/Wb0XGF4Ri4gnoNrR7fvQPzU= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id C0C284033C; Tue, 19 Mar 2024 20:16:47 +0100 (CET) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 Mar 2024 20:16:40 +0100 Message-ID: <20240319191642.95217-2-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240319191642.95217-1-ffmpeg@haasn.xyz> References: <20240319191642.95217-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/dovi_rpu: implement T.35 payload synthesis 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: 11SKFv6efUCM From: Niklas Haas This function converts from DOVI_RPU_BUFFER (raw RPU NAL) to the more standardized T.35 syntax introduced with Dolby Vision Profile 10. --- libavcodec/Makefile | 2 +- libavcodec/dovi_rpu.c | 91 +++++++++++++++++++++++++++++++++++++++++++ libavcodec/dovi_rpu.h | 10 +++++ 3 files changed, 102 insertions(+), 1 deletion(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 708434ac76c..0de2fc085ef 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -85,7 +85,7 @@ OBJS-$(CONFIG_CBS_MPEG2) += cbs_mpeg2.o OBJS-$(CONFIG_CBS_VP8) += cbs_vp8.o vp8data.o OBJS-$(CONFIG_CBS_VP9) += cbs_vp9.o OBJS-$(CONFIG_DEFLATE_WRAPPER) += zlib_wrapper.o -OBJS-$(CONFIG_DOVI_RPU) += dovi_rpu.o +OBJS-$(CONFIG_DOVI_RPU) += dovi_rpu.o h2645_parse.o OBJS-$(CONFIG_ERROR_RESILIENCE) += error_resilience.o OBJS-$(CONFIG_EVCPARSE) += evc_parse.o evc_ps.o OBJS-$(CONFIG_EXIF) += exif.o tiff_common.o diff --git a/libavcodec/dovi_rpu.c b/libavcodec/dovi_rpu.c index 529062be30a..28b414a81e0 100644 --- a/libavcodec/dovi_rpu.c +++ b/libavcodec/dovi_rpu.c @@ -23,9 +23,13 @@ #include "libavutil/buffer.h" +#include "avcodec.h" #include "dovi_rpu.h" #include "golomb.h" #include "get_bits.h" +#include "h2645_parse.h" +#include "itut35.h" +#include "put_bits.h" #include "refstruct.h" enum { @@ -478,3 +482,90 @@ fail: ff_dovi_ctx_unref(s); /* don't leak potentially invalid state */ return AVERROR(EINVAL); } + +int ff_dovi_rpu_to_t35(void *logctx, const uint8_t *raw_rpu, int raw_rpu_size, + AVBufferRef **out_t35) +{ + PutBitContext *pb = &(PutBitContext){0}; + H2645RBSP rbsp = {0}; + H2645NAL nal = {0}; + AVBufferRef *t35 = NULL; + int ret = AVERROR_INVALIDDATA; + const uint8_t *rpu; + int rpu_size, pad; + + av_fast_padded_malloc(&rbsp.rbsp_buffer, &rbsp.rbsp_buffer_alloc_size, + raw_rpu_size); + if (!rbsp.rbsp_buffer) + return AVERROR(ENOMEM); + + ret = ff_h2645_extract_rbsp(raw_rpu, raw_rpu_size, &rbsp, &nal, 1); + if (ret < 0) + goto error; + + rpu = rbsp.rbsp_buffer; + rpu_size = rbsp.rbsp_buffer_size; + if (rpu_size < 2 || rpu_size > 512) { + av_log(logctx, AV_LOG_ERROR, "Invalid DOVI RPU size: %d\n", rpu_size); + goto error; + } + + /* Skip NAL prefix */ + if (rpu[0] != 25) { + av_log(logctx, AV_LOG_ERROR, "Invalid NAL prefix: %d\n", rpu[0]); + goto error; + } + rpu++; + rpu_size--; + + /* Skip trailing NUL bytes */ + while (rpu_size && rpu[rpu_size - 1] == 0) + rpu_size--; + + /* Validate trailing byte is the expected 0x80 */ + if (!rpu_size || rpu[rpu_size - 1] != 0x80) { + av_log(logctx, AV_LOG_ERROR, "Missing RPU RBSP terminator, " + "possibly truncated?\n"); + goto error; + } + + /* Fixed T.35+EMDF header is 11 bytes, EMDF payload size is up to 3 bytes, + * and trailing footer is up to 4 bytes */ + t35 = av_buffer_alloc(rpu_size + 18); + if (!t35) { + ret = AVERROR(ENOMEM); + goto error; + } + + init_put_bits(pb, t35->data, t35->size); + put_bits(pb, 8, ITU_T_T35_COUNTRY_CODE_US); + put_bits(pb, 16, ITU_T_T35_PROVIDER_CODE_DOLBY); + put_bits32(pb, 0x800); /* provider_oriented_code */ + put_bits(pb, 27, 0x01be6841u); /* EMDF header, see above */ + if (rpu_size > 0xFF) { + av_assert2(rpu_size <= 0x10000); + put_bits(pb, 8, (rpu_size >> 8) - 1); + put_bits(pb, 1, 1); /* read_more */ + put_bits(pb, 8, rpu_size & 0xFF); + put_bits(pb, 1, 0); + } else { + put_bits(pb, 8, rpu_size); + put_bits(pb, 1, 0); + } + ff_copy_bits(pb, rpu, rpu_size * 8); /* rpu rbsp payload */ + put_bits(pb, 17, 0x400); /* emdf payload id + emdf_protection */ + + pad = pb->bit_left & 7; + put_bits(pb, pad, (1 << pad) - 1); /* pad to next byte with 1 bits */ + t35->size -= put_bytes_left(pb, 0); /* trim unused space */ + flush_put_bits(pb); + + *out_t35 = t35; + ret = 0; + +error: + av_freep(&rbsp.rbsp_buffer); + if (ret) + av_buffer_unref(&t35); + return ret; +} diff --git a/libavcodec/dovi_rpu.h b/libavcodec/dovi_rpu.h index 51c5fdbb879..0e75689b136 100644 --- a/libavcodec/dovi_rpu.h +++ b/libavcodec/dovi_rpu.h @@ -84,4 +84,14 @@ int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size); */ int ff_dovi_attach_side_data(DOVIContext *s, AVFrame *frame); +/** + * Generate a T.35 payload (including country and provider code) from a given + * AV_FRAME_DATA_DOVI_RPU_BUFFER, and set *out_t35 to a new reference on + * success. + * + * Returns 0 or a negative error code. + */ +int ff_dovi_rpu_to_t35(void *logctx, const uint8_t *raw_rpu, int raw_rpu_size, + AVBufferRef **out_t35); + #endif /* AVCODEC_DOVI_RPU_H */ From patchwork Tue Mar 19 19:16:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 47229 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:958e:b0:1a3:31a3:7958 with SMTP id iu14csp1880850pzb; Tue, 19 Mar 2024 12:17:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWEXKk+1l90TymtWsnwhxv1hk6BQywf440g3k6VOq/bIB4Jknvz2HW+ZoqENB3+dKDCQ0Q7TTvVpj9bMv7SECq+GA+QFQ7r8CwUPw== X-Google-Smtp-Source: AGHT+IFCLZt9NwxaPoX+DwMGMj/fmwSfQbGd+LYkVfbyLacHiQNTSTVIrehNgil231iICRQlrw8f X-Received: by 2002:a17:906:360a:b0:a46:6046:5d56 with SMTP id q10-20020a170906360a00b00a4660465d56mr2256491ejb.4.1710875835624; Tue, 19 Mar 2024 12:17:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710875835; cv=none; d=google.com; s=arc-20160816; b=AM9KggRlPXsaLNVvxzb90SfBCbxTT6en+YrcatX3jGMjlpIN1+FbwgSY1Fa2/8B6cW h6LlRncJ+UiJ62DSwIpSB7imh4sEQCv2HwPhPoR5MriRGR9AH4NkspkaZ1vANSAP98vn Ofhbr6GuJ7soTtX14Cq4HzQEEJfovzh6kZiQnDrfo8b4XJm9oO1EGmpUj4vPUTuzC/A+ 4W0w6d/JdMa51Qh0VeawdgOSje1v1M2KwtX4eJJjAyJ1KuFoTt0mQ3SHIpb00RElLzL4 YvUnghcTsw8t68pmakjIqD+AUG1FybbBV8WmBXWICW8W4e/Xrb5ktkJuRB/6878gdh9B ns0A== 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=/BylUKJdPj3iEBjxuK1qhOoLxnYZJLbCebwjK1Frr5A=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=M3JQou8Kljc1jG7al8HLE3U1Jp7DrD/RLaTpqgSQ6xiUUz0Mt0XojVfimtAWG72DNY MVwplB2nphhR8DZ3Bwib9PMzhqnFpl9oT3dcqyjDD0Fx1hdYyhjJCgZOjeZ4UtbNrSOP S17HYBH5TtRyp+Z7wtq8C7T1ArWRRyqCmVf4DutIBo/Hqc4w8wHcTiU8jxuwGKid8TKK apRlnlnwjH4sTgCFSdQUiwRjI7JrgH0TOpLtvF0iQLxvOhHLrEkZ/8fjLv7d+jCDHy5k ezxYK5B46D/nXdA1RB+1v5OvRcnBQjkiLcfMBkoBF06pJh0cMJtRVahOgStQQDV8CEXA Ah6A==; 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=K+oxVtth; 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 bw9-20020a170906c1c900b00a44a9139b09si5740125ejb.299.2024.03.19.12.17.14; Tue, 19 Mar 2024 12:17:15 -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=K+oxVtth; 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 BB58468D42C; Tue, 19 Mar 2024 21:16:56 +0200 (EET) 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 3887868D367 for ; Tue, 19 Mar 2024 21:16:48 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1710875808; bh=8CEBlMPMBZmHgbk0KURfEVwVLCpltFfMmIUSbnEiVM8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K+oxVtthk6gFdHTUFFRer23gVPDXbyt0W9F+zLy0733J6WatIFBxcNT7gNzBAwgVr PFT7CGT7EUSUTnXGH/dWqIu76XL+qq21M2Gs+M+76ECxPOkKATuJlZvUEikS2lMaYN G08MM184eZ6o8ZwN3c5R1Oz+QozzdO58YmaHnkMQ= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 086C1408E3; Tue, 19 Mar 2024 20:16:48 +0100 (CET) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 Mar 2024 20:16:41 +0100 Message-ID: <20240319191642.95217-3-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240319191642.95217-1-ffmpeg@haasn.xyz> References: <20240319191642.95217-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/libaomenc: encode dovi RPUs as T.35 metadata 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: QsxnK9Y8Mx+8 From: Niklas Haas Using the new conversion function implemented in the previous commit. --- libavcodec/libaomenc.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 8c1f84cc9fb..2c8fe524fa7 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -42,6 +42,7 @@ #include "avcodec.h" #include "bsf.h" #include "codec_internal.h" +#include "dovi_rpu.h" #include "encode.h" #include "internal.h" #include "libaom.h" @@ -1283,6 +1284,7 @@ static int aom_encode(AVCodecContext *avctx, AVPacket *pkt, aom_enc_frame_flags_t flags = 0; if (frame) { + AVFrameSideData *sd; rawimg = &ctx->rawimg; rawimg->planes[AOM_PLANE_Y] = frame->data[0]; rawimg->planes[AOM_PLANE_U] = frame->data[1]; @@ -1318,6 +1320,17 @@ FF_ENABLE_DEPRECATION_WARNINGS break; } + if ((sd = av_frame_get_side_data(frame, AV_FRAME_DATA_DOVI_RPU_BUFFER))) { + AVBufferRef *t35; + if ((res = ff_dovi_rpu_to_t35(avctx, sd->data, sd->size, &t35)) < 0) + return res; + res = aom_img_add_metadata(rawimg, OBU_METADATA_TYPE_ITUT_T35, + t35->data, t35->size, AOM_MIF_ANY_FRAME); + av_buffer_unref(&t35); + if (res != AOM_CODEC_OK) + return AVERROR(ENOMEM); + } + if (frame->pict_type == AV_PICTURE_TYPE_I) flags |= AOM_EFLAG_FORCE_KF; } From patchwork Tue Mar 19 19:16:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 47230 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:958e:b0:1a3:31a3:7958 with SMTP id iu14csp1880932pzb; Tue, 19 Mar 2024 12:17:25 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWFjJ8x4vJhjpIMVx0gi7qThrPAHKVDSxHh11IYxc0BQQ8IGNlcuC+65U/ppGFnob+XIj4O1wV9Io7dAncvu8k2czPrW2jlYnAcOw== X-Google-Smtp-Source: AGHT+IGSFdBKQ2qrKsrrTouZQkzanClhIruGYHOO15Ik6D+se+tgYPECTHdOhc4Ev2fkz/zZaup0 X-Received: by 2002:a17:906:c0d1:b0:a43:b50d:1074 with SMTP id bn17-20020a170906c0d100b00a43b50d1074mr10143254ejb.23.1710875845453; Tue, 19 Mar 2024 12:17:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710875845; cv=none; d=google.com; s=arc-20160816; b=VYGSji1vsyRB/9s4ag+ktEt2FI2t/xkDMYxuD1dCq24uHLNCxMOhaw7l94AIl2FJSc 0Bf+sjV8jwm1YQpOAZ/HlmW1P+DSJ3Ap532zcTbPp1Z3nxyHVhSntQArW2KMUtrMXts+ Hw7bTlceZtpEsUc+3I7keNblUMmWXsh+N4LVXhUM7qDGe+Xxn9tx9YG1CjwiR71qWIjJ v5YCDjuulSJBgVoRMXnTKqgdT+Qi5G/Iyq+W8OuMRv4w9K+qZRDqcALJkcqXaGPRkV1W TX95EW22bS8PMbL2jQiienY5b7hacCD6UZj8oIRA3zcbxUadLOGOP5DrIan+Lri7WP79 2/yg== 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=oxDgOndMLTVy7fVQqCscb1m0Xsg53EpOpkJm/hiZtuw=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=s43rdBhO68nF7VvS96FalTQ3XCC2uPi5xun06LTA82HsaREICi3ltzR0Zhc9dkKSQH 7TFf20r4VqMxeJxQuWSFWtYVicYqT3/njeepg92YXwZSEpVgBERn+bOpwLeqAoERCgix bG6kqtfze6aevyBiFJT9zXIG0zlOE7eTY9P9gbMIJPYrtNgBHitIwBd9YN4rcR016SyR hjUCQ60HWqn2d8ot0TBXryF3fzp2fA3N1oj6nRqX3AiHqiUc0IQsCQKzGj+xIYy+Ae0O /8JpSLBnxIPYHUnt8JSKF+mVfAYAWHFIU6ie9fncZ4OGNxzbUVQ0oqWPi51LjP4ROi8a Xp1w==; 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=YPJioO5o; 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 v16-20020a170906489000b00a46b0b54ab7si3007881ejq.617.2024.03.19.12.17.23; Tue, 19 Mar 2024 12:17:25 -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=YPJioO5o; 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 BAEA168D316; Tue, 19 Mar 2024 21:16:57 +0200 (EET) 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 6AD6D68D2E9 for ; Tue, 19 Mar 2024 21:16:48 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1710875808; bh=eVGnSdhu9/rBV00q4o4i75HFO+5yqgyrEBZW2BJANNc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YPJioO5orZ21RGY9Z9C2lOuuoW03EkPAfU+NSCENnbPkWE5D/DBfICKO5/gO+9cxe kJL6Ct/RFVgNoVP+Uz7a47MNr7gFAc5cv1SLEk09xYmEsa8YBBHMlFYFhT+NbDn0r4 ugFfV363ahpnurkDlST/egaYBnRZq288lE5iZZPg= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 4025240B76; Tue, 19 Mar 2024 20:16:48 +0100 (CET) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 Mar 2024 20:16:42 +0100 Message-ID: <20240319191642.95217-4-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240319191642.95217-1-ffmpeg@haasn.xyz> References: <20240319191642.95217-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/libx265: encode dovi RPUs 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: kZ+T5PWU7Wfb From: Niklas Haas libx265 supports these natively, we just need to forward them to the x265picture. --- libavcodec/libx265.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 92183b9ca26..92b25844ef6 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -560,6 +560,7 @@ static av_cold int libx265_encode_set_roi(libx265Context *ctx, const AVFrame *fr static void free_picture(libx265Context *ctx, x265_picture *pic) { x265_sei *sei = &pic->userSEI; + av_free(pic->rpu.payload); for (int i = 0; i < sei->numPayloads; i++) av_free(sei->payloads[i].payload); @@ -594,6 +595,7 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, sei->numPayloads = 0; if (pic) { + AVFrameSideData *sd; ReorderedData *rd; int rd_idx; @@ -694,6 +696,15 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, sei->numPayloads++; } } + + if ((sd = av_frame_get_side_data(pic, AV_FRAME_DATA_DOVI_RPU_BUFFER))) { + x265pic.rpu.payload = av_memdup(sd->data, sd->size); + if (!x265pic.rpu.payload) { + free_picture(ctx, &x265pic); + return AVERROR(ENOMEM); + } + x265pic.rpu.payloadSize = sd->size; + } } ret = ctx->api->encoder_encode(ctx->encoder, &nal, &nnal,