From patchwork Sat Oct 27 00:38:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 10800 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 09D0544CDE7 for ; Sat, 27 Oct 2018 03:38:49 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 704EB689C14; Sat, 27 Oct 2018 03:38:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5F77368060A for ; Sat, 27 Oct 2018 03:38:14 +0300 (EEST) Received: by mail-qt1-f194.google.com with SMTP id g10-v6so3291549qtq.6 for ; Fri, 26 Oct 2018 17:38:44 -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=js/QOH3rrR/x/uapzGNCXT0pURYQkqYnhg83PEfoH9I=; b=kn7yW6VTQnF27rYL3/W9ZX7jGrKPfiEXlIeNtjpiSCO2AHKOlDQh9oxvDi/pp3XpXG 76TPc/hMqhZ2AK4ehS3tT/yGFKj0slhNdhfm5MOzrCML/AHGc6byP2zpVfILViTeFgHr lGMZk8l7TIJBUzvpCp9bxS9RK2VcFUVCXpHyXH+Y14pTn7E/K5mhSYabXLHZnDQK+7mI mr2j8ctccyRiFiDgSCpUFlXfwSMFVyPyAcpl1G7w/dJDbvca+36jYBDtcaLbiCsBxbSS qpElXmJTYpe+lmGw6xTKAL7Jhc4MiFoH2aIvIsuor4Y94NHHOnR25C024/bDjHWF1P6U zw5w== 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=js/QOH3rrR/x/uapzGNCXT0pURYQkqYnhg83PEfoH9I=; b=Oby1fzesre4lik6NQvvd2J9vW3mAFrmMXkBsPZoNoMI+rKA3lQG2fz4VbPJR4psaS2 GSw1/l/4TSKXwAjWHuE1N3JMxMjD5eiL41+h446s4ZArkddYxl9sPSCENMcmqosbHNlr l4MoeprsndB6Rc0P1vmCIKHdklYO/Jv6CGv5M9o8k4NqHC30yv88fk+byfYXvEk0y9Wi 47HBsBCXAeqTxvxkhymjDXSM+/s21v9PlN+jHQnGngwhX6cPewFPIwYxL9dOGgArR/Iy NfpfrZsYCEC4PzT2Xc5Wq15OlrEYq6LQqx57Ob6jVaFDlGiPyA1pZWUAu/kKnFW7U1Nh bxqw== X-Gm-Message-State: AGRZ1gJLk6QDa4SX4ZXn/DWLb1qz1kqNOfRP2vvxG4qYMbzA+zPycHkP 76t1x9ZNa/UO3BuxLitUtDhVDz/f X-Google-Smtp-Source: AJdET5cAEia7ag6dll9fYEOVYTvAmXgHCdOerD9Nvpbjmw28z6+hOl7AIGSvIdPLKLKB+LBlzA0tyw== X-Received: by 2002:aed:2ca7:: with SMTP id g36-v6mr5104468qtd.52.1540600722634; Fri, 26 Oct 2018 17:38:42 -0700 (PDT) Received: from localhost.localdomain ([179.38.174.95]) by smtp.gmail.com with ESMTPSA id p21-v6sm9157936qtj.18.2018.10.26.17.38.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 17:38:42 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 26 Oct 2018 21:38:27 -0300 Message-Id: <20181027003827.7080-1-jamrial@gmail.com> X-Mailer: git-send-email 2.19.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/cbs_av1: fix parsing 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" found_ref is not a single value in the bitstream. Fixes parsing files with frame size changes. Based on code from cbs_vp9. Signed-off-by: James Almer --- libavcodec/cbs_av1.h | 2 +- libavcodec/cbs_av1_syntax_template.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/cbs_av1.h b/libavcodec/cbs_av1.h index 0d7fd761f1..b66a09c389 100644 --- a/libavcodec/cbs_av1.h +++ b/libavcodec/cbs_av1.h @@ -161,7 +161,7 @@ typedef struct AV1RawFrameHeader { uint8_t render_width_minus_1; uint8_t render_height_minus_1; - uint8_t found_ref; + uint8_t found_ref[AV1_REFS_PER_FRAME]; uint8_t refresh_frame_flags; uint8_t allow_intrabc; diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c index 84ab2973ab..e146bbf8bb 100644 --- a/libavcodec/cbs_av1_syntax_template.c +++ b/libavcodec/cbs_av1_syntax_template.c @@ -417,8 +417,8 @@ static int FUNC(frame_size_with_refs)(CodedBitstreamContext *ctx, RWContext *rw, int i, err; for (i = 0; i < AV1_REFS_PER_FRAME; i++) { - flag(found_ref); - if (current->found_ref) { + flags(found_ref[i], 1, i); + if (current->found_ref[i]) { AV1ReferenceFrameState *ref = &priv->ref[current->ref_frame_idx[i]]; @@ -439,7 +439,7 @@ static int FUNC(frame_size_with_refs)(CodedBitstreamContext *ctx, RWContext *rw, } } - if (current->found_ref == 0) { + if (i >= AV1_REFS_PER_FRAME) { CHECK(FUNC(frame_size)(ctx, rw, current)); CHECK(FUNC(render_size)(ctx, rw, current)); } else {