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 D0FA8489D9 for ; Fri, 22 Mar 2024 23:41:38 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D438D68D532; Sat, 23 Mar 2024 01:41:35 +0200 (EET) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2073.outbound.protection.outlook.com [40.92.75.73]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD02968D4DD for ; Sat, 23 Mar 2024 01:41:28 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QaU0y7tTLTr/Y1BEYWlMHhNLzOOgil5JXu8dfTUh5tvwREOC4LlTMBQY/wiCSyoan+X90Ete0ZidUWkARDySKbC7M0a9LEG2sKpUkznHSbCNoY+SFdOFxu5/B0CI21yM/5Kwqvky2E/7Z70YsaOOl+E3ItZnIyh8ayR+vG7r3/Ry7ODo9QgMaTzGU61lFhjvgmmMu5ksvpgRaa8E77r2/vOnNcHmjnwoVl4Tdch1XK9iZIxQYcebz5rZEJRwwFjBkYZ2AH21n8p8IX8/vwLoRbSUgEC7/u9xVJVeNUHkdGm95NC3seAcWxflW5Wy6Ewz0zxug1g/6oOIWi1muXMUvQ== 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=zDqP2mxxYpN1AiMHgtdTwY8qUgUyNy8vHPcb3a715lg=; b=gAindps5JbuuhhVpRTHWTQCCeT76sAcQPNaJeZ89oD18ndiQT224r+6X2rIBN1P3hiejFs89274qFtZkrehINBSgAebmLQXDGgSTGzfyYvfIU5qpBPn83QEa1WWALfpxNmxQdpgT6CBArc+klt8Cdi1KZGn0ne+8P9PUaG0WWQZOW1+tsd1wNS38005kQ2NenpxG6W1RDILnB11rt0sdntX8+/Jiu3hFdQX5FhtkDMdZDlBAIWeRXVpZfRdZwl6RAH/ayVaA91EpVK2CGN6IUWZdrfycEPPX4Q/ZGW+AMX8alrCEyrVmmiDPGdH5NKiHYE8oxEC8l65OTpisghDMkA== 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=zDqP2mxxYpN1AiMHgtdTwY8qUgUyNy8vHPcb3a715lg=; b=KrfumY8vu17v+fTf7G42S6RBd/q67DXslsAy1Kmc1JEwH9EEEg8Hrw/y3elwH+g0LGJZdm+Vl2qyasVhSG/Dl43BrN/SGS7boXbOcZC+xJm/OdCXRqmDx69pQV7fnMcF6SGAQzMY7Bb4Ld37pl/0LLFRkqBpUg02gjnxwlLrQoyPMClkCHCqxWhw7/r/IZ+8CUarZK3hOzbhWYtrTY77sjRLMr9FLZw7Kwsih8QpN/pZkfSG18O7JhPzzmqKKXaHoScNW4mICfr05llkTXg/+qeEcPb51M56qLmt9KhEBTBGilaYJ9CaT2tLhf9IgssLvC5fCN/xLTKGEK1QbzbEag== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0129.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:174::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.24; Fri, 22 Mar 2024 23:41:27 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7386.025; Fri, 22 Mar 2024 23:41:27 +0000 Message-ID: Date: Sat, 23 Mar 2024 00:41:24 +0100 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [4ixHOqgSlXD0cwsc3kVEv546/mKr503Na2acUzZMWiY=] X-ClientProxiedBy: ZR0P278CA0088.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::21) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <43beb2f4-1b07-4c38-a664-c627db7a6423@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0129:EE_ X-MS-Office365-Filtering-Correlation-Id: 712f2f3f-daeb-4814-34e5-08dc4ac99767 X-MS-Exchange-SLBlob-MailProps: 9IecXKUgicBMjzDtAlr46x5HKEJiZ0Rb3Lka4kGmlVNWXOnOXoLWoTdYYzI+11V6YECAnEDllCoetGZAFWIB/USkcORZ5yJ3VD/mgdM+JdINVxpbUbJfqkQdHLJs6cjRE62haetgatnZItNZGr0txiQ0bwgRY0RS7IUu9YYBEJ+9uwmpKHquCKV8IkC375m/W3BrqiVVPfygvBqh1cRTuwvlX20jbXOCz0i7qGUzkoJuAntaoVjXojzMR/JUIjNSD4zfOVCrJJYac51BKyZkn9g6veiUdQkNtIjDdJzZgqRfD7TC8AzPhxuztd88mD8kFbNNWRxDjLSxJoAD6uVYemp/6rXH9DXqUB+yYBlwNSJ7L1r9EwpzdPBaSTjsCtjOmWKOlC+fzQkEzJwfxDyHwwGilLJJkax6CvEf0HlO8i66oWOslQyfon96+XtGrc1tNGjD+XpEPQqsahQD7AKiIA2zyYztGZZVgfp7R8kaBWTCv4Z4U/Kk7C9yvm/0++QUgIK6MRyZ3oVV4uU4Tn4tPfrMMYNdPgfYYkcR1X4WbvKkR3/Kb0hktFBDuNOc/WWVm8eItquWGIYtkkCdW1I5Rym3FRyyCE2V8nFDLha8LWm6y2MIZOKb1HWG0OFP21QNp2P+XoWrWn9UouoBE4LHf3P5h74QiiyyaYS/iMAjvrc13O7XVsLc6ihG9BG/hCLCTH9yWv7A7XrYf4YG0vG9cY6G4Ad5auLo/86WCE1zRlQhllB8SpL4WA== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0uU7BaHxi6Sh1Cn4TEcU0aQj4VYl/Pxaz680vZy/NzIxnqegP1Sdc4BpETNJvX1YLatp1v6nf3CCPHF3ArC/9dBg/mvLtBOQRUzQjQKQOKsEZUXs+qa9AY+hQyQMKi0MBV6aH4PPwCg418DF3sqbwznR0PjzIaR75KuKcJI+LUfOSLQkNQHuFkqtPFw42AOs9eD2JINDN4e0KOdzTsqVe3Ugt7wDHWKMTjnQRn51BY/Pf0WbR9OE1uuno5ykp/p7aOz+A9xOoc69ZSSAWjceS0DTcxodUvYF+/wjF7TUjyue36Sq6y6wCFXTXAbNuddpZxSB4Gq5HYwn/VmwIW8A7owQpoLWR72Dt4M/0Hx0odT/tWWC3CBTqnt0icCOvkdosg6zycnR+mUUxjbSjEhu2D9pHsn2MqeOjfOxWXutovYaeAnEQ6qX1qCgSv++W9HA23coJjYHH0EG6G+yK8dmEZFwRT9YWva4Yj06H5A0EA0unTNpHxHAIuFgf59OIVxemYwA3IE/S1/BhNqYNBHOm8metfIGiV3OmyFfEU7HeCERi66TBEvXivsGodlI7UL6 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?YytVNktGbU5Nb3pSYzZRTGpyZS9ZcHhNcHU1K2x0clAyMnE3MXNYNmpPUGtD?= =?utf-8?B?VGdmOFJtcUJYcUpzOHNxNmRMY055N3BBQ09KNFUrRENudnFsR1dJbkVKelhS?= =?utf-8?B?bGZ2Tjd5b0NxcnJaNXUwc3VGeGRiVUJzLzZJdG5ud2ptNVVUYTZGQ0t3ZFNS?= =?utf-8?B?TDJrOVJhZzFhRlhJZ1pZdHA2Vm9POWFQc3dSMnpQVEpTUjN4UUJRNzY5c3JT?= =?utf-8?B?WXZCdDBQMUhVYlYwQ1B5Ly9ZZGdLbDJudUh4TjZsbVZBVTlaQWRTWGhiY0ty?= =?utf-8?B?NlZyamlTRDRObzgvTDJ5YWI0eGNXS21PRkVpODFmd0Y1NTVRdGduY3c2Qm9G?= =?utf-8?B?b1NtWnUxVGFZTzhhbVJaQkJzODVnTWt1bkhHMDlvaW0yRFYxeUhKOHVPaHYy?= =?utf-8?B?em5ueGw2Qlh5bVo2eXFEMnFsQUIwcjVTTEdYbW9VaFVzblMxK2FXN3JCMDc3?= =?utf-8?B?SzdudHE4d0tidm5IM0hBUGwzWnVxTHc3RnpGNHMyQVFDejdEUmhLUTdjNHdw?= =?utf-8?B?aU5MRHZDSnZzK1F4aGk5SUhMYzhOWDdJYlAxZmxBUTF2aVJxd0hXamZhV1dF?= =?utf-8?B?Unp0aThzNEc1YmpiWEVZQ0xnMlRzbDE1TUdyWE9XNkxSN2E0MVlYUFhCQWlM?= =?utf-8?B?dnJmSmdhd08xVVN0YWF2NjQyZFFxVEtoRkFDSVYvR3F0WSsxYlVveC85bGI5?= =?utf-8?B?cUdwbWxqQi9KRjZ6bCtLeUd1dUV5TXBJQTk4Z1pacnQ5dHNQM2l5YUNySzlo?= =?utf-8?B?MUNGWFdJcWU5SEp3ekh6WFkrNklzUFVMMCtURnh2ZGhkN0hqTVhnTmlvYXBP?= =?utf-8?B?NER2TDlOQTF2aE0rZkF4ekpFd2MrOUpkWXhLWjMrWTMvaHh6ZmxyQjZqQk9F?= =?utf-8?B?ak1UbDVyd0YxN3pvLzBFMHluZmZMclkvTFBpa0FlUFUzMHhWUTF0ZGh6c09j?= =?utf-8?B?c2R0eFNPaExSNkNSdTZMNVdiODdCcDJlb3hrM1RzVHUySW00OWsxSWlkYys3?= =?utf-8?B?dzNBUFpYMmx1dUVZQkNkdWtxcUdaK01Ka3hsTFhXZklyUk5LSld3M3FxQWQy?= =?utf-8?B?dWFQOGxKa0t4OUl2Mno2QTJRTyttREo3MEx5OUNuV0U5MkRLSlBQUUdwUVFH?= =?utf-8?B?b2d3SCtjY0xkeFV1ZDdxM1BkbTBwMUU1ME84dkFtdVEvMVdHQXdIdTlnZGpM?= =?utf-8?B?MnJEN1lMZFE4L1JMaUxUODI3bWt2OE1IbkpGZjlSeFpWS2hVRklmdVpaU0RS?= =?utf-8?B?UUtUeWRCYkZPMDJLelZHT2NkcDNDMHpzMHA5UUdHb3lkSkhudkVWRk9md0hk?= =?utf-8?B?MFhxVW85ejMwUnhSdm9tajFwRDFkT1gvazVTNFFQWjhZYmJyNEdyTHZZNGF1?= =?utf-8?B?SlBiWThOT0pnZXcvVE1jb3VhK2Jva29JNmJmUVJNelJRTUQ3cTJEaE9SbCt1?= =?utf-8?B?clRYbVNCU0crVGVRVlpXcjZMM0dHNnJndnlNeUpuQXRDVDNzUlNHdE5RK2kv?= =?utf-8?B?M21ZSVhhcTFIbkQ0M0E1cjNrUlRWNGdFZkppbTc5dzdvb0UrWk9mRUtoMkZV?= =?utf-8?B?SzBMK3JrdlJoc1VCVzJXWDZVc0dGZDNtTzZGT29vUm80WnU3aXpqbkRYUW5r?= =?utf-8?B?Nkl4OVdvdytNWXRFZ0RMMkFGYjlsNzBCNnFlNW0zZTlnMXlweEVRWVpwaWps?= =?utf-8?B?NEQ1c1JuMUZMSzE5cUVNbWhUcjZoQldGakhidUxrSVVvMFAzLzBja0x3PT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 712f2f3f-daeb-4814-34e5-08dc4ac99767 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2024 23:41:27.2754 (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: PR3P250MB0129 Subject: Re: [FFmpeg-devel] [PATCH 1/2] avformat/demux: Restore pkt->stream_index assert check 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 has been moved after "st = s->streams[pkt->stream_index]" > in b140b8332c617b0eef4f872f3ef90c469e99920f. > Deduplicate ff_read_packet() and ff_buffer_packet() > while fixing this. > This also fixes shadowing in ff_read_packet(). > > Signed-off-by: Andreas Rheinhardt > --- > libavformat/demux.c | 75 +++++++++++++++++++-------------------------- > 1 file changed, 31 insertions(+), 44 deletions(-) > > diff --git a/libavformat/demux.c b/libavformat/demux.c > index 4c50eb5568..4345ed4c8c 100644 > --- a/libavformat/demux.c > +++ b/libavformat/demux.c > @@ -532,9 +532,6 @@ static void update_timestamps(AVFormatContext *s, AVStream *st, AVPacket *pkt) > { > FFStream *const sti = ffstream(st); > > - av_assert0(pkt->stream_index < (unsigned)s->nb_streams && > - "Invalid stream index.\n"); > - > if (update_wrap_reference(s, st, pkt->stream_index, pkt) && sti->pts_wrap_behavior == AV_PTS_WRAP_SUB_OFFSET) { > // correct first time stamps to negative values > if (!is_relative(sti->first_dts)) > @@ -555,13 +552,24 @@ static void update_timestamps(AVFormatContext *s, AVStream *st, AVPacket *pkt) > pkt->dts = pkt->pts = av_rescale_q(av_gettime(), AV_TIME_BASE_Q, st->time_base); > } > > -int ff_buffer_packet(AVFormatContext *s, AVPacket *pkt) > +/** > + * Handle a new packet and either return it directly if possible and > + * allow_passthrough is true or queue the packet (or drop the packet > + * if corrupt). > + * > + * @return < 0 on error, 0 if the packet was passed through, > + * 1 if it was queued or dropped > + */ > +static int handle_new_packet(AVFormatContext *s, AVPacket *pkt, int allow_passthrough) > { > FFFormatContext *const si = ffformatcontext(s); > - AVStream *st = s->streams[pkt->stream_index]; > - FFStream *sti = ffstream(st); > + AVStream *st; > + FFStream *sti; > int err; > > + av_assert0(pkt->stream_index < (unsigned)s->nb_streams && > + "Invalid stream index.\n"); > + > if (pkt->flags & AV_PKT_FLAG_CORRUPT) { > av_log(s, AV_LOG_WARNING, > "Packet corrupt (stream = %d, dts = %s)", > @@ -569,13 +577,19 @@ int ff_buffer_packet(AVFormatContext *s, AVPacket *pkt) > if (s->flags & AVFMT_FLAG_DISCARD_CORRUPT) { > av_log(s, AV_LOG_WARNING, ", dropping it.\n"); > av_packet_unref(pkt); > - return 0; > + return 1; > } > av_log(s, AV_LOG_WARNING, ".\n"); > } > > + st = s->streams[pkt->stream_index]; > + sti = ffstream(st); > + > update_timestamps(s, st, pkt); > > + if (sti->request_probe <= 0 && allow_passthrough && !si->raw_packet_buffer.head) > + return 0; > + > err = avpriv_packet_list_put(&si->raw_packet_buffer, pkt, NULL, 0); > if (err < 0) { > av_packet_unref(pkt); > @@ -585,14 +599,18 @@ int ff_buffer_packet(AVFormatContext *s, AVPacket *pkt) > pkt = &si->raw_packet_buffer.tail->pkt; > si->raw_packet_buffer_size += pkt->size; > > - if (sti->request_probe <= 0) > - return 0; > - > err = probe_codec(s, st, pkt); > if (err < 0) > return err; > > - return 0; > + return 1; > +} > + > +int ff_buffer_packet(AVFormatContext *s, AVPacket *pkt) > +{ > + int err = handle_new_packet(s, pkt, 0); > + > + return err < 0 ? err : 0; > } > > int ff_read_packet(AVFormatContext *s, AVPacket *pkt) > @@ -612,9 +630,6 @@ FF_ENABLE_DEPRECATION_WARNINGS > > for (;;) { > PacketListEntry *pktl = si->raw_packet_buffer.head; > - AVStream *st; > - FFStream *sti; > - const AVPacket *pkt1; > > if (pktl) { > AVStream *const st = s->streams[pktl->pkt.stream_index]; > @@ -656,36 +671,8 @@ FF_ENABLE_DEPRECATION_WARNINGS > return err; > } > > - if (pkt->flags & AV_PKT_FLAG_CORRUPT) { > - av_log(s, AV_LOG_WARNING, > - "Packet corrupt (stream = %d, dts = %s)", > - pkt->stream_index, av_ts2str(pkt->dts)); > - if (s->flags & AVFMT_FLAG_DISCARD_CORRUPT) { > - av_log(s, AV_LOG_WARNING, ", dropping it.\n"); > - av_packet_unref(pkt); > - continue; > - } > - av_log(s, AV_LOG_WARNING, ".\n"); > - } > - > - st = s->streams[pkt->stream_index]; > - sti = ffstream(st); > - > - update_timestamps(s, st, pkt); > - > - if (!pktl && sti->request_probe <= 0) > - return 0; > - > - err = avpriv_packet_list_put(&si->raw_packet_buffer, > - pkt, NULL, 0); > - if (err < 0) { > - av_packet_unref(pkt); > - return err; > - } > - pkt1 = &si->raw_packet_buffer.tail->pkt; > - si->raw_packet_buffer_size += pkt1->size; > - > - if ((err = probe_codec(s, st, pkt1)) < 0) > + err = handle_new_packet(s, pkt, 1); > + if (err <= 0) /* Error or passthrough */ > return err; > } > } Will apply this patchset tomorrow 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".