From patchwork Wed Jan 5 21:53:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33099 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1109783iog; Wed, 5 Jan 2022 13:53:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJwkiHN8EGB1x7HTE08KPMAt/VT2bgeiIEnDgxAu+3eR3gMn0Tv3ca9KihuY73KsEB9sespf X-Received: by 2002:a17:906:2a41:: with SMTP id k1mr42552300eje.512.1641419632690; Wed, 05 Jan 2022 13:53:52 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b13si92913ede.239.2022.01.05.13.53.52; Wed, 05 Jan 2022 13:53:52 -0800 (PST) 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="K/TrmC0L"; 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 0F7A868AA82; Wed, 5 Jan 2022 23:53:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071012.outbound.protection.outlook.com [40.92.71.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 246BB680157 for ; Wed, 5 Jan 2022 23:53:43 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F3qzyhza0PwwHso5DkIhUZHLNJ0Bop0DSwBGfzow1L8smeEc9Zi3rZjgJs3xcEJfKlwX+aJzi3WYXGdtdoJA8ASwTxHyXfsLCH/D8WEG/rFKdLcaYhOICNw43FdfFdrBjP/OXUxUIYhLwm5tIBP64CX9bv3De+nm+sJh1cxkKLlWhhqzvaGH+brcieXZIDv1tr8rkB4e5DJitbuc0WMbEBQ0DcQleYQS7YDnxoemfCUI+5LWpJWMebZBxy334e4RmqJ51i+2Hf8hj+FHp5SupmzY9bdI47Lt4pFLZY7XGYjSAs/lZ2Q3ixyUCFEIC4egwZW9FgAo+DM+uJL0mUTZSA== 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=afDDQLRW7RuPdRytWIC8ujYhUbpR/h4UgoRKOIccnRQ=; b=SZV42vMtQgUubM4dFgjrJmX1DkbqVqrtdqa+fxrR6jASlQXooMU7Dtg8AlZnI5NnwCmXWFXxf8tFL6eNPeeAXPJsHoN4RGASFcN+d5SvUpXt5R/6QVxLrpKoDW8CBRVHsouSSioARrI3i+G4Yga+CgK3yVYX2UQUcQwa9jG6D1pgQCebAQ7ANZ4GE8Ai5WgzTjNc7CiKgdKCDFLE2PU0nr5FAh5gNKFpGgO/dMOu0eiAIOFx2XdJwy210Q18y5KjCWCmsaQsxeQDtLfbZzBjXFge+MndpayolDSOte3iCRgEtse0YDi6MSlVc53zbzhQ9OgFpXTRrhqpYRjTktWQuQ== 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=afDDQLRW7RuPdRytWIC8ujYhUbpR/h4UgoRKOIccnRQ=; b=K/TrmC0L5TYo2EwN0X/tpjiIGsaK5gLzzWx9B0OqB8zM5nsmAwCjkeltMxlZym3GMpU8eLcZGuml6pqneD10FnD5N0MSZr0Q87bfuGbb2oMU60gSJ8EKAJANmg+ev9Sawd7wJKhvMWp8JQWGm1gw8XeGnoJMSNUq1RkZd8Jaf/Yu7pg76BbKQuycKHvAxQdIZp7ccgTrjaxub24wNsW8u+VF7dPWI5cbaG+VZoCqIfFFRKLcdG0T8ITFel3eBqzPGI4GXb8jgTMHDadf5GL2rqgLKMz9z7ilbZ4dqwAKZDpGdw0RtaAPlzQABYS2c2ZiY9UkvzK3bN1QXNrrOdR5/w== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6450.eurprd03.prod.outlook.com (2603:10a6:20b:1b2::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Wed, 5 Jan 2022 21:53:41 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.009; Wed, 5 Jan 2022 21:53:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Jan 2022 22:53:24 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [a92kUcy7N6bD8gK2V9gzIlPgjaPEqsBT] X-ClientProxiedBy: AM5P194CA0022.EURP194.PROD.OUTLOOK.COM (2603:10a6:203:8f::32) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220105215333.812978-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6f9cf708-a167-4ff2-208a-08d9d095d649 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1JPpvWGnTy2aYAVQ6vlU/69DqYSJQARtO/08HhUcdkMHDEK/8+C5wFdD49m7marOfAUFWsSrtmBRd70l5kgeMc9uQZpC1TIhEk4fHIpjtrtgx6gUDAt69tLnQHfWFrHh06QJeEA1pVWGBXcSEsGnHusu78DR7WuwccyBnMpn22PNUMKC3U3cBvZq9ebzzNTH7OkhcJ24Km/ijdxzGXhFs7Iij2knxAp0WifeWfv5iGXCPxODvxWROlNoFcvvCbKG9/fyf+L+2Lg7E9wryM13EKQkw1ppupNSZVlQ0QtFafwMz7B9on4v3ULd1kE2W1lece6FV7gDDpKOevE0t2dORe3GeFW3vpZ9ZD6MNnjRwE/eVX7BExLuU3quIcNnIDHDynTQRurfStYVC7lsrwwRkjULv7JB3aotIp8jW+jXqwUITH/EA45XUZq1+HDiGk1LOV9yldcwPttqAoGKIThPBi5kcBO4nJQwEQqyRom6kafQ72WWsDZc9VMpSo1J77ND89W0K+354cAB7epKaLPobCxPAD8dp1+h7+ShumFNgJ2MB2Kq8HA1EjOzCxt9msiDOifI+Gy+q/qvjQPGiPdt5jEmCHxe6BnfHWQfqYEEQA4xbxY/Ck7XRfBXejasJKlSUIloqmePq63nGnJ06JEKJnq5bKZi96kDYWLaYK8rkkzdMQ7FAsJrOBIjxvtvInm3Yj5OUABd3xipadE4d9Jf7LzVC4wJjYxHirre1EPRQz+1o= X-MS-TrafficTypeDiagnostic: AM7PR03MB6450:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: j0B1g1X4cNro25uFDfBJ6bWOHtgAFpHjSBRJ4wY7zbVZBXA/t1w+Ppy7BzrpRWygssfLuI0qVK3M5hQ75IBOJx7HDlakQh2ofo7GLKECV+j8yqBFfmM5FBpd0D6EQTjuHe7fAXSY1A0/Nm+gBA/YdKzA5WokPWOu/l5y/0PZQmrI/y/+6W2wiVfIqfmChnoeB79qBTcUOUDq4YhyojNLJzWkwCijj7rJ2w6TCWKG2CSKOtuCed2uqCQ2UxfzhroRuBoXmlScveMtsM1RaFlQ2Oyi12vgmyb/XnSGP353lbgtlMf9x1a8MrpwqsaJ4Kj3s3tR5H2y6TjdX0A9D8kO+GBeELvx1bBZqxHhB+ec7+TcZFkHNyw6FEwTcZXoSzymt9J+C7Xls0vceiujCE007q+y438HwKlzsG91LBkNLC4ronHiTWRqlG04n4a3/Thc5kCw/kRFH2BSLK70O/T50hmAzig8RMDmHW7/JCBlFl1B5e4IiogNtklEYDjW24aGjEQc+lL8N/351S5FZupr57h1g1ZU5LqlCpCNgCuJiUXobm13cU4DyzHJTAXr7ZMZeJIdEXOhyIrtnDbAfKC9gg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3E/sz1DaHZ8Milt0s4MH1LxN8dIVY6+GcRFRzmF9AbXVkh0zdxzpRC1uYsgD9mgyku/b1YwLDNmIuYyBRqxwyXR8IfkEBj5mgiDTOJZugavCtikkqgIlVfYB2Oy1KWJ02ui7Pdh+bCtgeYm5qQuqiM5e5Hvyp8tEXoznZb2ll4w87stpVtbJvaEALZ7Y6oM48gltJNCjfcsElijanXSVnGhtmd5uqa62rFRehbgRt5Dgy1lTXnQ1om4YjnsWSeCxRA8lxhbmBWIHIgr4tGPYPfFYFqBmgZ7DlqffAW+iIZP5qDpEfLKSVw0ZXP6Z2HeBEAkwnK+0pQVle8MVzgeR1eW7a8UGz/JSkPd86fs8Ap4aiXLzensjG8txbrmViYu7maMXcFxcc1P2PksizT1Sd1YFYGqrpTxthgeYx/6+pOL77kAngbTnqyvJ7VNOlt+0v+u+qrvZWTXicaPayYgF69aO4mG7s0H9TTEdIRjdxxzlBe8TjZ2Tzrji42x8rc+6062WaFe5ZnbCnUszCifxQ9RjcVT+WAmKUhgw5hZNIPOvHcto66qjX+Sby8thQzM+3NMON+A+QW9hREooGltGzVNlxdExL1PRcYVP0SPmWLM8c7uMxRG3FeiOxERRa2ITa8DCn4bH6BY9yFPfXKqhxu+kLdeor+Q8frONrTWW7oN+3NYUL19kpSeGYV9WrcI0AbWRNRrSicL2nr5dSg7K2w3T3DlatRvVLyaOEXU1zZcEJt7vydj1vJqYpoWRLj7y7kvKywBNpY6D/lDdJA2KzfLxU6YU4EML240BzqClPl5U+IoirXqsxu3M44/zvWIv+uDxHRGmORHQk/HXHDIc/NTI6vMHMvT7J7m2TJAQinno0gWgrJz3m4bqPc7++utIIylyubv7nfsMDEfOL8QKspz+RLnVUBIjDJR5a+KkHeBNg5JCPDEN4jMqeqxWRpyQKi4Iywl82yE79rnbBD2SGQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6f9cf708-a167-4ff2-208a-08d9d095d649 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2022 21:53:41.5956 (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: AM7PR03MB6450 Subject: [FFmpeg-devel] [PATCH 01/10] avcodec/mpeg12dec: Don't set write-only variable 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: IwBI14VWbzuX MpegEncContext.picture_number is write-only for MPEG-1/2 decoding. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12dec.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 35dfc74fe7..6ad9fb245c 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1066,7 +1066,6 @@ static av_cold int mpeg_decode_init(AVCodecContext *avctx) s2->chroma_format = 1; s->mpeg_enc_ctx_allocated = 0; - s->mpeg_enc_ctx.picture_number = 0; s->repeat_field = 0; avctx->color_range = AVCOL_RANGE_MPEG; return 0; @@ -1092,9 +1091,6 @@ static int mpeg_decode_update_thread_context(AVCodecContext *avctx, if (!ctx->mpeg_enc_ctx_allocated) memcpy(s + 1, s1 + 1, sizeof(Mpeg1Context) - sizeof(MpegEncContext)); - if (!(s->pict_type == AV_PICTURE_TYPE_B || s->low_delay)) - s->picture_number++; - return 0; } #endif @@ -2072,10 +2068,7 @@ static int slice_end(AVCodecContext *avctx, AVFrame *pict) ff_print_debug_info(s, s->current_picture_ptr, pict); ff_mpv_export_qp_table(s, pict, s->current_picture_ptr, FF_QSCALE_TYPE_MPEG2); } else { - if (avctx->active_thread_type & FF_THREAD_FRAME) - s->picture_number++; /* latency of 1 frame for I- and P-frames */ - /* XXX: use another variable than picture_number */ if (s->last_picture_ptr) { int ret = av_frame_ref(pict, s->last_picture_ptr->f); if (ret < 0)