From patchwork Mon Jun 24 17:20: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: 50139 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp2155819vqz; Mon, 24 Jun 2024 10:21:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVu2BC1xRcAEF+GF84b/KAl80J/pICiKKV5cBRjPe8TH6VXVe8w3+6AGEUqGomnOQL41W55a3IFrUS/Cqfrc5OwM26TWKY1Jwe20A== X-Google-Smtp-Source: AGHT+IHwLu+dnMJ54pffTSroxogb2VadXvIgNcoYRx93txeYSGmA1hcBd5uJdzTtgla8sceLV60A X-Received: by 2002:a05:6512:688:b0:52c:8837:718a with SMTP id 2adb3069b0e04-52ce185cffdmr3431716e87.43.1719249711061; Mon, 24 Jun 2024 10:21:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719249711; cv=none; d=google.com; s=arc-20160816; b=I4dUhj/3BYHLvjFpjYStPdSw5cKo/kjip9cjO19b4Ci01mdw5b9lj6qgMPb3r1eKPr 7bBNszwcNAjdxKhKrPdQoahqABuWf548lq0nt3WDcWqEPb4vZzL4dB5FHrGanSvs6lSE o4t4uQ/bVVnEP37c1pqxajZ7esppnLAnw7nZ/iuIrFutVNLTLJqr6G7hIguX2IPMDkDc Mps9vRwsrZBff/F0P2C+4hPQCa230TSVQydz5cxdPBPwFnWhYhXcIYq6zKpazWQM+ACw NRp7c6Qu67r/VsMK7KXiBbdWL27HFA+1o1OK5t57TQGFBkr3EY/kq2J2EA38/eYtzEaA Tlsw== 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=PBVOOUBJ9ywx3nn72znPQqMYmnUymyEmn3OjZ8gCSJE=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=bF14b526WjCeYRbyTomUKGR11y1BJ178xy2SNmgpKUuaWdwyHKdBCBVG3pC93m4sbZ adA2OaZmovWXrQ8vQH4a0JsIC9OWtofeR1z8mcAKSmngolhYlcJ439uaTl8ONMFovHVy XzES+enYGATuuP2aP5pBRDxKGsk5KHvXwZxuAVPKcXuDmEIRpAuWpLvV+DviYwcweMnH wa3PHJMvW4ph6t4bGZ2tnI93g3GOHdrk3bhS3gbZFLrKE/2q0L0lvFW2QuMtTW3Papw6 jrLni+sMB5UffKkpfK3MaYLoXQMW7tEGp/D+5p1vKfcV2C2tjCIzWAwNC+4th+OOirwG AXKA==; 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=KWvzN6qo; 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 a640c23a62f3a-a72426cd19dsi223458666b.410.2024.06.24.10.21.50; Mon, 24 Jun 2024 10:21:51 -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=KWvzN6qo; 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 38B1368D631; Mon, 24 Jun 2024 20:21:04 +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 55D0368D5B7 for ; Mon, 24 Jun 2024 20:20:53 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1719249649; bh=YAcnA+oTATFKiTMkOIp9TpyK5UJhfJuwPiPvXYzinQY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KWvzN6qoMDrOGQ9HoU6S3Ob5YcvqTJU6bogyikVkysq0Jl2FqyccpXzDXt8c/AZeT Xd8HWx/2gH9+DNn4X/x3SsBM9oh+RLN1LGctuu17X0cOdfRQW9SZwfl5EZZhFiMJsa rh41wctNaz+DdXov6kmfXDQT8MDH/l57pyq5CDmc= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 0645246DE9; Mon, 24 Jun 2024 19:20:49 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jun 2024 19:20:41 +0200 Message-ID: <20240624172044.101722-6-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240624172044.101722-1-ffmpeg@haasn.xyz> References: <20240624172044.101722-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/9] avcodec/dovi_rpuenc: make encapsulation optional 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: L0bpQ/ZefN5n From: Niklas Haas And move the choice of desired container to `flags`. This is needed to handle differing API requirements (e.g. libx265 requires the NAL RBSP, but CBS BSF requires the unescaped bytes). --- libavcodec/dovi_rpu.h | 16 ++++++++++------ libavcodec/dovi_rpuenc.c | 22 ++++++++++------------ libavcodec/libaomenc.c | 3 ++- libavcodec/libsvtav1.c | 3 ++- libavcodec/libx265.c | 2 +- 5 files changed, 25 insertions(+), 21 deletions(-) diff --git a/libavcodec/dovi_rpu.h b/libavcodec/dovi_rpu.h index 65a4529106..226a769bff 100644 --- a/libavcodec/dovi_rpu.h +++ b/libavcodec/dovi_rpu.h @@ -123,16 +123,20 @@ int ff_dovi_attach_side_data(DOVIContext *s, AVFrame *frame); */ int ff_dovi_configure(DOVIContext *s, AVCodecContext *avctx); +enum { + FF_DOVI_WRAP_NAL = 1 << 0, ///< wrap inside NAL RBSP + FF_DOVI_WRAP_T35 = 1 << 1, ///< wrap inside T.35+EMDF +}; + /** - * Synthesize a Dolby Vision RPU reflecting the current state. Note that this - * assumes all previous calls to `ff_dovi_rpu_generate` have been appropriately - * signalled, i.e. it will not re-send already transmitted redundant data. + * Synthesize a Dolby Vision RPU reflecting the current state. By default, the + * RPU is not encapsulated (see `flags` for more options). Note that this + * assumes all previous calls to `ff_dovi_rpu_generate` have been + * appropriately signalled, i.e. it will not re-send already transmitted + * redundant data. * * Mutates the internal state of DOVIContext to reflect the change. * Returns 0 or a negative error code. - * - * This generates a fully formed RPU ready for inclusion in the bitstream, - * including the EMDF header (profile 10) or NAL encapsulation (otherwise). */ int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata, int flags, uint8_t **out_rpu, int *out_size); diff --git a/libavcodec/dovi_rpuenc.c b/libavcodec/dovi_rpuenc.c index 6bfb39a7ea..41080521e1 100644 --- a/libavcodec/dovi_rpuenc.c +++ b/libavcodec/dovi_rpuenc.c @@ -710,9 +710,7 @@ int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata, flush_put_bits(pb); rpu_size = put_bytes_output(pb); - switch (s->cfg.dv_profile) { - case 10: - /* AV1 uses T.35 OBU with EMDF header */ + if (flags & FF_DOVI_WRAP_T35) { *out_rpu = av_malloc(rpu_size + 15); if (!*out_rpu) return AVERROR(ENOMEM); @@ -739,10 +737,8 @@ int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata, flush_put_bits(pb); *out_size = put_bytes_output(pb); return 0; - - case 5: - case 8: - *out_rpu = dst = av_malloc(1 + rpu_size * 3 / 2); /* worst case */ + } else if (flags & FF_DOVI_WRAP_NAL) { + *out_rpu = dst = av_malloc(4 + rpu_size * 3 / 2); /* worst case */ if (!*out_rpu) return AVERROR(ENOMEM); *dst++ = 25; /* NAL prefix */ @@ -765,10 +761,12 @@ int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata, } *out_size = dst - *out_rpu; return 0; - - default: - /* Should be unreachable */ - av_assert0(0); - return AVERROR_BUG; + } else { + /* Return intermediate buffer directly */ + *out_rpu = s->rpu_buf; + *out_size = rpu_size; + s->rpu_buf = NULL; + s->rpu_buf_sz = 0; + return 0; } } diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index aa51c89e29..fd9bea2505 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -1294,7 +1294,8 @@ FF_ENABLE_DEPRECATION_WARNINGS const AVDOVIMetadata *metadata = (const AVDOVIMetadata *)sd->data; uint8_t *t35; int size; - if ((res = ff_dovi_rpu_generate(&ctx->dovi, metadata, 0, &t35, &size)) < 0) + if ((res = ff_dovi_rpu_generate(&ctx->dovi, metadata, FF_DOVI_WRAP_T35, + &t35, &size)) < 0) return res; res = aom_img_add_metadata(rawimg, OBU_METADATA_TYPE_ITUT_T35, t35, size, AOM_MIF_ANY_FRAME); diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c index b6db63fd7a..e7b12fb488 100644 --- a/libavcodec/libsvtav1.c +++ b/libavcodec/libsvtav1.c @@ -541,7 +541,8 @@ static int eb_send_frame(AVCodecContext *avctx, const AVFrame *frame) const AVDOVIMetadata *metadata = (const AVDOVIMetadata *)sd->data; uint8_t *t35; int size; - if ((ret = ff_dovi_rpu_generate(&svt_enc->dovi, metadata, 0, &t35, &size)) < 0) + if ((ret = ff_dovi_rpu_generate(&svt_enc->dovi, metadata, FF_DOVI_WRAP_T35, + &t35, &size)) < 0) return ret; ret = svt_add_metadata(headerPtr, EB_AV1_METADATA_TYPE_ITUT_T35, t35, size); av_free(t35); diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 4302c3d587..718bd21b20 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -783,7 +783,7 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, 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, 0, + ret = ff_dovi_rpu_generate(&ctx->dovi, metadata, FF_DOVI_WRAP_NAL, &x265pic.rpu.payload, &x265pic.rpu.payloadSize); if (ret < 0) {