From patchwork Thu Mar 17 13:09:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34814 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp889508nkb; Thu, 17 Mar 2022 06:10:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxXquRAIOg1fXS9fw7fJtH+K21me1Hf1qCOr4wPu3YdvuICd3ZAY2QKPoxn3g8z36ZDWuU4 X-Received: by 2002:a17:906:d204:b0:6d6:df17:835e with SMTP id w4-20020a170906d20400b006d6df17835emr4275270ejz.20.1647522613390; Thu, 17 Mar 2022 06:10:13 -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 g4-20020a170906538400b006ce6f834320si3000670ejo.600.2022.03.17.06.10.12; Thu, 17 Mar 2022 06:10:13 -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=T2B3uuNA; 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 D6408689F8F; Thu, 17 Mar 2022 15:10:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2066.outbound.protection.outlook.com [40.92.91.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BCA00680266 for ; Thu, 17 Mar 2022 15:10:01 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RKn0FvzKIow8Xpvr+RnH38QrACSsYXQe3iOtm+9t7au1R/ocJ7fikpzkrkgy5YTDibHaM6W/AfQ5OZj2TDxbeLkLc3WGN4a2kE/zcT6cqkF0TZiO5GhWFnjtunV/97Rv7JupaXTB49n8PJfnmf9Nj0x2apUetAy8MH1xYyfY4YnVyqAUaPLZvmIV4teSg80M7xmrqOZmJmvzr/Ax550whxUZIGRrNMqrFbzruW5L/Rb/wDiJmlsLZsf2csdMTf2r8iI2gSFBkjlD/cCKBIe4/HBDNPRxCjWGTuNSFfMFBfTTT/W0WVLzA2Cf4fFRrfqhLpcoDz3Z9nGfQX62Xcv1+A== 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=CU2WHawUUxkr5HE00dPvPKREU50kU4InFoJJ79R7jNo=; b=BWPXHgNa1USpARL+uN0TlkgWHOBPRuFCJf23vFr2E5DaXIVmrfrcZvbguToLbyiWsh5dOLclIrC2fTYU3WTZA+8GBoDUHTZDdFv+ItwqR6JFPZFeIfRSiwk/ipJwuKQfCunm8oefarM9VW27mpEZt3UevunVFWIESeVujw8gz8tWsFjbQwKJwn0egxcaKuqkOhQiq9vJo4ZnSjpMh6jTGrYzHrhQ1Zrj52A16aU52tZWMeSiDIiQl4yxVhInui/NzEIOJZ950FfnvO6J+S0oFrx1tkGEWeJy1SF1h5i12o2y3SbGk+qEf+uwf1Yr4fS1YauVBwjyIU+OkZPaqXaLgw== 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=CU2WHawUUxkr5HE00dPvPKREU50kU4InFoJJ79R7jNo=; b=T2B3uuNAF0QlOU6vcjG6bRdtr704UVNo8/gLbpUwYjsSRg1TvjF3Qw5pVWueJ+QMQ+k/zPyP/28ukF6ZdN/RB9QLOXv7ekxbxn/IJzFm+cif0u2qxb+VUL5qorfrtzIp62lxV97gGSvCIuEnTqdxrAanki/W1WmtNyFgVyXNYMwL1OxGpWOhLl1zmzU+0IPgmxcALOScGoQCr2H/Wye2GjmOHcazRfqW/AuON0oOUcnqhPhX82gxqd0SHrci2h9x9MZ4c7mN+6IzhTZj+af0P1bGhBywsRuPWhwuiwOqHhgHlSD1UgSeUC206xYBhg333RdxdGEUaIP+jFbVKQJikQ== Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) by VI1PR01MB4077.eurprd01.prod.exchangelabs.com (2603:10a6:803:69::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.14; Thu, 17 Mar 2022 13:09:59 +0000 Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8]) by AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8%3]) with mapi id 15.20.5081.016; Thu, 17 Mar 2022 13:09:59 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Mar 2022 14:09:53 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [c0Q0JE6FoEozldLXpJRNb9A7ugqHEKxh] X-ClientProxiedBy: AM6PR10CA0080.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:8c::21) To AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) X-Microsoft-Original-Message-ID: <20220317130953.1140596-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 76191e25-6a21-43d4-ad86-08da081770cd X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQ6HuBZDc1qMLSrmEk7xLjP8JxabWsaLqzztMXhzEhsmU6EtHQfC9wLVk34E01R504nY1lGfWHn0GBjyG6cfn7Ok9H2kmTaW/OC/8wEF8bXvcbrc2H+o+fZRNk9aG4f9HJzJqNXZNuauCvlwwN6gjqRXdtfmbnzgXCdaWPSqTFGSzpcATKjpYq10/tXAY+J/+IoeRnEG5fNs50I6qOFl8R8jmAVKboZTPcs7PQgG2tDtOKNOKgwYAsQxuu9AxD6bzFZBtPzFS6l+6d5uun3flu8Q549K9AK5dhdYAZu6W/NioZ6HHeIhuTXE6BEEHS4ak51vti6+aglfjqRU9FBp2mnZAHUIAkrnH7HdMADkz0SCyGH+9w6j8QaDdKrAusur7Q+f9Qf/lV8czj/jzd2zer66wPRjEyDt5Z2G2mo0r2XfGrD8V+zjvUulCT6BOPp80iBXslW9RI7hMIHM+06A96yH9NDr3ZJjueWonGFLXHdhuRh41Wv8a2B6u7gpzzof3Z2DGxFDrmv70a6/shhOM3TtJD4qEpJKBk/Z2OXCj11fTkDufG0QCveSbSr2qFGeUi/BumTInSLfjVLv8UGfURMOdg98vPQxyzZ5X6n7poNaBlwbAAr2oC+o+4KCIXUQwOZtgphJSYbf9YfqDXbSiDJQQv8UWiX4cIKJXX1+Bw5ksqNd0QWOke51x1tqRBSzHKIxwt046q7ryK9Ytfjqsc8BU2H/xqF4PGpYV0Qf8RKOrDrbZ0kRy6AEUreqRrL5L0= X-MS-TrafficTypeDiagnostic: VI1PR01MB4077:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M0izCgoFBv1G2hbfYfuQRMl27E8cygzPCaZk3JlHT+JVwIPorOAKSbHi2vF21P4wMrE5Vdtx4DdMp38VLDx1KHKYlMasuSsVHpSAuNwlnV0tWlmfhnRkfoiYZeygxedcgq3xdVFwBKEA1+G/6zgkAOmgWkM0Nn+nKKL5xwtTCSJbiCFdd82UP6bsdxIXY2W3RTT5DUwEG9OF6t/nazcss7wh5YiKgtctkfQAQji5peVvAcAyJ0CmsaYbLoGoNuHMOU/JlEUUJ3krPln7dkouMqRdlQ8R+S8I8T+DTGP8rdTANJaGUnSPhzVpJWYVCS4AQNGJBP+aKNzF3Pn8igij5+pb2zIfSo2IoSF0v08oSGOpTGtcc+EPOT/JDqrKvsFJAbWGoH7WA3WKaOcoar+ZeJRsP8vWNtmyBWK7ZI7rbHhchqp1nn4zTAN3FaK2jGAzMbhrLcap9WP9/U/qOLCC02/wDgPMGLuOwQPTkT1Qoe+nDITFlrYk8eTmwdPV+DCB0cH79t/D0TdlRmTuU9vIKSJk7YNwClGHF3hTLnmz/O5FURj0g61/ZovM7IJXbiJbcfqh9lRTRJJTj/xVK4FbGQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MM4jYIIu3576Gej1ThigBFBsHU+Gw2b+BYlqMU28vKJTokkWOw+on6wTcoc00U+R7qdN/NXqUlsVpDlk/6rIb9fuipxzlpPLCm9btU9gGp/GH99T+aYy3RbDePmIT0WBoldhFfcYKE9bh/GGpnI1TF7wQ5fuJq2IoAS/lhs/Ic1XrAGPY/2lDPUuDrluj+xznIKoFL/w4jC/6KSkDnGofncuBCvEb61AWjrdY0rFkKxqGPO7rARQFAv9pApMtk/RYI2s39rPtd9yh0NKMYIaxjK5fvf17MUG01wGDkZ2EMOSP12lhhhCdNlaSsAuG13dycH2gVXtcHbFA3M7gUITs7MiH3Dr6q5Y+eDxaDvYtCKCWO8Ea7m4i5a8ObM/Qo4njhnQTBzBrzcqO28lNqv3/gTLcPK7fsN7AkPO/EGpGTu677B+QiLKI9RUlzDebUiw2JjFv1DVpTJXcT3lToY9XipHw/Z4e2ZpdeZsGW2NKGF/VcJqS1RFvI2r98EUwzxlFVXZK9A7iHtzCi7iJgoKVyGs8Ur+0hiV3QATTGEMbqRJMNBVMCeTn0GAH5twY+k5N2jDIGrrzb9K6nUrY2HfTLtkdFdmBHk/OcMR4nnA1uldzxqCSy5Ocwudx8YN42w85tmAmzgifdP4bWKyEzDz4uo8VTuJ38Nf2KC7m74niC3cfLVrLy2Tmy9iDWdnL4fePT1DoMc9FwNIOMbbuo9+kwQ4/CMFY0n186RNEGSECv0BUz/vh6GdcRLIpZP420QtBrisx3hc+jU4+s3b+YmaH+SjnHbXrnPKt8ow/A+1bzlaANG/iXJhTxfCpl6ld8T98xs9ao07xewINlPsrhLQLmxfwf2h5/peE6ltwtl7rThpWEuQdBF46O43g0QhYTLZaJL7SgMH69UCA3tU4FfTsTE1r5gREz2oDrq4gaQNqu+UK9+JtkgR40pdwz4J55zkNCggBEv+2Nje6U2UEmBQwyN3PHcnaDPRn1tG9c2gggFyG/aDZh+9Fd4dNESjk2hdgvaa9wcJH400g74cKHlFrLVuON75eC7tx9C2WqHviG7FabA2IDyDNUUdJknprh+rF80eD9Sbj8baByJDzA2hC6WPuVlhgMGriAe8hfJGs2mK8AnMrQS6HACJk2mVCfEmJV+UB2ryeYS3jqMzm5c7cbD2r+ZKRBcWLXlUEBVR6zI= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 76191e25-6a21-43d4-ad86-08da081770cd X-MS-Exchange-CrossTenant-AuthSource: AS1PR01MB9564.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2022 13:09:59.8955 (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: VI1PR01MB4077 Subject: [FFmpeg-devel] [PATCH] avformat/imfdec: Convert to the new channel layout API 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: bzWTok+fGtbe Signed-off-by: Andreas Rheinhardt --- libavformat/imfdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/imfdec.c b/libavformat/imfdec.c index 3ce850b75a..9ec52efbc8 100644 --- a/libavformat/imfdec.c +++ b/libavformat/imfdec.c @@ -874,7 +874,7 @@ static int imf_read_packet(AVFormatContext *s, AVPacket *pkt) int64_t nbsamples = av_rescale_q(pkt->duration, st->time_base, av_make_q(1, st->codecpar->sample_rate)); - av_shrink_packet(pkt, nbsamples * st->codecpar->channels * bytes_per_sample); + av_shrink_packet(pkt, nbsamples * st->codecpar->ch_layout.nb_channels * bytes_per_sample); } else { /* in all other cases, use side data to skip samples */