From patchwork Sat Mar 5 16:58:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 34620 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp49708nkx; Sat, 5 Mar 2022 08:59:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJyz7XUQ/r3lzLYTvrN4x18a1N+B3cEy/XzYqKH/dxHN5SBy6/cqRhcg774XcCdXC5ROavLU X-Received: by 2002:a17:907:608f:b0:6da:8d84:e272 with SMTP id ht15-20020a170907608f00b006da8d84e272mr3391756ejc.559.1646499547328; Sat, 05 Mar 2022 08:59:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646499547; cv=none; d=google.com; s=arc-20160816; b=KMhj7sA4C02u8hwXpG0mwTNliYw9cDQxXWZfzjnPv7R4C6/v7sBMHKoiHl751KyWkP rmg3XStqix/V4VYoXDNW9SmksLD5Sgxh1OAnztjTrpKBdERa/rKlkPqtKuo53j7XVWOV jRN3IrzYQim3DFSmCHvxKVDTrLy9zHUMz4KYZOVtSf/WzjqedmOUWz8EoMMtcRVI9tlb /tb7yDUMBO319BYEIFQjjCRwj9/Wx3WvTPi0EtewnExJTBObRWjxZrDDivTx13uqP3TR BKay2GZy9K8DBVHpzghR4xxBH+IIfCszzyTCsrR5EDHuS8OGG1fXBDET9ujXdCkqNVMn QiuQ== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=1nSUQwbK9RJVpRFpKddqHzGQ9IiI1UwTNBEB5Ly4Xyo=; b=Wn3CKet1AltFc9rjKFTkpsDJsA/bbJTHqLEUfsNN3wLnu53UjJ6vXj3f7UEUer7SBE Jbdda343rxVpMCnfzcaWNjDivfKRysooHejmv5ydq53Cw/K/w5EiKMqHuHwrjZkAc11A rG+10yvmfn6VfBZQ5HJJcPNDuOYmW1+YxDyKDFgFiX8nkWJ5sIvbL7+Ncytj0tw3nKA5 TEYr2GP4r6aORZPtrIqP4uxtj7FNBmRrLbcehizoNSiWL3Nh5BvFYExf3w99YI7cDo3T dEFgJGopf/KI9dbfOGzwUnIGPeOy8aa2xmWXganuTBRPSH9z78SOe3Pd7QP+BvaJ8M/t STlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=ZBv5n7Hy; 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 z10-20020a05640240ca00b00415bbe0c49bsi5660289edb.149.2022.03.05.08.59.07; Sat, 05 Mar 2022 08:59:07 -0800 (PST) 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=ZBv5n7Hy; 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 D2FF968B10A; Sat, 5 Mar 2022 18:58:51 +0200 (EET) 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 AF04968B0FB for ; Sat, 5 Mar 2022 18:58:43 +0200 (EET) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 6E35B47027; Sat, 5 Mar 2022 17:58:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1646499522; bh=svxFl3uwrYVHtcEMY91onsPmvVZBHgrydG3hLUuFCmA=; h=From:To:Cc:Subject:Date:From; b=ZBv5n7HyhgEihTMi2mjXm86C3vjsPzsx2QUf0IVfgzt2iq/7SnkTDDhZ2cGvU4m8t 9ANp+tK95m7Iun7/WEOkDc0lqUwIKPw25ruvp1yS6EMhUhmEwoxYLrc1tiU3aophcO OMNi4EScbakaD713bi5RRuGfcdxSDK3QNudxf044= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Sat, 5 Mar 2022 17:58:31 +0100 Message-Id: <20220305165833.18668-1-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] h274: correctly infer missing comp model values 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: RCbuuv9Pqs35 From: Niklas Haas The ITU-R H.274 spec mentions defined behavior for what to do when num_comp_model_values is less than the amount expected by the fg model algorithm. The current behavior is basically undefined behavior in this case. In addition to fixing this, also defer the index offset calculation very slightly to better lead into the following commit. Signed-off-by: Niklas Haas --- libavcodec/h274.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/h274.c b/libavcodec/h274.c index a69f941142..170086543f 100644 --- a/libavcodec/h274.c +++ b/libavcodec/h274.c @@ -162,6 +162,7 @@ static av_always_inline void generate(int8_t *out, int out_stride, { const uint8_t shift = h274->log2_scale_factor + 6; const uint16_t avg = avg_8x8_c(in, in_stride); + const uint8_t num_values = h274->num_model_values[c]; int16_t scale; uint8_t h, v; int8_t s = -1; @@ -191,8 +192,8 @@ static av_always_inline void generate(int8_t *out, int out_stride, return; } - h = av_clip(h274->comp_model_value[c][s][1], 2, 14) - 2; - v = av_clip(h274->comp_model_value[c][s][2], 2, 14) - 2; + h = num_values > 1 ? av_clip(h274->comp_model_value[c][s][1], 2, 14) - 2 : 6; + v = num_values > 2 ? av_clip(h274->comp_model_value[c][s][2], 2, 14) - 2 : h; init_slice(database, h, v); scale = h274->comp_model_value[c][s][0];