From patchwork Sun Aug 23 23:47:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 21865 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 24DC4449D82 for ; Mon, 24 Aug 2020 02:48:29 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F39CE689F10; Mon, 24 Aug 2020 02:48:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B1BFD680C49 for ; Mon, 24 Aug 2020 02:48:22 +0300 (EEST) Received: by mail-qt1-f193.google.com with SMTP id f19so5068178qtp.2 for ; Sun, 23 Aug 2020 16:48:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=O/L5x54Rm+nKJ5okiTTAJqQdlTS2/WeqtuLFOCRSU6U=; b=dstbDdNqbYwu5jj20a5lo2NkEBwQSXbADUUI7oluZCRHVuox0k3nQwuJmiZJu/+dW3 tVts3krYzt2GDHt2WNEbvUokigTDlQz1HgT3nrk3VRqC821zKso8oM8gb9E51LSVqs31 pN1LLG+uVexACSzDsYxbfYPNm4Y70iTuLm4sCFQ3glvBgl6dYYVmNa1oC3z9arBPfFbX YZ1KKJVGX0hlAL/KWUchaxiDMAcCCkt11Wi9p3+Wfh6nx2nJAQvOWDg5myVgLHGW9TQq yrVXqTJhLRtLoeY//X8rFGO3TVkShZFSssG5irBgmt7sjvtnGYbFSY9rfWHgcb7OqR1B gEhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=O/L5x54Rm+nKJ5okiTTAJqQdlTS2/WeqtuLFOCRSU6U=; b=LoB3mNJlIQpZTMArxTo63VpGqa4xGuon5oneZnhC4Z9KQsKRYdvK34iqF9NaE8qRkq FxXZj+xHvy0pT7YgjIXyZ5ikyXWFMwpOsV+SSNUWVGtapc6iELUuFUiQZhywjU3XhTh6 +8AiGftUsBghUqPbpj0fxU5PE/xVHesCPcMaxfGgd6F+Vl6H+Rmy4XNSrRBl9btNndIg nAyK5WSEsRv6FspX4rc8NSLfnYGCpUYkSQzWF+3jJ22fh0tlclZiQtVcyikzhV7AhHaf gMc8i7RX4D1lT7IwrVd3r+4IX5GUhrrOGWnFMuJf7zKj6GZYAAH/rrE0hej1kdH7nSf6 Fx6w== X-Gm-Message-State: AOAM532XBOm31VqPb7qyCjA3bNtZpayWluH3vy7C003nmCIWpuHs1340 BZu4PwRLp/u4gxBtc7JgiykJ806iPqg= X-Google-Smtp-Source: ABdhPJzh8KeQIW2w/u2/GL8L+TsYYH4FpM1nfwHskGL386cIOyx4am0XHoEiGlhDLNxhZ4kSLm2phA== X-Received: by 2002:ac8:387b:: with SMTP id r56mr2687617qtb.353.1598226501187; Sun, 23 Aug 2020 16:48:21 -0700 (PDT) Received: from localhost.localdomain ([181.23.70.159]) by smtp.gmail.com with ESMTPSA id b2sm9425694qto.82.2020.08.23.16.48.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Aug 2020 16:48:20 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Aug 2020 20:47:55 -0300 Message-Id: <20200823234755.15326-1-jamrial@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/cbs_av1: fix setting FrameWidth in frame_size_with_refs() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Section 5.9.7 of the spec states UpscaledWidth = RefUpscaledWidth[ ref_frame_idx[ i ] ] FrameWidth = UpscaledWidth FrameHeight = RefFrameHeight[ ref_frame_idx[ i ] ] RenderWidth = RefRenderWidth[ ref_frame_idx[ i ] ] RenderHeight = RefRenderHeight[ ref_frame_idx[ i ] ] Meaning FrameWidth must not be set to RefFrameWidth[ ref_frame_idx[ i ] ] as we're currently doing. Signed-off-by: James Almer --- libavcodec/cbs_av1_syntax_template.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c index dedd549572..d6b79dacd3 100644 --- a/libavcodec/cbs_av1_syntax_template.c +++ b/libavcodec/cbs_av1_syntax_template.c @@ -553,7 +553,7 @@ static int FUNC(frame_size_with_refs)(CodedBitstreamContext *ctx, RWContext *rw, infer(render_height_minus_1, ref->render_height - 1); priv->upscaled_width = ref->upscaled_width; - priv->frame_width = ref->frame_width; + priv->frame_width = priv->upscaled_width; priv->frame_height = ref->frame_height; priv->render_width = ref->render_width; priv->render_height = ref->render_height;