From patchwork Mon Jun 24 17:20: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: 50138 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp2155741vqz; Mon, 24 Jun 2024 10:21:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVa1RcJoQOds9KzAjy+B37ZMCPGAvbbhaA8C9XiEltLVaWC6Zu2dW+Y4RLWuUWNTJ4IJ2HCNWyNZeIocN54SjXTwvJ7jeTK++Jyaw== X-Google-Smtp-Source: AGHT+IHcHvUUSlZvdQHSRKOmtu5UrS9zzjqZ3P7k7RkFwRFwBFtWV9qv2Y+OlE6LBsu1ZHr60xo5 X-Received: by 2002:a17:906:a2da:b0:a6f:61c7:dea7 with SMTP id a640c23a62f3a-a7245ccdab7mr320147266b.18.1719249700542; Mon, 24 Jun 2024 10:21:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719249700; cv=none; d=google.com; s=arc-20160816; b=Oq7WUv/xgrPsV/YvFrrP2wlCjz7vIoKSoC/QmScR80r3+QUMcqZ3sL+m8ELqUIe1hO OZWRrj4T9sFHYrhs1cstH6qPe7OF/kFR6T7omOI0SeHIsYQOp8GAhwrWS5fBiHrLjWpx FQ9UMDqrWlq+XV9CMLhJUReIqUr4KxdgPuZMlPlio6/Wrx5+cx16ImxDtuf0Ng3gBmwT YbLoq0B2GoPPE0a/b56xd/iuVRRB5h2UZN3r13C5TqJkri77eFRHu0Xiqyi/KfDBnJ12 1TAcSL7rZXzOiUoFh85Ept6lgOq/nk+ftMkEJgy636nq8GwlMVD5VURYDSUN4JW4l12F pNJQ== 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=gX/28dveE2U8st7EdkFziZT64Wy7+b6JxCWGZGts8IQ=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=PQrt2O5u9VcKgSGbjxg+jKB61E9G/VDfhZ1ltKH9oKxCYReAjwDdWCUyKG+wgH7J4u tz+aK84UqLxYIsRVQWPcYhUuLd0Pfk/1Ce6qlwK6pai6EDQIlCvfghT1fUXxbgtCokos Kj6IuocfhXcgbkYYU9T6wF7sNjv5OOohVj5DINBhAtpShSuOK9nUp6mfO3GipgEyganj J/9zKg1aAU5eYKoyanIoVFyTP0IFoEA4adG8sV9k7XvQRkqAlcN0imkAkHrE0qyrCpN3 rcjGrazQXifX08JNf8MIqurU4J7Ptk1m0nWnYbfE2Hx7FDn4oTMEr5yJNu9y5xdTjBs2 9jxA==; 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=txodpCLq; 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-a6fe0ca3898si298649466b.1042.2024.06.24.10.21.39; Mon, 24 Jun 2024 10:21:40 -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=txodpCLq; 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 B9EB668D62B; Mon, 24 Jun 2024 20:21:02 +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 0587E68D4AF for ; Mon, 24 Jun 2024 20:20:49 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1719249648; bh=n4jwPX0blDZon0Hhwl4R9SIUyrJ8KAzEZzVYUr8Zt9g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=txodpCLqp9z/nPmzWvCbshqfOw192Pw4+TIkaxatV2Wfu5bqTWjR5f7UaSYBy8pRU afewJhPLuJ8MhVy/8N/AJ1aJzz5gsrYAdlJbXThXlHDjlHT8yp0snokhMGZfZ+6Cq1 wsL3g3OgQZlr4lohXxNOdQZlLaGuiFxiEqAuhGLU= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id C147946D5F; Mon, 24 Jun 2024 19:20:48 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jun 2024 19:20:40 +0200 Message-ID: <20240624172044.101722-5-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 5/9] 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: VMk+2Zy0ExeN 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 f10e175350..6bfb39a7ea 100644 --- a/libavcodec/dovi_rpuenc.c +++ b/libavcodec/dovi_rpuenc.c @@ -446,7 +446,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);