From patchwork Tue Jun 18 19:35:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 50006 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9196:0:b0:460:55fa:d5ed with SMTP id s22csp2780128vqg; Tue, 18 Jun 2024 12:43:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX7qeS0OKt+IQFTMoZk8sf6paz4KOn7auQniCHQNFz8+NNMpMmZDrFuOwVJFdfsHlQCuNchUvuznPPuydaO5J/L6GXqSEIMnQPINw== X-Google-Smtp-Source: AGHT+IFbBEdMh02VTaJWVVVU4plI6YRv/NbDSM4jNgOYdbOY9HxyBSc4AxeB8e6chAYjVvoTn1q8 X-Received: by 2002:a17:907:3d6:b0:a6f:1e97:b177 with SMTP id a640c23a62f3a-a6fab7d1276mr21114766b.64.1718739783727; Tue, 18 Jun 2024 12:43:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718739783; cv=none; d=google.com; s=arc-20160816; b=k7/OqYzZT/lWnct3hKSWXStlimvxu+Vi9mXo/rYW8ZML5o553zbzG3xC19FWh1rCbJ 4o9Oj/Ezb7EFwJkZD4bH5TN/04olLu6scEvgahOhBrAovRocIrylougUPpbjLwR2x6TJ R54yheNK8VDuE6A1kLeZMzJTmGsARCkQPYOdwn40EyYD2cmLU5rezODScah+JMFlmNHW eoWpl+ZQ6198rezHtc6SpU/ebOh8NXAJtEEkYI6sgVGgzIWUaIw6aHmaRdXFmEgZzbJz V5pRXDoC9DwT8lZsPporCrTKT8M6h1w81wI8bI+hmOoFRf2f5iZhHyT8ZIcpseb0VV/I sd3Q== 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=RMKsfoQW/pIjzWlMalnPDicKtKzCjyc7O/BeQ9BX0I0=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=bKCiwMIl4+5G05JGi7d3RdPsaPWTNs56sCtLRZ6Wsf+0tTxyvxCXuoktijw+kKlSkQ ZsAjFZZx7EwhgJVPwXbgXa3M7eT9Clf8GIjsfFjnZu5SOH9aA7HGNsCab5ed+1zWKJv+ 8fN7+4EgY6BWjTsIIlDj1DHgwKD64AQm01HnQ6AIBJShnCrj/qkjYpgh9xbvMlH8S/PQ NiN7Cv9oxFWRYv5lFEQ5Gj4lZJGxQXIs3TJTeDSsIApbSYwpEWpA3fnZGNPrIELYxc0s /7cOwd6FjxNK3x1ghXIMTwW+47rWv+2t02nKlLyTxoCXwHW+OSYVwncyxpJ4YyY3JmjO 8AEg==; 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=YmdbSsM4; 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-a6f56dd6e07si573976966b.326.2024.06.18.12.43.03; Tue, 18 Jun 2024 12:43:03 -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=YmdbSsM4; 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 1931B68D779; Tue, 18 Jun 2024 22:42:36 +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 4A76168D5B5 for ; Tue, 18 Jun 2024 22:42:24 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1718739744; bh=YE49y59sPE9rVpxdT4D5GYWLVZIyF68syustNeNA/Uc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YmdbSsM4pmWg+iP0sefOdeA77iZV80ReABDyIPZFIwOIO6oy9T6IRBpxEyuNhBZWv TzXaNQ2v/p0/6POT5x/nbgqNkRq+zFZu5r34DxGRkZuwY0ERWUF1AA0SPaqblzVN6r SWVhL8XZY4pg2t7hj62tO0hlhvDhHLfKIjewtMmc= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 09B6D42835; Tue, 18 Jun 2024 21:42:24 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Jun 2024 21:35:33 +0200 Message-ID: <20240618194221.26073-4-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240618194221.26073-1-ffmpeg@haasn.xyz> References: <20240618194221.26073-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/8] avcodec/dovi_rpuenc: try to re-use existing vdr_rpu_id 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: PE6ZJQOl9FYi From: Niklas Haas And only override it if we either have an exact match, or if we still have unused metadata slots (to avoid an overwrite). --- libavcodec/dovi_rpuenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/dovi_rpuenc.c b/libavcodec/dovi_rpuenc.c index 45fcd9a86c..0d49a128fd 100644 --- a/libavcodec/dovi_rpuenc.c +++ b/libavcodec/dovi_rpuenc.c @@ -463,12 +463,12 @@ int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata, return AVERROR_INVALIDDATA; } - vdr_rpu_id = -1; + vdr_rpu_id = mapping->vdr_rpu_id; for (int i = 0; i <= DOVI_MAX_DM_ID; i++) { if (s->vdr[i] && !memcmp(s->vdr[i], mapping, sizeof(*mapping))) { vdr_rpu_id = i; break; - } else if (vdr_rpu_id < 0 && (!s->vdr[i] || i == DOVI_MAX_DM_ID)) { + } else if (s->vdr[vdr_rpu_id] && !s->vdr[i]) { vdr_rpu_id = i; } }