From patchwork Sat Apr 24 11:14:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27259 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp2035298yba; Sat, 24 Apr 2021 04:16:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyzEo6M1PgCLjJWOQ9/sQQx002YuvBxxtVeOPZj/RAOubBgZXNK2eDOAkngRFuajqRrJJpp X-Received: by 2002:a05:6402:42c3:: with SMTP id i3mr9806079edc.270.1619263010947; Sat, 24 Apr 2021 04:16:50 -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 g20si7413002edp.268.2021.04.24.04.16.50; Sat, 24 Apr 2021 04:16:50 -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=HbE+OJSf; 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 E388C68A0F3; Sat, 24 Apr 2021 14:15:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075028.outbound.protection.outlook.com [40.92.75.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B9317689D6E for ; Sat, 24 Apr 2021 14:15:39 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HUn6RuDcJpj7HhJ4j5W60dzTO9G7uk3PieBwFwTnukroH9mIf8PTNpMAZ9OYUNl1d1OnQrGZ0rrE84+FVKfgtjtz2hV4OZxLJvexP3+dPqpoUXreibzX7lE/wg/ING3FNJeTgDyKZ4nRy0FFVRyOk5wNwDVsSohmK3hdZOaGzwzfQTXcwSYcwAqAdMwmtoxdQZJI4hdAPzCD+ahtEfi7ukaMicRd4AM/jNYMICFEP6urBjNIPqBN91dj1tL0qWfO1G51PrioymY8ItWjJBlmSDQNU4NMpudODN6uITObbb62hVryNCTwApKOLsod0nMqwWFKQNaGXci2yeqnyWUuBw== 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-SenderADCheck; bh=NDTcyXD/OgnVItQFiHj6FyVVhaMVQyhhMtiy3r8TH8I=; b=ikNmcgmDCjIzsUj8g67JOGbEAPPqjKNg0nwBWYjF+Wci16A5aekOzf6+DBTwxTNtK/92mLgm4fccm9OCd8NkxEIvH72jwHGOODrNBl83dCwsNCh1qP6JCy2y2kYNZpVShMo+cRClsHUKFNRGf43ryqZKctWSh834SnMfBYpduRAgF92LuFJe36v5MbC0h0/cvGN/qWyMOP+3xBiHTtMRComIgA2td4O/B7YC3F/psm3bfMnj230Wntt9Fw7KjZWt/G0ZBzl2dhLJfeUyB5jhWhsb0AGT50GF3yNsMRPADGjvOUiMzSETHjwqSySUlVR1WEoyUg3v7+yE6IO1umtATw== 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=NDTcyXD/OgnVItQFiHj6FyVVhaMVQyhhMtiy3r8TH8I=; b=HbE+OJSf8QNoK7E9PhHxe0f9u4sVfWKCRvGPUUeLKPfn0gbxial1iVCCRTotrQ65RIWRcI99c1CRPYIiP+ZuGUVUODl2yWui/mGEqoZ0QpaDgE1oW6ti2034HVWO8Jkfe8+4Ee0ufuPACoRo5vqSM7EJxp77aCmoICx7wQ+s1BmuVg8g40I89JdIRG974cnEPqvmHuCDzxchXuLmQPHDfAuggsirAAxn+MPJinLK6zQAo7qLmL2YCJ0N27A2LwH6+xwmoWfwZcWt/xaP+lFow+BFcd6BjoO6S1WzyuDRj1BsZiXinyfjIWT+j0AcvN3GzlISb08k/IoOWiBF8OJ5MA== Received: from HE1EUR04FT042.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::43) by HE1EUR04HT105.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21; Sat, 24 Apr 2021 11:15:37 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e0d::46) by HE1EUR04FT042.mail.protection.outlook.com (2a01:111:e400:7e0d::159) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21 via Frontend Transport; Sat, 24 Apr 2021 11:15:37 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:0F4A4A60C6C0B8AC4C07D27A043E72400AACB93B020F42A35F38D58B1DF1EFC6; UpperCasedChecksum:FA09930D6E8618FBDB384DC210240165E90152B865F4D1DF94BAD7EBCDD92A2E; SizeAsReceived:7581; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4065.025; Sat, 24 Apr 2021 11:15:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 24 Apr 2021 13:14:45 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [yiA2yFPdcluQ8N9getTGikGzxop7KUg9] X-ClientProxiedBy: ZR0P278CA0160.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::18) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210424111446.30338-12-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.248.86) by ZR0P278CA0160.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21 via Frontend Transport; Sat, 24 Apr 2021 11:15:37 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 3c6c6b07-d140-4a65-31c9-08d907124980 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUdbPdAvhx5/8x6B2xiI3vbmReKMNocgKGhC2gqRs9eRPL1YEXpIPACCm9+TcsNn2GsGMTjabW8vIlfmGjhhwwTgD1S1gKZZ4hFP+u+8s6FCEDH8y3GoHBCnv3SCR033SEsThS/F15XhYfWTrl0mK3nMMx2Mrv31xgWT8Q5WO3l3MRG2lr2+M+a1L9MUUVDMLpw/pZmWGpljYWfjsVHCZI1LtkvvzSot25DVmTnL2GXKqJIPQRUnSrGUW2Oz1bnyeJQ55P12e+5JRWB7F76XFVKlrQ0ZjBZyZgropDdU/UREoP9ZIVAYTrfV/poRSeQfkW32GdGtFy5B0wRop/BA82zgtbQhW4C9wJt5mpsxgweE2FEAOfhyoCbvLOzw4sJbwg/ACFGtF7PNzpdPl4UA2IRxysv/618PpNpvUkx37a3B5xiZrT0TEx9iwHymc5YCPahbKSy6o7ziYZGMyf6hZKhcbIKzar8IEvaKLAUH882/zOuiick/cyzTeZbhPtqTOJjD1bYeQ1pLAUJ+EBP1BnZniMzV4uCyLoB70UUbCc0b5ZDW3yXv9NaJ7Q9mWFNmkxz2xxW4Ir+FzV9uQSqPm2Xk8HINeHYJQgXYMl/9GPoMEj6rk5M+i2Vm7QHXgMP2tI54vVUKbtjqOSgoz124xImYHBsi96dnKtwFmUllEEeDefFueAPhJ49XXkMgKkLtJvt6+CvMlGL0zjFE6urQOi5gh4AzaBx3Oc= X-MS-TrafficTypeDiagnostic: HE1EUR04HT105: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: m7KoOgL/hNhfeSmnx9LBMqIRMOG9KMt4XZ4poX0zwHxauVvdco4++PX2+HeAStlflVNDfiSKYrHOGyewRcG857wEhsLGtLLANn3SfsNe5ZegcTM1Aaqg7wdhWLSwpRiJV6KkGGM3cfhcMVKv+fm/YPzEqvWDCTWvx13yYhjBUCfwPaRiZr/3HbOPT3i6A7C7XJzSto25y8l6FNxhDI1LGAC3Ecoo0+JTAvifAfBlu6QzWw8GneGX5F8dj3pL/D5I52FMEHdcWTi9POHbrtMX6LNv7BDdIrSYRIDBkRyvJalvkl4eu0E+FO5uUikT8YA4ciVfu9muOP74gWCN8smPVdCNAecmQZdRbyPFjJO8i9886RWa2EBrNzwoj53WBs0heuoNukkW6ta9pQLhFWbqFA== X-MS-Exchange-AntiSpam-MessageData: +1f4QgI7NfsqbSMAL+BAdVlBGlYjVr+8XMuLa6td4Or4Wp4xPt6XSgfIv3XyA5dZATryV7sAKhB0J1UGl1GbWs5uCrjGxIJh8iiYn/PJSqIBOkWvPCyXOZuBVM+a9O95xtX8Tf5XFtltWJ6g4wx9HA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3c6c6b07-d140-4a65-31c9-08d907124980 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2021 11:15:37.5928 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR04FT042.eop-eur04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR04HT105 Subject: [FFmpeg-devel] [PATCH 13/14] avcodec/ffv1dec: Combine identical checks 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: D85th2fg6klT Content-Length: 1316 Signed-off-by: Andreas Rheinhardt --- libavcodec/ffv1dec.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 060efc25ab..9a755937e6 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -234,16 +234,14 @@ static int decode_slice(AVCodecContext *c, void *arg) av_assert1(si >= 0 && si < MAX_SLICES && f->slice_context[si] == fs); - if(f->fsrc && !p->key_frame) - ff_thread_await_progress(&f->last_picture, si, 0); - if(f->fsrc && !p->key_frame) { FFV1Context *fssrc = f->fsrc->slice_context[si]; FFV1Context *fsdst = fs; + av_assert1(fsdst->plane_count == fssrc->plane_count); + ff_thread_await_progress(&f->last_picture, si, 0); - if (!p->key_frame) - fsdst->slice_damaged |= fssrc->slice_damaged; + fsdst->slice_damaged |= fssrc->slice_damaged; for (i = 0; i < f->plane_count; i++) { PlaneContext *psrc = &fssrc->plane[i];