From patchwork Sat Oct 7 00:37:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44189 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e24:b0:15d:8365:d4b8 with SMTP id gk36csp160254pzb; Fri, 6 Oct 2023 17:36:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFsEt9GyHHwPsk0seDKFxAzqztkw3ZFbp5DhRpQ2qSflvsjI10ZkCWUYLQBQja1d1Fmuq3U X-Received: by 2002:a50:fa99:0:b0:523:bfec:4913 with SMTP id w25-20020a50fa99000000b00523bfec4913mr8196279edr.0.1696639010457; Fri, 06 Oct 2023 17:36: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 ca13-20020aa7cd6d000000b00530c46e2b3csi2107571edb.258.2023.10.06.17.36.49; Fri, 06 Oct 2023 17:36: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=rpR++K8i; 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 A794C68CACA; Sat, 7 Oct 2023 03:36:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2046.outbound.protection.outlook.com [40.92.89.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 18E5668C919 for ; Sat, 7 Oct 2023 03:36:40 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bT1HmU9o0AsmeU3KUct8aKD9HVigU9ROwBu2jD52TJWchBGJWp6p1RJiihslvpn6O2OO68Y30vAryd6txqY2LtK6+/rkFWjkNMWHcZpLgOUsCJ02BcFaPAJqobn5qDw829oE8Rujgn/ABYOr5eQqsW7ia4x2b6CTlkDUKPhJNhOcPo66jcVFh1uYqGlzfuFSqu8axuVFSM4og5uArbYw013UsOnfmDn316WkgR4QPXSoiMKzq9QQKFJhtTVqJRdNbvbd06N1SxbARmUlZgspX40Yr9BicmF2P+SCYO1cg1P5XxHCHfYC1NT/oN7SPboPYVotd8V2EplWGAuresoaHg== 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=2GQYN0yh5uqJ81FPRN6LytDTjR3+fNRS2py9QzIXC54=; b=guk/cNLiZO6itk6ZMYE3lviH7I1sjGIw6hQjdXBWYDyLpBQsLROM4KCTYArY5lO90+YZ6YXxJHGLFIqlFmzp2CUcw8p+HbQTKsIgj2s/AMkgC19sntRkVe78X1TOBBVUASInlHbih5W9b5+79EZgtGZ1TIH7bCIECgDi1cX1nXOUkr6QyIwHtgec+/Cl0QO31JVQLmufqEVDPQ0tGmh9FMIkAvUilb/V6/oOLqJUdfhQonixNpC4XY/oyZNBAIMMaDxVpPqVbi2/VijqoHD/8JQaPQHhFFViYOMzPAThK8dx/PGCJnaBmbDpuop1Rh4V5eIzy7b9q50+f5Ude2+zWQ== 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=2GQYN0yh5uqJ81FPRN6LytDTjR3+fNRS2py9QzIXC54=; b=rpR++K8i6DAM9ai40kcnq+QDSwmVx4q+bYY/LDeR1taBnzL82BooLQ+IRtWXmOlYPMRV1gbvwbDP4HFdWdiwa4bNoYVmLXAGu3Xnl+6niyrvXNESbzMMhyt6OPGmt9kznmi1jpKWu47AsKd+cyOJo2p/YYJonj3DgeHqIzVbCuQDJhn3lDOPW2mltVseQixOG49XbT+2VNNyOxA3stoKu1WlzB0ftPksIrRj/iqZDIEosGA8os8GYVKuumrP6dn1oTzQU6AaOnH7ajNNwyIfn2ScCb7k2JsAID3p2o3jqOKVfCFn93FELDU/fYqRjx+C98gWssfMZ9/h8IOZR2FiLw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0050.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:14d::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.37; Sat, 7 Oct 2023 00:36:38 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6792.026; Sat, 7 Oct 2023 00:36:38 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 Oct 2023 02:37:39 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [RQ01e9HT4zBZmapGbOxgFhf0bFXVgQqO] X-ClientProxiedBy: ZR2P278CA0018.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::16) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20231007003745.2024727-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0050:EE_ X-MS-Office365-Filtering-Correlation-Id: a9837caf-2b8c-4d7e-ad31-08dbc6cd778a X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +P67pdWF3GpAwE9nuoM0me25wopxlCb5tq3KnabBXtImqqpKsiNYH2RoRn03Y3B0Kz4aXc4f3RVUd2n1okPD13UZQowhhZEM6wAfn1wJLThBz8wFlJ7ItcNEm5DZh3s2/D1CncL8wF+RJkkcY5vv1I73Gl7jsOaoSYt1PaF7RkuNEoLofhSQP/D/l69KybfmN4kWhMBDeBC59VOxOKiyXNI/unI3DU1QFWcxyitBRQmbDbfpPBhe1tPwq1VD/c9i7Vr9Oz0z9yPeLZEIHwgQf2thTo+FDLqWZOnds8RPoB3pNLDHe+XNrOH331gKqZ70xsmzmcH7/wmLnqPQbsbEKoF9c1bEJ3Vy01C1bELNLMSuHJrHH2FoEhx3iGFXUBLOpFz4XRJ1a5tosq1xch73ssX4+aYoz7j0H2sZdFu4oItY8y5K6Sfahgx64lt3jIXCeOdo6CJU2Uas5zjd/HPv0oWmBdu85x7sebj1LPaaIXjHopI8jHBncVRZrw74wwwncfdwxdKCeNq4xqarc2W2wcIpVlR36med0c0PMkuJqpKYUfWcBde+hGSp+CAmr7EivxZNxKqpnUYdLQSm3pdsuLZ/5tsppvEqT0+g9SCqjzljrz7esThAgiNRr3hJNOWY X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vBX3bqFImrUqN8OkQkaCGmTqMTApdkMotQXNuh1VuiONK6O4KZo9PZsQe2ntemY1GaLnwAnSerIg/5pl+cMTRM1GoglzYPnQ5BmdKz5QPGE+C6fkl0xsRJIgDgdVt1WgXeImYWLdHFFUSkk78hl3hcyf/lngnn+DutcgGKy/gLQGk7y0OYWMWfzYnwk5mGHHWjsUDKfaSCrZN01kEaWQ5b4iCK99aeEjTcz1kBFAa/F1I2aq17n+Pra+CdvR6VZRF2Fq1xjPexMojTs7PwdvH4mfWphtARkRuMjkggC4M/AmOQwinZ2WeXC533VxWLbeqEzgArovaicaJTyXsGgkEvJgeYxNiCFNvZRLuqUIUhF+QbgjU7hdQ4N/aQUty6Zk27f6eDgke8ee53wWzUTPQXpw0nm4X/BbL2uSOwGxjZHoGQBwGjhq5z6/4mCVGwhHNME32i2OhT5DSjrt9rGun3RowgriiU4vfLFeVpvchQfMAM0cKIMIuDX0rKR4G/CldSWIQTZi5aYU/B8weG29r8QMPZqZsrs2dAAE4c570++fdZsP0JraVVf3dT5HXiTG2Abr/rbnSQR/AE6btOJ+quzyRf7lzBEBVAJKlWT1AGmX9Ajz4tGAvXbevMN0TiDxueYp4CUvbfvkhgH1Qd28WIb3qta+mPPxwNl7x0eZZQoZp6Rr3/0lxoRwg2f1tScHMfKv+1oJQ6IUvdvp8ujIYVFxa3y6suUc2iV4QcZOUVMqA5koQ4VBiQejUq9NUFAmydjw8rAQfKOMBm0ekYISkEGCw93QJ+kWJkqNCd0sLfJRtrtkJGwxx032R/DAx/adTbloHXMRP1h7px01demxt/23zD0WRlzdpvn2KtJhTNBsJJD7JEoFDK7D/iTsj9xz72OI7NePg9FNEIPuxas2Pqw/hT1myLfRd46jdikcgraMn4SpEtefEA9JK4KAIyAOmvcsU0nbdsQgpH05SXkUV5eD7OFbWQIX3ZO3uL3jxb5ge7n6txROjqO9+1zHxB6lVBfjkOb+EXs7hVlb7Z8XzHU8Vm7W7YJgIwolAQy5xVJf3VdU/LmRP2B6Wja6mZBzymwYU7y+4vomomcNjPDitHTZ4TZAqQuXJnyoW9/EqDIOw2yenj0R490K23zCcbo9jOUgd/ggcN9FdD4TxFMjjxk2oF5s8pSfYcqmAKP8P5mzJYyoCi4cDKOBg1HaIHDeqK5fNAPAiPANmeRAJ5C0z2jaDWD5quChZ0rGgsOhnkILvxDbvvpa+lQFnWIAt21Q X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a9837caf-2b8c-4d7e-ad31-08dbc6cd778a X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2023 00:36:38.2003 (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: PR3P250MB0050 Subject: [FFmpeg-devel] [PATCH 1/7] avcodec/wmv2dec: Parse extradata during init 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: NvU+HMu2a86+ And stop setting picture_number which was only done to not parse extradata multiple times. Signed-off-by: Andreas Rheinhardt --- libavcodec/wmv2dec.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index 469b2c4b2b..934bf56b1a 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -203,12 +203,8 @@ static int decode_ext_header(WMV2DecContext *w) int ff_wmv2_decode_picture_header(MpegEncContext *s) { - WMV2DecContext *const w = (WMV2DecContext *) s; int code; - if (s->picture_number == 0) - decode_ext_header(w); - s->pict_type = get_bits1(&s->gb) + 1; if (s->pict_type == AV_PICTURE_TYPE_I) { code = get_bits(&s->gb, 7); @@ -333,7 +329,6 @@ int ff_wmv2_decode_secondary_picture_header(MpegEncContext *s) } s->esc3_level_length = 0; s->esc3_run_length = 0; - s->picture_number++; // FIXME ? if (w->j_type) { ff_intrax8_decode_picture(&w->x8, &s->current_picture, @@ -578,6 +573,8 @@ static av_cold int wmv2_decode_init(AVCodecContext *avctx) ff_wmv2_common_init(s); + decode_ext_header(w); + return ff_intrax8_common_init(avctx, &w->x8, w->s.block, w->s.block_last_index, w->s.mb_width, w->s.mb_height);