From patchwork Sun Aug 23 16:06:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 21849 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 90DFD44BB6B for ; Sun, 23 Aug 2020 19:06:14 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 73B80688336; Sun, 23 Aug 2020 19:06:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4BF37681866 for ; Sun, 23 Aug 2020 19:06:08 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id p17so663857wrj.8 for ; Sun, 23 Aug 2020 09:06:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=to:from:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=/Wa5AKABfXsnRMtl2/MLBN59ST0VTWlsfavQqkbTHEE=; b=pjincthaB/PiFrgpDAX582LCLpeCNk6pkPAg+6JSwIRkpSKt/tHn1UdL/pjQgs3qi1 1fY3HBOtJCfRqFYA2HTX5d+KoPtkBoJbcROMADs5g6PNAG7vvp7mPEUiVfniQ0wl2YlU H7AUinoRGWVaM/jaTcNfbHHPnTVkZGopk5C9aGYuRr9tO1nlRfj93Ol4quQW4Hxp7PRX L6IcciN5ppKmetsEjkMR0zHMO7EiQKBZsrShWOKhgSC3KA1ELAqR8rzt7xVRQmF3rgG4 ooGoYN6X8DQLCQGZe01mZW36bGjzYA38Ge4oKaZPB/F9d807IV6lpEIhI6JBZkb142ke UbjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=/Wa5AKABfXsnRMtl2/MLBN59ST0VTWlsfavQqkbTHEE=; b=Z8bmVaq+pw6Cm7MFmAIRbOFfwc8yQpB5oDbxM+QfAJzFMGkB0CkctUVqfJdD7B1TuL ZxSvN2xMBYExCUgtbTK4hTTtswBXB3Zzooq/7BJhG2aRCslwSnfnPwgokMNH5k4b50gP 76hQ8mwhgz42w/fbX0lHMSwFzmXXnNpw6r1eRJYIKX8DXQ6Wn1wSeBmGhVe9AOaUckBv lMCMXnqQNgYUQpNMNXEkboK5rNx7zYanWNt3GxBGHN68Hbe7oRdD0sVe3B1IHbGRN6jb Yd0mxLbHbzTNeJVJr/rcgALBL6CBZ11MIYXbQ0xElPhly8vGoxyqlw1mvrILXzZE1Clc LmHQ== X-Gm-Message-State: AOAM533zk0mmgtSa0jRoE2JmMRkV/7D4yLgcyfwtHZmuxcYUfW0mdpI8 d5mjvAphhlx3ygCyxAb08tGiR0PK4ZhoNQ== X-Google-Smtp-Source: ABdhPJzvOMDfVH1WEinhGoix6QwyUwPEhgasyzV6oFJUJl7LtIxBgT/H+fUEPVKnsItsPqKATVCgsg== X-Received: by 2002:adf:80cb:: with SMTP id 69mr2191883wrl.313.1598198767440; Sun, 23 Aug 2020 09:06:07 -0700 (PDT) Received: from [192.168.0.3] (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id r11sm17777607wrw.78.2020.08.23.09.06.06 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 23 Aug 2020 09:06:06 -0700 (PDT) To: FFmpeg development discussions and patches From: Mark Thompson Message-ID: <0f2441f8-e2d7-1a1b-0e56-4b5f0cd53556@jkqxz.net> Date: Sun, 23 Aug 2020 17:06:06 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH] cbs_av1: Fix test for presence of buffer_removal_time element 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" The OBU must be in both the spatial and temporal layers for the operating point, not just one of them. --- 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 2c976a9574..a281aba8ac 100644 --- a/libavcodec/cbs_av1_syntax_template.c +++ b/libavcodec/cbs_av1_syntax_template.c @@ -1390,7 +1390,7 @@ static int FUNC(uncompressed_header)(CodedBitstreamContext *ctx, RWContext *rw, int in_temporal_layer = (op_pt_idc >> priv->temporal_id ) & 1; int in_spatial_layer = (op_pt_idc >> (priv->spatial_id + 8)) & 1; if (seq->operating_point_idc[i] == 0 || - in_temporal_layer || in_spatial_layer) { + (in_temporal_layer && in_spatial_layer)) { fbs(seq->decoder_model_info.buffer_removal_time_length_minus_1 + 1, buffer_removal_time[i], 1, i); }