From patchwork Sun Jul 28 10:25:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 50788 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:16f:b0:489:2eb3:e4c4 with SMTP id h47csp582657vqi; Sun, 28 Jul 2024 03:28:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW/ZYONMYl95qg7AecudHlAapHwDPC/+M/PKLCDq8Gmk+bo5exsRd+5kIDFfIdNWOeDlY4odgGcalr0RFNRHN8BipX7S3b9gMOdAw== X-Google-Smtp-Source: AGHT+IFngiclSNWXKjTbAxZ9xsEjrNJRJt6yRWFKAnFeoUgpYH2kiGr+X9emqjWwiCChswAkC4jp X-Received: by 2002:a05:6512:68f:b0:52f:c27b:d572 with SMTP id 2adb3069b0e04-5309b2e0b36mr3718704e87.59.1722162489246; Sun, 28 Jul 2024 03:28:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1722162489; cv=none; d=google.com; s=arc-20160816; b=cOIB0wwS4M2CqhWQNpb3sH6VlNCdhti5y3aTeWgFzudh8uIyStG4nT9Nz6s2A6kM/C TbejAEE4ckbijGETggNqb1kbqK8Wbxxi81iiiE1V38zJGjk73Xa0Bn2s9rZUuXaSfA8c 2CQXAfbfrLm8fK3y6d3odZxFE/YtlPf+wrR+RcOqACsI2dZeh6O6tlK12beUFi6IQ/Dl zGZzTw6RRkQrrbIg1/EOye4qhfTqRXAWT4l5kDGTTSofVUuAl5uJ/hT3XoiJjbWKy8MI bLj6A0d6NsGLMgHm0946Oavkm7jJAKpC29owZ8w5vm4IocplIKaduwgh7WGRFwGlwl24 E4cg== 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=aHTkRK4NL8yBxNNR08ve/6bq0PZTzvlN0xHJ80wIXfs=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=m4RhjZzDBOxmUuslQRLID5yVVgJeLxaEwgVq2GgGtbMNd9yLaomgcy4FiQvx6CAeVz nQ+IwVnbX1RKgIQjRtHGM1QiVz1ZuWcxpRx/UJK7S68omdSg2Fnh6+3qiPQbBXgsiZoL sn0TFQZljmbXtmjF7AdLMKJzbCG58yk0te8017hY4WZBY2HIlAClEBhjtZ0Uld30J8YG 5GFjHKfHBmV+Cao2uwuiQOiDRrTQGBNoBqezAZerYPvoJGR/cUVb6Kbexel7MZ4zyOCU Iq6Qlx7A/Cog31fV40TNuPiOFCaq3nWS2J5IYt+iVGjGFrwca18KgyPKYlwQW7vv3LBU VMHg==; 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=LY0CAXOu; 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-a7aca9fead9si494818566b.236.2024.07.28.03.28.08; Sun, 28 Jul 2024 03:28:09 -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=LY0CAXOu; 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 363E168D973; Sun, 28 Jul 2024 13:26:01 +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 8369968D90B for ; Sun, 28 Jul 2024 13:25:41 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1722162336; bh=FEVAiCk0MyLwEbcrrtMMRIPa1tB1pGSnXOlcCyQSe3Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LY0CAXOuHVv6NdDAvD7LaBXisrHtLtBPlyqbI0Hapm7J+dbg4GkrAJLa2gopxSydb Hs1nOYQcuBM5VVdaWbbXudn+P6DVMFLGcm6ETfae2j/Q8fO6OXTGFG+YQBM0vL2aLj AAByNc7WCxOp4tBxq6lLUod+sWOr/yD3LgNAze0o= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 8118F429D1; Sun, 28 Jul 2024 12:25:36 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Jul 2024 12:25:11 +0200 Message-ID: <20240728102527.17991-6-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240728102527.17991-1-ffmpeg@haasn.xyz> References: <20240728102527.17991-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/22] avcodec/dovi_rpuenc: add `flags` to ff_dovi_rpu_generate() 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: iEowtjTwiQTS From: Niklas Haas Will be used to control compression, encapsulation etc. --- libavcodec/dovi_rpu.h | 2 +- libavcodec/dovi_rpuenc.c | 2 +- libavcodec/libaomenc.c | 2 +- libavcodec/libsvtav1.c | 2 +- libavcodec/libx265.c | 3 ++- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libavcodec/dovi_rpu.h b/libavcodec/dovi_rpu.h index 205d16ffbc..65a4529106 100644 --- a/libavcodec/dovi_rpu.h +++ b/libavcodec/dovi_rpu.h @@ -135,7 +135,7 @@ int ff_dovi_configure(DOVIContext *s, AVCodecContext *avctx); * including the EMDF header (profile 10) or NAL encapsulation (otherwise). */ int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata, - uint8_t **out_rpu, int *out_size); + int flags, uint8_t **out_rpu, int *out_size); /*************************************************** diff --git a/libavcodec/dovi_rpuenc.c b/libavcodec/dovi_rpuenc.c index 2a6131eff5..e1a70be42d 100644 --- a/libavcodec/dovi_rpuenc.c +++ b/libavcodec/dovi_rpuenc.c @@ -435,7 +435,7 @@ static void generate_ext_v2(PutBitContext *pb, const AVDOVIDmData *dm) } int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata, - uint8_t **out_rpu, int *out_size) + int flags, uint8_t **out_rpu, int *out_size) { PutBitContext *pb = &(PutBitContext){0}; const AVDOVIRpuDataHeader *hdr; diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index dec74ebecd..aa51c89e29 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -1294,7 +1294,7 @@ 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, &t35, &size)) < 0) + if ((res = ff_dovi_rpu_generate(&ctx->dovi, metadata, 0, &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 2fef8c8971..b6db63fd7a 100644 --- a/libavcodec/libsvtav1.c +++ b/libavcodec/libsvtav1.c @@ -541,7 +541,7 @@ 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, &t35, &size)) < 0) + if ((ret = ff_dovi_rpu_generate(&svt_enc->dovi, metadata, 0, &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 0dc7ab6eeb..4302c3d587 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -783,7 +783,8 @@ 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, &x265pic.rpu.payload, + ret = ff_dovi_rpu_generate(&ctx->dovi, metadata, 0, + &x265pic.rpu.payload, &x265pic.rpu.payloadSize); if (ret < 0) { free_picture(ctx, &x265pic);