From patchwork Fri Nov 15 18:38:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 16288 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 A858C44A950 for ; Fri, 15 Nov 2019 20:44:02 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 786B968A141; Fri, 15 Nov 2019 20:44:02 +0200 (EET) 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 21587689F41 for ; Fri, 15 Nov 2019 20:43:56 +0200 (EET) Received: by mail-qt1-f193.google.com with SMTP id t8so11838524qtc.6 for ; Fri, 15 Nov 2019 10:43:56 -0800 (PST) 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=7HOh+pElp1P3ZGFbI/jGOx3+/yrG4cd4Dp44AHyQ0W0=; b=oZLxuirK3bkyizyKQtBwn4PGe0t8NELWvOnvuSl1LrTeWyyji8/jaDMOPvUXpfzK8i Kfrkqt9Cgf3nLrKYnVXkUfV9PmGs2ZvESGXAyyzztRMku9QA+2gwNb3GVA3C/tA2U9hN jrp18lgT8yYlTtfO2JsBfNQxCCI2717C/3dqcWdsd9GegIXvNYG3PVPe1/TxPQ2wFKlR C/NZt/UNpVUTrZZmY9YHwPBKaFo5XqaBMC3UdprfUBhFpRqzYLxe+LKQfNwL96fxAF+v 2CQjlb2CjMhI1fvCqQOn3CHVgyVfEhZoCVkoBMZbwMN3+QLUTcxkt4FQHDeGab0Tm9nu DTnQ== 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=7HOh+pElp1P3ZGFbI/jGOx3+/yrG4cd4Dp44AHyQ0W0=; b=A+2QFP7TbNWYooyAqMrCXZtFL+YoEHjvuPo9xfCnPbBFglsfC0zqmRg3h3JVAemlA/ u2tmTighE9MyrC64+fgFxB6SbnmLTN+cY33YwTj1ZbvQn/30BnoUgj/ohcdMZqMObFy0 pwI8EJVKThp+jqU46fRyQTl0MBmob6BUyZr/iRgYZSf1kmnNVWGGm9GTwV8cwULOd/SP 83iQXNT8YPbzxKpiGG2U6+oCgfv6vS7ybMGsfJeujOFjHRK45nvW1Mye2KMTytKcO5mw Unw1i1SNULj/0t/xUqZyaOiNmVoDzvl6DlsHXsZAmp5Gq25D28AfW+y+c8d8GiZIfAtm uCaw== X-Gm-Message-State: APjAAAVax4XPhPtFqAAx7J5T2pbRwSiIC6WG0+NhRXvBhir5sW+Si439 1sXH72hFk0O44KomWVxRNKH1sDZH X-Google-Smtp-Source: APXvYqyNMbU2tM/pVravnddshtr7lWpME3yuUz+ceCmeivFj0QB8kbahU/64hBBijWt8USrvBwSxUQ== X-Received: by 2002:ac8:2a70:: with SMTP id l45mr15711919qtl.230.1573843111914; Fri, 15 Nov 2019 10:38:31 -0800 (PST) Received: from localhost.localdomain ([181.23.71.177]) by smtp.gmail.com with ESMTPSA id a70sm4690482qkg.1.2019.11.15.10.38.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Nov 2019 10:38:31 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Nov 2019 15:38:04 -0300 Message-Id: <20191115183805.1736-1-jamrial@gmail.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/cbs_av1: fix reading reference order hint in skip_mode_params() 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" Signed-off-by: James Almer --- libavcodec/cbs_av1_syntax_template.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c index 806b302de6..c843cfa02b 100644 --- a/libavcodec/cbs_av1_syntax_template.c +++ b/libavcodec/cbs_av1_syntax_template.c @@ -882,7 +882,7 @@ static int FUNC(skip_mode_params)(CodedBitstreamContext *ctx, RWContext *rw, forward_idx = -1; backward_idx = -1; for (i = 0; i < AV1_REFS_PER_FRAME; i++) { - ref_hint = priv->ref[i].order_hint; + ref_hint = priv->ref[current->ref_frame_idx[i]].order_hint; dist = cbs_av1_get_relative_dist(seq, ref_hint, current->order_hint); if (dist < 0) { @@ -913,7 +913,7 @@ static int FUNC(skip_mode_params)(CodedBitstreamContext *ctx, RWContext *rw, second_forward_idx = -1; for (i = 0; i < AV1_REFS_PER_FRAME; i++) { - ref_hint = priv->ref[i].order_hint; + ref_hint = priv->ref[current->ref_frame_idx[i]].order_hint; if (cbs_av1_get_relative_dist(seq, ref_hint, forward_hint) < 0) { if (second_forward_idx < 0 ||