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 D79D54509C for ; Wed, 4 Jan 2023 17:37:40 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3545968BCE0; Wed, 4 Jan 2023 19:37:38 +0200 (EET) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2076.outbound.protection.outlook.com [40.92.73.76]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 12DAC6802C4 for ; Wed, 4 Jan 2023 19:37:32 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dTHacPpH0A+ht7yzG63h8GwL9U9ojW0nSCE8L3FgOhi1QC+SLQUn3/wkzl/HT1dzdkcRjdWkhz+hsWfV2Otl44a0WIvB9oAmGc6oTdjwRb/MtrCh59Ss71L9ovKt7nBO8x58QOJdp7fBvm3o6rVpOWBMGKcp6W5iWwFLcEQ0Gj/vo68viieusjqHbj8gzEU1F6HOoo557iudr1stkK3ojYm46guuqGRuNlT1HDNMZxZp2uns0B9onMefpKVNZG2YiwnSgHxspo//4uYiXudghx70WTLNuhZPzNZP3QLRhnqYUw4cnZ05dRBtK2yzvpJy9E8QPi4E4XyZt8nrImtv7w== 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=rn4BgHmUIoXChZmQ9ZkoIOqslytOhZdrxSLKGOVfkQk=; b=ZMQHRJFm2CnXnBmIs3NWJ6jOUWqxGVDm/aW/aWn5resruXzb9nZOVywBb+RYkXLvoys8lLeMm/hRQKl2eJQfKF+VqjKz5Q3a8p1tlx7AObEnSaKJACoVebjXIiLfbn68lOnKvflVJCowj6+iSUU4Sc76OVqJPf58HzxjsS0Cp4oBXgbJ7+X/AUw4YimBt8QC+0V3aWVj1sPlxEesqxclXAvG3Tokicc1GQLbvbQEj1n6dQKcgc1LoK/b6LgG4lYsEk07wb1JqILSSsVZfcJ2qnKl7Y3jnzDE6xJx/HTPWQDIzI6WaRKoj21tdw3lSidcXngR6E2/k9aDpqy2Rn4WUQ== 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=rn4BgHmUIoXChZmQ9ZkoIOqslytOhZdrxSLKGOVfkQk=; b=kynIKGFPZgKLFJxfdri+A+6je9DxFRDyI22afasGo9azF19J2iKj3HHslhjdok9WWI5h1C84F8miHTp5PgoKWnbTCh1/ag6osQ4K4+zJ2+My9elPYP5vqlXp6rSvqeVN57eRVw5+bQrRInTKgRH0T7EB0vUJj4ypKeIwipzjZntszmR3CjXvHObg1ZHE4R6afxNpOQBGnqi98UU6jIUHHS49FSMILNZu6zkKwgkdkM4Ye9HGpVdI1id+H9A0chxp89tJxoqvAoEG0Lb7J9tpDTSYv3vPOeYiAwHhZqe7SkZTOeLLMZ8dCilmONYMZOf3K9tx1miCXMKeGysk0Ns+4g== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0370.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17d::16) 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:37:30 +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:37:30 +0000 Message-ID: Date: Wed, 4 Jan 2023 18:37:58 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [BvKV81Pi3EvPs7j8clUDU1QO/7wW7rxq] X-ClientProxiedBy: ZR0P278CA0127.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:40::6) 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_|PR3P250MB0370:EE_ X-MS-Office365-Filtering-Correlation-Id: fb29da87-78d9-4dd2-94e1-08daee7a5aeb X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2+ze3qYMIIQe2ZKZ5DLHzI+KEkd47F1ZkGmc3rBlBpNwVARC5+9rkBAWkPsBCOMmOXsiNCS/Vn6hGsxlZkX4Rs6J/h7Qr4x3AYZzs7KCicUWRrdb78A5ZSiudHRcZNQrlYkLOLCc+TzfrN799X0mkZ/RxnkWUL00YkghULYpVTibvW4KPx/lXTlmOlbuy+/NWDRqyku3DpSipBxiZGWPvTExcHwsrl9/+3i2vb4LXexbIMqbcFaKBcLmE1M7/F24+iksaTdhQ+jiCrVSSTF0K9OtBMfLX/KXQrxFEP1x3yMCeg4AkxxOuKsc2yeiSg/cRkku63Rt0tQnBtZGfHRPTNbLT2nuB9p3iD5ReGzqaFm6uAlj9a2RkbS0vmFx1wWTq3gpK98sQUJfb5zqVSx1uDApEvTSgmebfHihkLMO1rihs1Ob2Wr4vrFESq5mpRqUNIYsCOTLadOe+mcS+gullph0g9Ysk0MueIRAYeOAgsPJzXXC/TtU9MARCCeNgMItmenXhImJ8eHhk2dR2cYN6wEG6sm+KQ/cCScWmXDGHOjYFvDDh4Lhm0MgGTvoExOJaJglh5E3Uk1h/TqIrVRsvCT82TmW5qiKPqs9tQhdYKE1Gk1Fw9aJyh3FNyqVXlqo3W7KCIlNXTotihrKoDJxng== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Tnp1VEZhaFRlUGlGOEhpTkFPNWZJVkxzU3U4RzRDVnQ1cHpZREcrRjJXS0RJ?= =?utf-8?B?cUFIVVpSWWRuc2FTMXh2RXU1aGd3K2I4dko5b1U3eHpYZVQ2L1cwSXhNajVJ?= =?utf-8?B?dXF3NGc3ZUVmcERoWk5uR3k5ZGt0REcyS3Yvc2hWUU1IczB2c3Vvb0MrQ0FK?= =?utf-8?B?d3RKZkJJZitlSndUYVdyV2NIWWFSRGxJdzdqWFhQUEltdFNTeS9FRnArSVUx?= =?utf-8?B?T0gwQ3VVNzlTcXNEZnlhSzBwMlFxMW4wRzhESk1UN3loUnVqR1dyVXFjVEto?= =?utf-8?B?K0ZxRzN1Yk5KNGhsRDB1MS9BdW1mSFdrdlBiYU5KNkQ2T296YjRBOTVOS3du?= =?utf-8?B?dEJCT0FSSnFBbjVRc1psVGJCTjVRV0phUU5vN2xCdjdPNWZUMEZlSjdVSis1?= =?utf-8?B?WGJ3QVBvMEdobUU1Rm5Uck0wTG9EYVFReTZVdmR5WlN1dDRJVU1aZTNhUlFv?= =?utf-8?B?KzdITWU5aU5UdkZEZzkzRWZINWxZd1ljODc1dDNMcTJWQ2xTNmNyWW9YVTlT?= =?utf-8?B?cFhjMlo4TFhjMjRESDlFNEZGWVJiREFPcDlVLzJzWWt3VFhyWGs0U01BaGV3?= =?utf-8?B?ZHlsck9HY0dNUHlIWkpLcWxISWY3Y3dlTzNEeGNXaUdUeEdQS1J5bGh3Z1hh?= =?utf-8?B?bktteVpnc1grYWZudXRIeWdqajRFa1ZGME96Q3QvQSt2aVdlS3pLZXlGcVJm?= =?utf-8?B?VUowRmZHYjRFUVJMVk5aY3J5RzlaaC8vSnU0akhveUVnQTJNVStnUTlNeThW?= =?utf-8?B?cURYVzdaSEtmd2I2YUJZcytoc2xmYU5TWkUxWjlZUmFMT21IQ0NDdURyZyt4?= =?utf-8?B?MUNvTUpNZDk2L1RUWVAzR0R1bHJnTFNwREtHb083bUhkbFRaUFZDeG04NExE?= =?utf-8?B?OURmNlVPLzZ6STlxK3FFcTgzZHpCeXM5Vngwc3ZsSlovSFRLR0Q2elNldFgw?= =?utf-8?B?Tk90YUFVYnNldzh0ZTJJOXZUSjhrWjY1c1BUMlozYzVPMks0Uk10WHZQMXJS?= =?utf-8?B?YzFLK3lNc0xaeFNhK1BqZkNWa2toOFJPdHVheWdXODZNbUZvZVUzYnRyZGJY?= =?utf-8?B?alYzc2F2SmRoajhDcHJjQ1FTVGtLSnppQWN6Mll5R1VWQlo1R0JYVHQ4RVB6?= =?utf-8?B?Z3Y2amFXKzRwNmRkMFg2VDl1VnRKbVBrbkhpS0ZKNUVqZEMzektxcjNmQjE2?= =?utf-8?B?WXgxY05INzZHVEJhYkZpU2Z3YXNyQ2hneG5LTmphZkFaMXF0Z3JwUlZCemFo?= =?utf-8?B?VVM3bzJFbUU3dWN1V093YWRXKyswRGNKcWx2YnFmZmNTa3NKT1VGZGZ6dWFx?= =?utf-8?B?YUF5Y3RCRDJkYXU5K1hPdG5WK1pYSVdlR2huc2NmQWZZVkQ2eWNXTTRMNVFH?= =?utf-8?B?eE8rZVovMHZtamRyaCtrZzNvUFlCWWkxeUxrKytJOHBTWnk1QU8zWUY0UWVR?= =?utf-8?B?QUdic2FacDZ1akJReXBTeHk3WVc0aDJaanBvWXN1aFZjRzZxMmtZMjdYV2M5?= =?utf-8?B?cFhvQjZ2aElzaGZDT0Izd1JBNUxta0hDVEg4NThYMEhxU0lNUUpQNVQxaUxz?= =?utf-8?B?SmpnVFZBU0tKa0F4cjNBWEtKM3kvUWtPYUZFTHNTUHFSOU9ZRlBWbkloeEVT?= =?utf-8?B?UDFWdGd5VWNzMXlKMWdmNmxDalp2ZFRyUVBXSjMvMG1jNThNZEh5eFc5QVhW?= =?utf-8?B?MkJubEN4V25CbDVSSkRoMnhsNldQbWlndTVJWVVCYUdzdWQwbmFFK0F2bFFH?= =?utf-8?Q?xaBQ8KvYv76eLAbkyM=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fb29da87-78d9-4dd2-94e1-08daee7a5aeb 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:37:30.7030 (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: PR3P250MB0370 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: > On Wed, Jan 4, 2023 at 6:26 PM Andreas Rheinhardt < > andreas.rheinhardt@outlook.com> wrote: > >> Paul B Mahol: >>> diff --git a/libavfilter/af_aresample.c b/libavfilter/af_aresample.c >>> index 7923377c8c..2744388f75 100644 >>> --- a/libavfilter/af_aresample.c >>> +++ b/libavfilter/af_aresample.c >>> @@ -209,8 +209,14 @@ FF_ENABLE_DEPRECATION_WARNINGS >>> } else { >>> outsamplesref->pts = AV_NOPTS_VALUE; >>> } >>> +again: >>> ret = swr_convert_frame(aresample->swr, outsamplesref, >>> (void *)insamplesref); >>> + if (ret & (AVERROR_INPUT_CHANGED | AVERROR_OUTPUT_CHANGED)) { >> >> This is wrong: There are lots of errors besides AVERROR_INPUT_CHANGED, >> AVERROR_OUTPUT_CHANGED and AVERROR_INPUT_CHANGED | >> AVERROR_OUTPUT_CHANGED for which this condition is true. See also ticket >> #9343. >> > > So what you propose? > The only check way I see to do this is to check for ret == AVERROR_INPUT_CHANGED || ret == AVERROR_OUTPUT_CHANGED || ret == (AVERROR_INPUT_CHANGED | AVERROR_OUTPUT_CHANGED) (the latter value is equal to AVERROR_INPUT_CHANGED). This should be done in the ret < 0 codepath. ("lots of errors" is btw an understatement: All errors are < 0 and therefore have the sign bit set.) > >> >>> + swr_close(aresample->swr); >>> + goto again; >>> + } >>> + >>> if (ret < 0) { >>> av_frame_free(&outsamplesref); >>> av_frame_free(&insamplesref); >> >> _______________________________________________ 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".