From patchwork Tue Apr 9 12:57:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 47975 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9c8d:b0:1a7:a0dc:8de5 with SMTP id mj13csp332721pzb; Tue, 9 Apr 2024 06:00:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU0OUnjCJAaGU5/K8ABxVdg7qPlSYKE+D4ZkOMYs8QGMEjuYBxmUIzQwbDco5XtSCQwjTkwyM4zRUMMRQ9wPkw0dc9imGSj1nYDIA== X-Google-Smtp-Source: AGHT+IF6LJzFNNLtWT7KCHs4g9ncJaRQ/8L4wEkFpN8r9Q6d/xyVTRFepiHgp0LwVZqVvIQWUe96 X-Received: by 2002:ac2:4207:0:b0:515:cedb:a518 with SMTP id y7-20020ac24207000000b00515cedba518mr7158312lfh.16.1712667616839; Tue, 09 Apr 2024 06:00:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712667616; cv=none; d=google.com; s=arc-20160816; b=jk36lWR1DOaG7dqKN83SOpxwB35ipdfbfR4mobAQEROfuH8kTsv5gRA/+nONZX2akR KFEgt1wKBINn1PuTHeAUmjFTibRUSSA/x3jSW/hVHc3Bza2r/FHkHtCclMzASrU/4ilD vQA2j+wSQCe2h/mB7L+An3h0a9avn3V+9YUQWZIm5/pixMZVjOys1uIXVGlBDeKb0AUz FOzRIFUrxos9LInMCE/eYS4UBB6SbIbmYlz5QhDu3krGB/UrtbwXnTbf59HLhGlnXNB/ K72EUo1CIng+np8NQZGxjRo/NgS4m32vSs/vD9Qs/X566/nsZZjPT3UsaNUkRvX87ZJh UGMg== 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=0kqXGZikehXhcIo84km/gbpgOMmsOIIFzF6X8yD/j5w=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=kLlexJGEAnpFcMRYomL4EP4wZfP5Uubf8oiNTT8Sy+03U9PRAXIKOcADizFLnP6oEP ObykXZuE+Bdmh1ZMgEo7AUyi+S4gPDACiefGAxAkYPZLzmVQ0xNmuFSQDlGpjf6YsjXF jbxJAzLl871PfJ7XeEAclLg/jhyxzHIB8Gd/OcTePJLgW0cBdBCPJBWAZd4SDDDywF4T HMu9clZ0R7ZHEsh+39Fpk1ZJS3loCD08EaGSO77OtMRUGUOyGaoFujvcz7646NWUEsjV RKXug+fhf1fMhr7GBMf1Ac6cQHXDFhmySxHuClN5fFGMaF8WWka9/MI8G0oQ/5kRrEUA j6Zg==; 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=Ra9ziqgl; 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 i23-20020a508717000000b0056e0d2f4db1si4745005edb.324.2024.04.09.06.00.15; Tue, 09 Apr 2024 06:00:16 -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=Ra9ziqgl; 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 CC15268D1AC; Tue, 9 Apr 2024 15:59:27 +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 7622568D11E for ; Tue, 9 Apr 2024 15:59:17 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1712667557; bh=Sjb4FWSjYqvNI8yanOsl3A5OdmxY1nscObMNBeLKAXg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ra9ziqgldCHjve+sxYfewPCIM9uGc3f00huEzP6qXXH8YrV8P8mYXef7DNYxko1OS xQhM+1sTfQb6m9bcqF+3FCfpk66GiFhS/XJ6LonDz8PbJNKGduqN1gK32dTfV+PXah 7KGrb+Tpjc0JXAJP6Vp5Rh1MAW2U29xettMTGNx8= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 40ECA42752; Tue, 9 Apr 2024 14:59:17 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Apr 2024 14:57:24 +0200 Message-ID: <20240409125914.61149-5-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240409125914.61149-1-ffmpeg@haasn.xyz> References: <20240409125914.61149-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 04/11] avcodec/dovi_rpu: clarify semantics of guess_profile() 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: QL1Eun/nyWIF From: Niklas Haas This is based on HEVC only, H.264/AV1 use their own (hopefully correctly signalled) profiles. --- libavcodec/dovi_rpu.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/dovi_rpu.c b/libavcodec/dovi_rpu.c index 267e52ceb66..4da711d763e 100644 --- a/libavcodec/dovi_rpu.c +++ b/libavcodec/dovi_rpu.c @@ -121,7 +121,8 @@ int ff_dovi_attach_side_data(DOVIContext *s, AVFrame *frame) return 0; } -static int guess_profile(const AVDOVIRpuDataHeader *hdr) +/* Note: Only works for HEVC */ +static int guess_hevc_profile(const AVDOVIRpuDataHeader *hdr) { switch (hdr->vdr_rpu_profile) { case 0: @@ -510,7 +511,7 @@ int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size, use_prev_vdr_rpu = get_bits1(gb); use_nlq = (hdr->rpu_format & 0x700) == 0 && !hdr->disable_residual_flag; - profile = s->cfg.dv_profile ? s->cfg.dv_profile : guess_profile(hdr); + profile = s->cfg.dv_profile ? s->cfg.dv_profile : guess_hevc_profile(hdr); if (profile == 5 && use_nlq) { av_log(s->logctx, AV_LOG_ERROR, "Profile 5 RPUs should not use NLQ\n"); goto fail;