From patchwork Wed Apr 3 15:43:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 47756 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp485378pzb; Wed, 3 Apr 2024 08:44:19 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW0IyAIr63ryDqAtwpTk7zxDbimOd+OMppzTYpGIAZI+DFc82+HTbZpDjDPMXgm7x/K7mgA8OCaJ/ET5iRZFw208bDNsg0Oa0zm5A== X-Google-Smtp-Source: AGHT+IHpjmnv3Qev/1WlXEBtHTw4bFh20NkaWHagqpM4HBU27Z48nvPwLytMxxR4+jUzxqqtPNoS X-Received: by 2002:a05:6512:2247:b0:516:be61:7688 with SMTP id i7-20020a056512224700b00516be617688mr2089294lfu.22.1712159059461; Wed, 03 Apr 2024 08:44:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712159059; cv=none; d=google.com; s=arc-20160816; b=Taw22GH99Qx5Q7zqkdxgzym1ErKHL/j5BSicCAMrTequEQpAGCktajDZ1EYNYPNBH9 N7AeQZ21t3H1dgsc+yb88HYfzHQGJG14QGfPML5zTl0GR90JnGmNKvKA1CIxtbCxJP5O w4xiLw6AsFXOvOfRaPRlljK3Z4fVAScR+5/6hfsato9CW2RCJNF6uzBSMvAbopPKRnb7 gGT4tVxaEO2RklbeEvnD1++bMc9jYmGfxF0vm3q4nl3Pktz6p8KQODM4SafXuhbnh/DM 8a8q62eVh7YQargh8QJeo8ojTSoFkWDMsXqKRz5xVrxNgYS/2HsKk1lPqOmtSEdwR1dn x+BA== 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=vIk69qRgNXLeFCLmMXUJDXKgo2bNU1a5lmVluwoT7/291i21cP0lNcK+WrgyaO2+us qppqXK3tNqUJFm11Pj20wZmGQd1Q9bZOIEq5qbnHPl+wk6w8NfHNJjvMcrXcb18nrpNb NuspYiWNYb/6yUoJDhEJqtzcNkIyHt1GhQamgO/OBegBzevQ361ctyy8JSkdJEhcPtFn HzRYut054CqqJYj9AEcVQxMo1KdZQ/ziiFpQwm3DHblP/Tng8yriOgkygM9uB7+UiwEo HshsuAb1pmnIvtFRkfzbJ1Kis12gV3ErC9lQQy8JAuIyv3ZifDO6vKbGM8y9EYOktabc lVNw==; 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=aPN0+BhN; 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 hq21-20020a1709073f1500b00a50d6be3f19si522515ejc.612.2024.04.03.08.44.19; Wed, 03 Apr 2024 08:44:19 -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=aPN0+BhN; 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 8007468D1CA; Wed, 3 Apr 2024 18:43:44 +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 527EE68D15F for ; Wed, 3 Apr 2024 18:43:35 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1712159015; bh=Sjb4FWSjYqvNI8yanOsl3A5OdmxY1nscObMNBeLKAXg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aPN0+BhN/whBK1MudE2HNnMcG+xEEd46bUVDXFY3AqrVh+HezUV1lT7XJQ29gT0Er CnAe7u3dr36FJT6DBi08Pj1WIG8kd7Eqpc6MWMGNQHtVBgc/VO7uKt2vcFEsuTKhwn skv3Oiocr/d0zEU4M50TcHtCt+GCXlPeinN4DaZ8= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 03A64429F3; Wed, 3 Apr 2024 17:43:34 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Apr 2024 17:43:25 +0200 Message-ID: <20240403154330.71585-5-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240403154330.71585-1-ffmpeg@haasn.xyz> References: <20240403154330.71585-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/10] 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: 5RhNZQ5Vx6hf 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;