From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 6B53D449AB for ; Wed, 4 Jan 2023 17:18:13 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 59F7B68BCE3; Wed, 4 Jan 2023 19:18:12 +0200 (EET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2017.outbound.protection.outlook.com [40.92.90.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2FC8768B914 for ; Wed, 4 Jan 2023 19:18:06 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m23KJp3zFZvqXLSacsmEbtiRB1qI7ubR1z1Go/7HYSGj77Uj14JqMjSFg0Q8nbYMwB/jtoxudw7T/SjSxQQYLRUXd05mMfIY8D78vnxpwLHy3FTjGT9S+MooOGGGKHEjCshWwnqJ3wVVhtiEyrq9y73Wi/4nxov2Tr0qJ48aGjN2N8c8tYcQ5TyGiyaX54/Tml65M9+m+mjcANBnNYuE0twS/Nx3UIx/YXbbwglarwwRQQ7W4w07pgm8H0cxeoIyRMvYU36T0KqrQNLbnqEyNq9AtgFP1+IjJp8VCkK5PeB97IKLZEXcfLPi7i1iYN4h3rfyxXwD9fiWvWqQQ3MFJQ== 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=siKuVxyz40XCh1sK/oVgBXKwky/wHUh0WU+2w3RG+Vs=; b=CgGAm9tCiL3rCuOVFfJw3k1oEIfcaDoP5/igqTUJhrjWX7GmBzjAp9QHoIh52jV6PSrHHIAufu6h1I6f6I7EbCNhuwaj7RGkzuCXeTeJNpYyAmN5qvm61PAJOqQ2FW2ZpKVrojxugsvt5haZ7ExzNroNMifMzrrS/C1DBmKs/FZMIYPssHs1PkvHS2PLhDVHH4aOYUonFjXs5lmtSDXajdHfDNCg9UHSnWXmG7pxk+jS7Ipd+MQ8E6iqOFRD5e6843PL7ATx7zjKZzTGtqS22eXUHK9I0m7IXTqVO4dZJ11NCJS2gqROo6Xlom/1q/M2Iv/sBT+Gf5lmGYeV04i+yg== 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=siKuVxyz40XCh1sK/oVgBXKwky/wHUh0WU+2w3RG+Vs=; b=MGrHqF2RclI1lK8/R+c7LycrnzXB1pF2KRhfbxUt9wgMyJQUY2HE2EkN8Of84NiWYSSUw4r/1T4GuB7xmaqOXdftGYmzX0WSJ4l8EKlUbA5frjTADklET3w2sI5/sDtvx+GsEbge9PEyUlwGRvEKa200v6uGDMAje3bqsAPCRFTucMbluJrc7HbB69EGlBmn5jaQDQe60GbN8J9O1mkQiZn7qYplnVz63iTlFPU9cHiCOlQaCJE60blUUoZQLUuzjxIWGvEIKekHhYWnc9ef56hP9iG0v0yRNgcDDAX9BGUOcyZuow+jp2Hpal4VDSFngIY+4LbvA6m071wFQ2v0/Q== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB1010.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:5a9::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.19; Wed, 4 Jan 2023 17:18:04 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::c37:cabe:316a:60b2]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::c37:cabe:316a:60b2%6]) with mapi id 15.20.5944.019; Wed, 4 Jan 2023 17:18:04 +0000 Message-ID: Date: Wed, 4 Jan 2023 18:18:32 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [ukxLIHDA7lef9q7DKoB5UGhv8YW5oGIP] X-ClientProxiedBy: ZR0P278CA0070.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB1010:EE_ X-MS-Office365-Filtering-Correlation-Id: 80fc9c28-8083-41cf-5a32-08daee77a3ee X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GDSSS47UkEpHf7wpX9u48dmMovym4FPgv9p99f9kOV1fn5XyLQCRnW1fqBC40fpvAOvsG6ncQbncS4Y7OMhH/OqX3ISTj57S6NbBuSy/ijFs87o3qVIQOCadzk8bQHKzgM6CIEyo1WJ3VGtV+/n6Xv/1oqWULhe2XPjHPX3Qpy+cfg+obpg/CzIHuNOInuRR8IJlLk7WSb57/cu9htFjQ5Bf0z46sdof9PFlB/Z1/swRLqqf19YuZwaIv9L8bXZBIxXA6CPSrnoczUGGDThshWEH5NCmHpmvZQp2BVizgAvhiGL9UK7CnaTEhrr+o/bdriQyE8B3rONa8wEKtSJW7ChA3a5z3H191bq1RrqOVh4WW9nHLKb11jH3PWdGra1zWJwJC/bu5BpFu0KPsOyhPidEwFzcobxLUeCU5IHGI+h6BX7wFlLttaDCKdEUfan+w4aJbaFVX7rwMvUyHeSM0LT1kcjQ2WG3XHefwHgjI1zab6khduwhvHH6fYdttTIw9AASRZ/KuXL53djgPy+809zvq4FN+a9w+J52FL4LpbQkmyyySOn+1DbO/zAixbSX0e69ltWUK1TiiyGcwW0wD4lsfCDlWcXEv/o59rWwcwpNhCl6H3Ncg7GIPyusGcOcNS6ItsUIwczbN7ry7alJHy4hOXrLiqTA70KXq6M+DUM= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?azcvTWdCT2NmWWhDZWJHYmwvNHE1RDMxRmJUYkliZ0dMWVBpMUh0T3d1TUJ6?= =?utf-8?B?Q2hRcG1SMUVkaG1DV1ppUDRta2gzWkZVUWZnYzdpdFU0bXY3NTJvdEZLY205?= =?utf-8?B?bnpId2VPaXpXSkxraUlVc3N4QlNpYTVXR1dUV1grMm84RkUycjM2NEg4cGhw?= =?utf-8?B?bVcxdWs5L3RQZWFUdklZMEc1K3Y2dlY0S1hmYVFqWmVMaXVvM0RpVEZtYm0z?= =?utf-8?B?M2hhUEVjNUJmMFlMTjVRTHdwV0lTSFgvSGNXYStKUGpWOWxiaWxwZHlVb0di?= =?utf-8?B?eXAzcE5tcVNCejhPbEhDZjJwcEMwV2d4VmNJWi96UExQQlhPaGJaYkdnbHd2?= =?utf-8?B?TFlndUduSlprb1ZkMVF6OHlPM1IwOW5xUll0OStwZm5XWnBKQ29ZZWtKbVJG?= =?utf-8?B?M01EZ2p3SGN5ZTBNeC9vb3dTc1JNUzM5cWJ2Z0RqQWl6VFJDbTMxMzJrVTlP?= =?utf-8?B?NFBxa2I5aHl5N0ROUU9JOHhLQjZtOGppMzRQRUs2ell4Zlc1dGhxUHRPeElK?= =?utf-8?B?eXhvSmFnRHFUZWNWN3lrcGxWS0dZcndEbVBpNG80eFNCZ2k0V1NTeGVNNmN5?= =?utf-8?B?WnZlNmppQVp0eWw5Y2VXb3dQUEtPWDZMaWVTOEhnUVB5VXhiZmZQSXhLdHZP?= =?utf-8?B?eG5Ha2lzNGVaS1JFZTFYRFFWc3Fsd3lVV1JjSDVPdUJXRGZZV08rUktzWjNP?= =?utf-8?B?cDd3TDVrdW9ZcHlzOXdqMUhXdDdLT2w2c2orQlNlMnV6V3ZLV0hwd21XRk1h?= =?utf-8?B?Z1FWT2dTYXh2QktpVjRHeDg1WHQvdkppckVLVk5EYXBiRTAvVmJuUEFVUnpw?= =?utf-8?B?WUw5a2hrdk1OWUxhUHBuWHpYRjRZdTNpeUNmamhGL1o2UkhDUlk4MjkrYzFJ?= =?utf-8?B?SVg0YzZ5SE1GUjFIMUlzd3VFeWhaOWtPQ2ptVUVKR1doQXdxYnd0ZnVSUEZL?= =?utf-8?B?WUdFcWFuSjBDZmJySjQ2U2ErVFJwRDd6YnJzdDV0WjFyZ0ZldmsrOVk3cmFl?= =?utf-8?B?a2IraUJRUDl1UnFiR2UxTDZiK1Nta0sra214c1JsTG0zajJnNWora2NFYlVn?= =?utf-8?B?MDl6OXVVNWdjNnFKOGVuMUdLSUlyS204RkZVSFFPZHFZUHhLMFlRVWhFYlNh?= =?utf-8?B?ME9iS3F2U3RGengzc2M1OTdsMG1DNkxLMDh2VURNcTRsYllYcG9ENll4bXkx?= =?utf-8?B?c05xR1l1TkxHL3R3Wkk3eXd0WEx0RW1CL0F1cmpLNWVkS3kxTjVaTGhvSGxR?= =?utf-8?B?RVFaSGFBclZOMFdvejhmNzFhVXNabENMaHNLWGhOazBGRVhuaWlxRkJ0Tkt6?= =?utf-8?B?QTlUYXZ2SnhFTWdqU1JMZnMrQndtV1UvcFFYVWxsODVJdFV4cnZ2dHVkN0Ry?= =?utf-8?B?Tk9FREIvSCtGVjRJTkNMQVpTbGMwaFhNdGFrdVJtcGFWcWFtenZJbm10Wkha?= =?utf-8?B?SjJIMzIya1NEa3F1aFh0dWtOL0lQMTJLQVFwd2J6d1BMbjJzbWZyWkhKT0pO?= =?utf-8?B?enhMTytIMGtIZnNLU1RpdFpZUFB5TXpiek1RVXJOK0JIWU4vNDFHMk4vejBK?= =?utf-8?B?SVJwaExoRlJtTi9yd1h2Vys0YnR4dDNrSjFBdGt3Y1N3Z2xXWkNSclZmaFhO?= =?utf-8?B?WjU0djZTbHlERG1SWGFpeEUzOGFPTWR6VXg0a3ZGYXRsSk93ajl0dlVaSFYw?= =?utf-8?B?MmxQdE8rRW5XNnlvQ0trbGUxSEExMHQyRDFsWTBRS2JXcWFJWGhYcjRqeFVR?= =?utf-8?Q?1QTF0GfcN4uZ1BACOQ=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 80fc9c28-8083-41cf-5a32-08daee77a3ee X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2023 17:18:04.7203 (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: AS8P250MB1010 Subject: Re: [FFmpeg-devel] [PATCH] swresample fixes 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Paul B Mahol: > diff --git a/libavfilter/af_aresample.c b/libavfilter/af_aresample.c > index 971c861d0e..7923377c8c 100644 > --- a/libavfilter/af_aresample.c > +++ b/libavfilter/af_aresample.c > @@ -209,18 +209,16 @@ FF_ENABLE_DEPRECATION_WARNINGS > } else { > outsamplesref->pts = AV_NOPTS_VALUE; > } > - n_out = swr_convert(aresample->swr, outsamplesref->extended_data, n_out, > - (void *)insamplesref->extended_data, n_in); > - if (n_out <= 0) { > + ret = swr_convert_frame(aresample->swr, outsamplesref, > + (void *)insamplesref); Don't know whether the actual change has advantages, but you should not cast here. The cast above exists because there is no automatic cast T**->const T** (it is actually unsafe; we should change swr_convert() to accept const uint8_t *const * for in and uint8_t *const * for out at the next major version bump, but even then C requires the cast). There is no reason for a cast with the new code. > + if (ret < 0) { > av_frame_free(&outsamplesref); > av_frame_free(&insamplesref); > - return 0; > + return ret; > } > > aresample->more_data = outsamplesref->nb_samples == n_out; // Indicate that there is probably more data in our buffers > > - outsamplesref->nb_samples = n_out; > - > ret = ff_filter_frame(outlink, outsamplesref); > av_frame_free(&insamplesref); > return ret; _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".