From patchwork Wed Aug 10 13:03:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37209 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp887118pzi; Wed, 10 Aug 2022 06:04:17 -0700 (PDT) X-Google-Smtp-Source: AA6agR55/ECWZ/cdM6njy0HoJRHcFTswHM3Umqu+pmbLj7rAd6WuR8X+GVA2NHv7cl38XPgoKmE4 X-Received: by 2002:a05:6402:11cd:b0:43d:7862:7c25 with SMTP id j13-20020a05640211cd00b0043d78627c25mr26851203edw.96.1660136657359; Wed, 10 Aug 2022 06:04:17 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hb32-20020a170907162000b0072ed60fb78asi4746791ejc.548.2022.08.10.06.03.53; Wed, 10 Aug 2022 06:04:17 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=EchUgoZT; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D321968B88B; Wed, 10 Aug 2022 16:03:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2070.outbound.protection.outlook.com [40.92.91.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6F6C768B45D for ; Wed, 10 Aug 2022 16:03:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c+sOW81ye2L1ZZ77CAMyziN0Q/SPbl2cg5XAlKjJeBoZVcFvS8N9cjj0SKmT7zl5q3bsAwVEDyE9D+ATmRC9Uv2ci+GJWPw9fx7nIkvx+wsE0+JVuqozQtNy0eUiIDjIeD0C8Favp2Okd0QGlHHrlumE7OvdmgtojnDTis54XS8LaJdhek2H472IYeY2Eka/AY+9rfi6EmRbqoioKPOdagnjhzOSbxKrvhMPbKA/uA/bmCwRmhDHhgQ2yZnJnyi2Kwr+i392c+tJmkd/hNdFYCvLH3MySBskccRWrNkRgQCiZoVJhKyar23PkCvPG4mVXq9uJt6ileqtqADPk5SF3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Vc+C4iYsRNC1cm1tPg0wfdNMOUF0+GvzuSROyayNz/M=; b=PcBsMpdLsc8Je9S1kby/7Bj6IPJ4hNHP5NvYEC2O6OBA0uwBzEFyAZn2mFGAhemrz1bzvhUNa6MFvXd8LUFbaukoBTYRYm0/D+aJFHv31+RarQfyp7pd9g9rXZRViAe0qGY8p2qam6jso+27mr2Vmwq1WyhZeC0UZ+QFLoCR2jRgTSol6pPQpeIOKTKUlRXGvWuCC1FXSehDw4ubXgENgPeg9hMcWhQw2tZf6izeF8l1hVwsF91SLrqq/PUM7ngJ5H6EefdmY3gJ4NwP5k1+VijAJ4oCMJIKIQ5hibA/FiRKbCI/60v9W6x5Nsi0HWqQtaF/qHpGqJhCzVUK0Nxs3g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Vc+C4iYsRNC1cm1tPg0wfdNMOUF0+GvzuSROyayNz/M=; b=EchUgoZTZNJtP2fvqxaaIk3EruCPChUZZ6ihWTsRXu3+2HM+X4IuN5YIwusHfeKhIbia60l0wid5/eJwQeHDEpf451ZxPZ+ckziUksiFhydyeBO6HCNetzKREhf+XTTrEvOXlL6WwNr140lupayZJ36coQOG8QpQKAljSUa9M9RfkfHrgrSDRYEMG2RJiGLwm8g4KyV0fHh23jiwrsbeV7TjpdOUB6881YgqPdebM45zUK9rKHAfUHUmwC4PszEbsJVnCtSyFXrdYWyN6Pq+oncObg0KxSvwWNJk9mvdCYAzLYYuXPhW4Aoero4QggGIOjizwh73x3Knyv3cGWqSYA== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB7PR01MB5062.eurprd01.prod.exchangelabs.com (2603:10a6:10:55::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.19; Wed, 10 Aug 2022 13:03:41 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5504.020; Wed, 10 Aug 2022 13:03:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 10 Aug 2022 15:03:32 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [U64NSrkk0jO4n93ZrQN0kK3ZkVofyy3u] X-ClientProxiedBy: ZR0P278CA0072.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::23) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220810130332.771273-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 23effe33-d720-4123-f6f6-08da7ad0bf5a X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UL12X1sZmzFxYTRkBpRkGYUFyOq3LNM3wrlScysoI8TnGPhp/cKUNZYd4wNarQdnCQuMi8B18EFOn/9GOCa/Ps4M3qQQKf4HrxiFIy+vpWjwWYWK/OQ13ZDXFw6d2n95WtHiKe2zQvhLKqVbB0BD2PTp2ZPbmRwh3eh8kXdIlgxbP+eq3Xv4FthIhfJy91cAy/lfcG+iLxsPI7diPhsktIh1aVTenkEKso7A5ZbDeR/Ob4vDXX+kPAwcEapBzJYGhpJjmKorznu5FDjMIlGm+A+ezjuMt0+vm4CGP0jD3QBfobZCuGGBq12GnCxQfylaS5WzqahO5+hTtvgOgSlIOz5lcroMFEbb0IZfInlJXOCkoSppnqxLxL7WphSHOYDu2pB7t4nssNbCVgy0Qnj9gKt3me+5XWqoqYrJJOSd6EHWAc5zPimSil0QZ81W5Ig4l3Act1dMCXTfqnlo2zXwBDu+nlKC1r+Ygz2WVeSmnstuOtV+JtyGJ2tOnaSlIHt+xyHSCh1QG91RazxGvdG5YQiKSH4l6Kwk+b1WB3Au/E6SIs9/wWeaT64Jvxz/RddxHwIqD3e/OoqPkUDLL9P/20SJRj/4TO18GZcT44TNkkYmHdQEOsxh+qs7y4A02DSv3pbE8G6LuIWrpP9Qrq2KL5mijnFqTAnbDHXkkIRcw29aZ7ATEHtFERV2KvnKNs7aR3igW3ea2Zg7g== X-MS-TrafficTypeDiagnostic: DB7PR01MB5062:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JWJmJeNoU7UV1uuft2UmyGpXdFoGfpBoS9hrscoWwymi99fqfFX77UqD0hP7NK1PvEw2+ty5lclYjSmkbaQboNYvdtKSlINbfhjH8lZTCTzLly/Z0Y6YRFsQcE3nNZ9umSpmYUp2RWghZCadN/pJBkQ7lhjBv3sUhgRdC2NAH4Ay3YFq0OnJvuCJhZBmJU0OgWQZwwPE3C7fFwY0ebin/msqy5gIO8wqYXnEND/ik/yAPBLUCpg2WZC/gImSe3C+W/6LrAzzQrEFSfTayKj0tLj4xlVaqKi5820xxTeiXjnFwB30yYGnjiG1DyScaAr1UAGyI2XqelvWNdEEaNu0BGM1SoDs//wQzeU+kkNbTg7Lm4f4bYjz/lwCoB8aZOSBvb+H9odlrB4wSWCRaureAcX4+JT46HC46Sf9/DAXvYzWgy1kdqBICo+l9Len7XN5tFVoghf1hwY5xoDFQ2AGByvfRn2abhmBniPNt87USmHlJpZULFGIfGVehGqThHMPfO0yfBl+dLvaftkaAsb1kc5BZDnsDYUTlHsb68jw6nS/h2kwe/v9Zb9l8yPUNC6BgDaRCaxIxhuS9YXB1Cto33/qZ5zKicDUf6gw/d4Kg9KSwFGWj4vpyLXt8n6X6fFxlwnoUSEiYb58oRzFrDuEgA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0aR5Zm2xFd/3hu4k2m7ck+qkQ2rAjEZVgkIcbdEdIuRLu+9V1jZDIPROETfnCIHhpO4Jy32Ccj9HEA0Gk2or1dw4HwW9zUIvBgo0P2+ddRZxnZbk0SZVgKlP2QeNy9MqS7NymbEdFPPKDplQJIjUZmHNf18EpCfZIC/NapPY6t4qGWPMcM731rxM0j6Xcxk8MacAeuLcd/zQ7AnwbGetFGQ/nuzWuoePPHea3dCAhNOnAbEnWQZ2NiSYi3FSy4W+ARmbnszSeySS/9UD/AAt1HaKfosZ25Juca7ergaQGxH541oYvPeDlZ0RRxWuefwVwfGJtZegJZt5GWWFJoZNQqgmxkFBDhggazrzHKAzLbzUjy+EXAxfPvHhQ6Zy4i6pT/z2HJh1oPEl+kDQ4JEOD63xK8d2SYWLhD67fBKEB9N69lH7XYfrmx8Zt6zdCDZnb9zoI/d834g8n9nk+qZLmRnN+vqElVVInVLgzuPiqjikVOWnAH4SGO7sUow1QpvZTCAeQyoq2YnyCkMS8TOjsmxxfGWGUf5V/ikwNhOxmG3fMGrZyvePtsc1409fBjkJ/dwYcKY2hNQcMM5N6C4dPC34B5+gWZ3DCfUWEqw4iOzSdaGPck5FSty1/CB/WyID8We1bUT8LPkVSimMBBgdRHxwHcq2oCDUtJA87CkOzfjl8wWTpP8rJYLgkbpWty2PfVHXxAVvqIeJS26+PkOyxQ0aGZkG/5oMLwMppcMifnVeRaB76mUxx9N0Egx+NXtby9MYMGQE/00fij8X8vh/jT1UBSugK+Kz5HQpB2rbG00iCrcQD9pLEasfssGoMtyPni1hbu1jGG5vb/Zxen4960Fc1LZw2pLh+tt6byoOzzdp7wR0e+4VtNa5nkVW8U+yYvfgUjsXsRD7NwPz0bTlIDaVcKBE7ishXU3OYOUFvzXkjZWI/V8tgPpxKP7H0OHlPxMuIlqlFXzItfynLbkkGhh+bLWLeWTxYy/i7u2QITNZSgONUVbg2IK3EURrsNjfcPUqh27b0Mzz+dcBhl6AN4/OWynddakCXRAXxiFSJjbbsbjcEhCgrZMX+Ej1D6dZqDJCYwFB4fvozc1a8EbwuPp+dqtLY2noH4moRcfMfFQ2NSDbFx2H+XHY28g5Pd3Wip/b1miPqb3CRyaz4Pud4I7k3fnYGh7Ec6FDPidWZvSiYLzdoIMsywgnbglBb8YyT9r5ZeP8ej9eUQrMguCpWo8UrbNpxpf7hd0BmeqyJXpLaru4n9p6yIBfot4S3xEgEVZlZn6FNn2yWN/NAImLe76YDVqwhOXaDUY1XaLc+68= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 23effe33-d720-4123-f6f6-08da7ad0bf5a X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2022 13:03:41.1667 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR01MB5062 Subject: [FFmpeg-devel] [PATCH] avcodec/vp9: Remove redundant reporting of progress on error X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: TjKagt1KDjQf Redundant since 5e03eea673a9da2253ed15152e46b1422b35d145. Signed-off-by: Andreas Rheinhardt --- libavcodec/vp9.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index db06acd748..621627ddc5 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -1293,17 +1293,13 @@ static int decode_tiles(AVCodecContext *avctx, data += 4; size -= 4; } - if (tile_size > size) { - ff_thread_report_progress(&s->s.frames[CUR_FRAME].tf, INT_MAX, 0); + if (tile_size > size) return AVERROR_INVALIDDATA; - } ret = ff_vpx_init_range_decoder(&td->c_b[tile_col], data, tile_size); if (ret < 0) return ret; - if (vpx_rac_get_prob_branchy(&td->c_b[tile_col], 128)) { // marker bit - ff_thread_report_progress(&s->s.frames[CUR_FRAME].tf, INT_MAX, 0); + if (vpx_rac_get_prob_branchy(&td->c_b[tile_col], 128)) // marker bit return AVERROR_INVALIDDATA; - } data += tile_size; size -= tile_size; }