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 323064759B for ; Tue, 12 Sep 2023 14:58:38 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 27F0168C9A3; Tue, 12 Sep 2023 17:58:36 +0300 (EEST) Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2103.outbound.protection.outlook.com [40.92.58.103]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4139A68C946 for ; Tue, 12 Sep 2023 17:58:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cTrb4qRe67P5uvMY4U3Pg2j338RmyTAxe9grIWJSyT35hnUzcxdQFEiL/CJVXxqtbQPeY9vuYXNUyC6oOCdQRxJLfwZnmB2kQEYDdYEPsECFxg1LnZExp+reZ2g8kz751bA8oT6UJwMEJryXAymYS2N66LNR61XA+SXi0BI+/Rxi9UBkiFvMKcLEEw0nNGPjxZQcsI7GpSdH2/sIU1bTZOwO1JjumT9Tw425MxHIMm5iNo/baNfxMyTx1RDvgxkRUI5aulZ+Xal96rxZYLLKnURUZskzRqo6JeJSKGT002BUdCQe0bh+UY1mgZVE+kkc4UL08i3UW2oifL/Z3VYrbQ== 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=BwykGo5OaeqSjYpjuMmEKg5vpFNatTJ/dho6TkEMAQk=; b=AbelQr6c5C3YtQxaX7uyRznjmsJ7xZr7NRcvpWqQplS4tM1eT+Qep+Vvrpf5guC7TR9N5cO9Jc8COvX64Cf6OuPSymkC9s7LNYkYSVMXNKRc6hr3v18XBzuccAPXUZJhi0S7tiPOE4sIdNi7ck3d8dK3k7kIuDngfNZSwX+pIIl48/V6f1sQINBKGZB0qh0djqk48cesyGRi1pvNWNeYck4ovh4jhVhE2Slz3BpZ5K6P/gZeixmagh/s5ewyX0VYkIY8SuYtShrl2Q4LaH5zEw0FRvXbfWXwu+52/gOYr3KyWD0W25a7q56wdliRjvFdV1FWRJeL1lWbJhQornZa6g== 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=BwykGo5OaeqSjYpjuMmEKg5vpFNatTJ/dho6TkEMAQk=; b=Gd/NsHqF1fE6hRQjx59840XQQO4msYP0KE/xKa1OFa+VFnc+4Qwjwt3yiu763fAfPT0qDOokIYoS1e19nl1ueAys2bmH+7n6AtpRA+DZ5i4xvahAQX1tCb3IC51E8kZY/j4uz3d+OgFCAA6GKR+0Jd4vS6T3cuFaBxWRp11AITOXUrPQaUTk/I/+BsJ8AI/uu7PKtnjjI7IRnDALwSRmBK7Z0P/s+nwrOrUBFewEmDStxNh+v91j8Z+cBranHRfTXf+130RhxFtL+QITqgBLLwig0bQDXHL4I0F5Gt6vtc2rZHjEuppkF4QEpd171x3iaBGacUSW/S61W4R1fI30UQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0036.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:14f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.34; Tue, 12 Sep 2023 14:58:27 +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.6768.029; Tue, 12 Sep 2023 14:58:27 +0000 Message-ID: Date: Tue, 12 Sep 2023 16:59:45 +0200 To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: X-TMN: [PD6TsUsWsV9m2CKjUg4SU9uYzKkXC1X4] X-ClientProxiedBy: AS4P189CA0039.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:5dd::16) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <4fbb6cc8-5a74-e582-55ba-f6adde0b708c@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0036:EE_ X-MS-Office365-Filtering-Correlation-Id: e0709eed-7e15-444e-fbe2-08dbb3a0b7d8 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: obBfyy1Gq6ZrCaSQVi501Q2fFWf3qRNGyN0/1JygJF7gJdUF3pM7dl60EKX4B6WSim3qFJzSfIArunwJT9Ex7aWi9M1klCE8LYfcfwHSquym4IEm9PyB8nj5SisQbr5dhe58UaBx/gGZaVvYXTP04c+JffCAe6k/l1BUGcFB7h4zrfuLSxnhsS2GJB+RPExn6O/K5rnK/J0lmpLlVQM4Kg+nhW3U7hFOPFO+0nzHCcNCkZoVjyE7mx3eSzgmBNcvfYxt601XDNmD617Wp606kh3gWF5q5gnS1dPwSLIGzR3hDDk+tIb3qOYzAaCnlTZqqCp0dTeG/rPA061dNv4Zw1DP5LLOesKlet6mZQ7pSVNhKyTg+s2kYOpi4/OuUdI4uFSGfglfE6Se55c7g7cUkTqeMi6mSde9EXkZ/SN+41zi80CcMaWdmszCUOqeCPWbdnAY3TqRqN2WMK/TAqeA6IA0arYo9omOtMBZ8mb7qPF+egMckV11DobpsO+qMhmoIQCA+TEvkvS+/EJmTiqeMgZKj8huQGAtZcwSdya1u/48vfIJ0Ta2TVhJArUYe/KE X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TzVFbEVEVWtta1AyL1J4OU9qMVdtRGZudEZZTTAzVldJKzRkdTljK1VTSXRY?= =?utf-8?B?dFZPVzNIQUhIWGZaVC96M1pCSlJSckVpY1NLMGNtSkRmZzV4N0xFSWg0S3p3?= =?utf-8?B?TkZxM2ZkTmJhL0pxN3lCQ2lCN2JlYzVxR2l5KzF3MUZHUUpNR2ZHajFJUk1K?= =?utf-8?B?QkIvSTE3VG1VdTJSWFVyUE1yWXJEZjNDekVTQVVYcDZLbEhjRjZDM1NRd083?= =?utf-8?B?T3ROZFBzUGZOaCtpU1FkbTRnMkFKaUkxdXkrOHFqMFppNkNJL3dibUhHVW1D?= =?utf-8?B?bEYzWGJOd0ZCS1JLZFRnNnNlMmNUcENObXRiVlA1S2hjejRNN2Y0WFc5bm5j?= =?utf-8?B?QlZhV1VKbDBSZ3VlYjRpZ2RmR0g5ZFdRNXA5TXRpTWlId0pSaTlRWTVTUkVq?= =?utf-8?B?Q1hwdjdmbmZBandEOGZZc0xIVDcvWFBlbVlEYmlnai93a1NOSGVqK1drdHlN?= =?utf-8?B?dndtTW9QUWJNdUpyRUdkMzlxeDdQLzhtR2lHUk16S3RGWXkrRUlRbVBsVXRP?= =?utf-8?B?UFY3Y2Y2WXZCR29pN0hwUm83TklFcmkvVDhmSi9kYy9hRVI0dXFLQkFoTHY0?= =?utf-8?B?VkN5K2o2SmppNThGc0hGbU1SNzRWKzYrREd4TlptYXZGa3ZoNzBURFJYSnNL?= =?utf-8?B?UnBKSit0cWFsekxreDBGcUZBTXJpdnBJYmp6Zno5K0V2VmFXYWFoNXZobzJw?= =?utf-8?B?WEwrRUZkdFNkZmN5d2tJU2VHd1k1TVFiVnF6Wk5VTUhDTFAvcG5qRnpxekN3?= =?utf-8?B?c0NWSGZqb0VZVFdDVEZRTDFKdFNJeUdBVnhwRkxRSDNvQk9EMzlZSlM2aFpx?= =?utf-8?B?OEZlQlZTdkZMZ25zV2JHSTF5Ykp1dE9mazBJUUdjOW1IVk9aRmd1QWhhbnJM?= =?utf-8?B?L29oSlhySmVtYjNrdGtDZmMzK1d5R1BWUDFiR28zbWNoL3VaUjVBeVN4OHQ2?= =?utf-8?B?aUVjWlBYakhrcHFienRZWnoyY2t4TnZ4cTNBeUNiSy82VTdwRmZPMW9hcjE2?= =?utf-8?B?SktpK2tDWkFCYmpvVDZGMG5ZdzcyUVRlRzMydDVKNGVXTmliZ1Z6Smd3V1hU?= =?utf-8?B?K0E5S0RMcHZ1Nk1TMjloSWZEMWgxN3E1NjRMR29YZjFSY0NVWTVocUJrYkhn?= =?utf-8?B?ZTdqcWxBQkRSTm1Ud0pmRWpJb1pyYTdwWUJjekc5eWw5TjRCZzI3WEVSbWM1?= =?utf-8?B?cTlqRjlKZ0VBajJpTk51ZXVVOVVCaDJSTmRvbVU5VVJZSkVEbGJMamVnekFB?= =?utf-8?B?YTJZNitiQ2dOM3VrM043SU1rd0IzcmdZNnNyd0lnVUZiS1BtUmZ5T1Y0ZW9N?= =?utf-8?B?cjFvS2ZLRTRSVjRzUXFybk1pTVpxTnJZWVhub1dDdHZUTDR0QTE2UUN5Ty9v?= =?utf-8?B?eG9CYWRFQk9oQzJ1ZHNmMHlGWlJIQnRETkdKYnBmL1dtVm15ZEg0MDVJUUdV?= =?utf-8?B?aFZycjQzbkdEZU94VTBnUXl0ME1YTmtFSi9UNGJIU3ZUMWVzRXVMZUIwU2Zy?= =?utf-8?B?ckpoWHg0U2NRMm1scGlkL3lmakNjeDI1M25obXprbm4zYzFiVmZ3SVlOZnJt?= =?utf-8?B?bSs5dmRIQ1crZEpJelpMZ0RGa3Nkd3ZmUms3WG1PSDduT0RUUE5mdU5vNlFU?= =?utf-8?B?SWFOSmIrN01DMkNETWMxN0N2b0E0UDc2TlNnWFZsd0trd2hJbnRqVWNWNHV6?= =?utf-8?Q?K/yCwAjvP5YoZyZcyBao?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e0709eed-7e15-444e-fbe2-08dbb3a0b7d8 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2023 14:58:27.6257 (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: PR3P250MB0036 Subject: Re: [FFmpeg-devel] [PATCH v3] avformat/avio: Don't use incompatible function pointer type for call 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: Andreas Rheinhardt: > It is undefined behaviour even in cases where it works > (it works because it is only a const uint8_t* vs. uint8_t* difference). > > Instead add a cbuf parameter to pass a const buffer (for writing) > as well as a parameter indicating whether we are reading or writing; > retry_transfer_wrapper() itself then uses the correct function > based upon this information. > > Signed-off-by: Andreas Rheinhardt > --- > Another approach; IMO the best of the three. What do you think? > > libavformat/avio.c | 16 +++++++--------- > 1 file changed, 7 insertions(+), 9 deletions(-) > > diff --git a/libavformat/avio.c b/libavformat/avio.c > index b6a192892a..b793a7546c 100644 > --- a/libavformat/avio.c > +++ b/libavformat/avio.c > @@ -348,10 +348,9 @@ fail: > } > > static inline int retry_transfer_wrapper(URLContext *h, uint8_t *buf, > + const uint8_t *cbuf, > int size, int size_min, > - int (*transfer_func)(URLContext *h, > - uint8_t *buf, > - int size)) > + int read) > { > int ret, len; > int fast_retries = 5; > @@ -361,7 +360,8 @@ static inline int retry_transfer_wrapper(URLContext *h, uint8_t *buf, > while (len < size_min) { > if (ff_check_interrupt(&h->interrupt_callback)) > return AVERROR_EXIT; > - ret = transfer_func(h, buf + len, size - len); > + ret = read ? h->prot->url_read (h, buf + len, size - len): > + h->prot->url_write(h, cbuf + len, size - len); > if (ret == AVERROR(EINTR)) > continue; > if (h->flags & AVIO_FLAG_NONBLOCK) > @@ -398,14 +398,14 @@ int ffurl_read2(void *urlcontext, uint8_t *buf, int size) > > if (!(h->flags & AVIO_FLAG_READ)) > return AVERROR(EIO); > - return retry_transfer_wrapper(h, buf, size, 1, h->prot->url_read); > + return retry_transfer_wrapper(h, buf, NULL, size, 1, 1); > } > > int ffurl_read_complete(URLContext *h, unsigned char *buf, int size) > { > if (!(h->flags & AVIO_FLAG_READ)) > return AVERROR(EIO); > - return retry_transfer_wrapper(h, buf, size, size, h->prot->url_read); > + return retry_transfer_wrapper(h, buf, NULL, size, size, 1); > } > > #if FF_API_AVIO_WRITE_NONCONST > @@ -422,9 +422,7 @@ int ffurl_write2(void *urlcontext, const uint8_t *buf, int size) > if (h->max_packet_size && size > h->max_packet_size) > return AVERROR(EIO); > > - return retry_transfer_wrapper(h, (unsigned char *)buf, size, size, > - (int (*)(struct URLContext *, uint8_t *, int)) > - h->prot->url_write); > + return retry_transfer_wrapper(h, NULL, buf, size, size, 0); > } > > int64_t ffurl_seek2(void *urlcontext, int64_t pos, int whence) Will apply this tonight unless there are objections. - Andreas _______________________________________________ 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".