From patchwork Tue Oct 27 13:49:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 23244 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 DD01744B9FE for ; Tue, 27 Oct 2020 15:50:11 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B101468A558; Tue, 27 Oct 2020 15:50:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7CFD0688392 for ; Tue, 27 Oct 2020 15:50:05 +0200 (EET) Received: by mail-qk1-f194.google.com with SMTP id k9so1157499qki.6 for ; Tue, 27 Oct 2020 06:50:05 -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=M7H1mnF14IET5q2kU0rI3/jqrWULeKcjvx8mT97GGK0=; b=bXaxJfytOPPKRPBUpHDogvwezw9eX2CRhAYRqhR0xqAnhipOtdNAslOWrccmz/WByk bEMth9KMnsmbaMYfD5VxUUCtL7SGSaiCQB6w2MAPXEsFwYE8DmvTf+1G35YI4SkKnvsy nxkNkDWQfao2HyLkSEndoEWa1oe7T70cZucY3JdeVFDWwwrAGbRCginauWsrkTPgDjjV Ln5vszWLkYAddAXStEFdufvkP6O9ExKDc/oBDmfprD46IBWsYAIm78gVSSIa4JxRKX8x I1NIkiuJH9CdVxb76/rWprn5f36r+tjg9vcqn0oLdSuvpsR6pIWcClpijAxFztaZw4sF G71w== 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=M7H1mnF14IET5q2kU0rI3/jqrWULeKcjvx8mT97GGK0=; b=i/PtBAFf7kiUzXsWXVG2t0DoOgHditX+CNQhpTB7eI1Nfex9SeYTt7UtWDE6tGyRlg GC7uWmWHcnki0FsAi3caHasGdb5etBPgaA2OAhDUxTHHjYs1D5rYsvd+CX2V/BEx+Ezc JZBO5znCdyVIgE0dAqKojSuTQXyFHqeFzOCqjoRYRRC06q0ckZAAbw+IiWdnsISGvfvz j5RAyYnLH7V2B2f6nyGsAqMMKGfCusSJOP4ILub4klnt1xWsocPwKw7OJXdWpn9U/rLd TE5W8dDhQGl6u42u6JfcSoIVnH5HHThJjrKa/vRdXa524gey+s2LXt/3r82YA1vDr/r/ qB1g== X-Gm-Message-State: AOAM532DVGWbsD8Thh/EQdsgjiRNH9oLjuwEukK4sbgqd/ty15/h0+XE jQlI90xotzbrX/uAaXAGUdF1UcD0erE= X-Google-Smtp-Source: ABdhPJzNwnWS+8QevaF8kXcPNuTzHO/N/2NWrVafUqYlpWajspOdX/lOWnYsQWvJnTqD/bRJMXB1VA== X-Received: by 2002:a37:de02:: with SMTP id h2mr1918831qkj.99.1603806602612; Tue, 27 Oct 2020 06:50:02 -0700 (PDT) Received: from localhost.localdomain ([181.23.86.134]) by smtp.gmail.com with ESMTPSA id r12sm652715qke.87.2020.10.27.06.50.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2020 06:50:01 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 27 Oct 2020 10:49:39 -0300 Message-Id: <20201027134939.189-1-jamrial@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/cbs_av1: add a range check to tg_end 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 6.10.1 of the AV1 spec states: It is a requirement of bitstream conformance that the value of tg_end is greater than or equal to tg_start. 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 2df5619279..63b4db7853 100644 --- a/libavcodec/cbs_av1_syntax_template.c +++ b/libavcodec/cbs_av1_syntax_template.c @@ -1785,7 +1785,7 @@ static int FUNC(tile_group_obu)(CodedBitstreamContext *ctx, RWContext *rw, tile_bits = cbs_av1_tile_log2(1, priv->tile_cols) + cbs_av1_tile_log2(1, priv->tile_rows); fb(tile_bits, tg_start); - fb(tile_bits, tg_end); + fc(tile_bits, tg_end, current->tg_start, MAX_UINT_BITS(tile_bits)); } CHECK(FUNC(byte_alignment)(ctx, rw));