From patchwork Thu Mar 21 12:34:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47290 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a4a:b0:1a3:31a3:7958 with SMTP id zu10csp515083pzb; Thu, 21 Mar 2024 05:35:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX5biECe7XLCAJnHkSspM6FXlj4lwDiMAOEhwLZT8oX4PuYlhr3F0pDBf/s2HpRF1F6Pi7lzY+9/EBm0jUI4gUdbRgRwpsljK3CxQ== X-Google-Smtp-Source: AGHT+IEF0eUiBOL6270qXKlqzjk+g8pKenHgdgnZel4zA6s0MN5Smdk++K3kjPABNPVeZ1NHQBOB X-Received: by 2002:a19:ee14:0:b0:513:aef9:5401 with SMTP id g20-20020a19ee14000000b00513aef95401mr14335982lfb.66.1711024500879; Thu, 21 Mar 2024 05:35:00 -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 em7-20020a056402364700b0056bcd7de32esi439224edb.663.2024.03.21.05.35.00; Thu, 21 Mar 2024 05:35:00 -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=JNRGSxqN; 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 4434068D545; Thu, 21 Mar 2024 14:34:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2012.outbound.protection.outlook.com [40.92.90.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3516C68D536 for ; Thu, 21 Mar 2024 14:34:51 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ITnFVRe3ttAE5M1PRSbaK5UxMudMMvo8owIW6kxX217Qp6ld0Ty8JCtrjmAXuarSUYnhFRvf7/3Cngn3n6O7QEQo0LjF12IGEF0XWd71mne9QncIOKP6eIX9mTbvsvekomlu6Bg8bonmSQBugxEGIb5dJzZqBu3UK5c4H5SByL0kuPTm3PMUWJyZNRnDCi0oLTQoaP3ZD5Q6UBJRbfmHZUxVNBCEtQPghsscHsTbJRACH77A7wEX7Bwo4lU58qpfMuuHRJIiSXDxSWtbjljDiiYtLoDBz0BYKlz8szMRSemMOCO3VN/V5Vr38Pnpf6+a924qF4NKftUsP5ki4ZdAag== 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=dFuLal9vUAtfTZmNnwFBfICvc7Uz9O4M3tlqajARQWc=; b=j99evQU3UeOOG0KOjNzlOUzqHdOL8dAaDBPvuaSBJEoBoN/ZkX93kdLoWDmUf76lQFTtsuupgj9r9nnlw5FwRIihYh5KIAoqS9Wxk3Dh/fNMkSPP3BXyva8LrHx83qiz+2z6JsoONEzMMkBM/OvKbY+20IBZioJLvdve9UluzwkPin64RXkbPEOi9ScQtk7Z3bioHyArR5sdxTmyrrh3oeN2T8L4jtaILYn2dHvwqVq6HMMUolrO7AH5uWC4aHzlvsfDuLOS8OUl0cPPFCcE8D53zaXJ9XFsIlWJrHCj/eFoKAIc/xjrUG6JWuIqzSHL2Pb7wLbKJENpo2lDF3zpcA== 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=dFuLal9vUAtfTZmNnwFBfICvc7Uz9O4M3tlqajARQWc=; b=JNRGSxqNuhXld0cm7zkjxf+W98srE8pkMXbJ6fGV1zEqC9t8Y1v9YzT3xe+PKOk/r/jzMuDWZMMQ413I3pLv92377fYYNUjJ8rvPad1ipgLCRPAjLd0/6u/77R4tht+7xM3IIxXIbVTycHgGzTnmnoo8XRRhGYmEXc/uvcQRa24FgwH9Ls7kFS4WXAhC0ANc6rFVqhfBZU5ObvBR0niCXwCVQkLkxUjeTeH0ycungHdg4v/wnTx3oLQgaJIXfey4+24Ende9FlfWXEnrdfQJhCk4obgi9DJ62PehHOuZtOhx9gfTcrG7QZwmo8vPEmv6c6tiBRowEc5b8yY9D/sWXg== Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) by PR3P250MB0001.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:14c::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.30; Thu, 21 Mar 2024 12:34:49 +0000 Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::8230:ffad:27e5:20bf]) by DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::8230:ffad:27e5:20bf%3]) with mapi id 15.20.7362.035; Thu, 21 Mar 2024 12:34:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 21 Mar 2024 13:34:42 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [+CLUkO+X9sTQ9JLCmCgSrzWEHQyhi6ziqPfg+48zKPw=] X-ClientProxiedBy: ZR0P278CA0162.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::13) To DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) X-Microsoft-Original-Message-ID: <20240321123442.499127-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0P250MB0747:EE_|PR3P250MB0001:EE_ X-MS-Office365-Filtering-Correlation-Id: 12666833-9330-48c3-af7f-08dc49a34c95 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bLTM1YftGm52pxfSR8XQUMaUkOhQlnw2vbw8RssI6B8PZML68Oa2lS4RlRJuVhh9dOdTau0xqolBdFVLrcRvj1TUylG+gnfvTMS/idhARZMagcAiZNft8YlH1cRMjN0d55KUIPkjbRmFtvRqAovh4Lnk/VLwFARh6P7zvqOz4fllhZfhKWrX4sCtNUzL+pbkL+2pwXp33xLrH1UJH9J2XCY7RnGLlsyEt8qkpD5AryUQPqx0FYtc15+yXBt39XJxGzFvo04gcGDB1f26J2xoCeTn0ZhA4seQMuV7+te0NUwffSjlXZmEIHOMRo05C93smRxpIycjHexj4qAlyeZaPUOf/pO16iwJqQAuPBf6Lc5DFRhAYBmIkO8/Rv4ezGkDKOsdvIgTPexj2tdSQak5nWlE3FlgR9bu7Sf+4JPAVVfdBE5MT+uhHYNGAr40MxZVEL18KaoxBFADCiS1qHCG7KQ3EnqdA3y3NOc082pY6K24k4rZIMVymrO3jl+N3xlAdyusEacG06g/KG+f6qqfp1cwkHTVq0A+86vl0Yf6PvIMX9MKhNCGNFH2gYynBIPlWamTHTstnJwjtpyoIyKYzM7GL1x6sdYVrBmoCt1KytIeHSDoCxAk3qkz+K2ud6Dg X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LOHHwD54/3hoDfZ/KNBIgwulveUdVDI5jhM6B3oeDBha3dZKDVo7w8+LYDwXxu3QWI/TO75BgOBG6x87KYKeMXEl8TTNy1mGahKsBHTT78ReFcZpW6igEBrN0KkYdM/QrrW8szgZ762CRYuHX6gaUuzH6FnQ+Iwgnv3SG++RweAgUWw1M2kFsd2Urb8azdr0uqSgKgqcrhmyxyzonpdWqPO/Ai8IMBh7Z8avp95MnqNHAXBjnSVSBL25LqVqlk16ZMoESj0jzcKOmz0af0yRSJXz6jCiBqruoI8ZyQr6/ze49LO9qeutQcySg5d/MT2JWBsmBKodH0PIP5nu3sFcPPAe0RkjZ42h7CHTs2gfarTCVQ5Vi7YTOT0IhqcgORvffvB9cvHSo0yX12n/Z48b1dlab5/lX0ZiXxSuvZ1seqj7D1ypohJR+rNKQ7xU3R1FmjZX2StfxEDdOAGbTG+cgygHATRSWiC/M+Z4kiHOcRcjH/7d0m5iKQ4PEDjoJRBPNe88NnHCcAuFaDOVtN98UOIqn7vu4hhj8qN+kh44f8wXbci4GqIY9FnaPtx3qK5dfvAndBq3Nlc6gprDnLHzKx6+WU+ps1XOM+qEgWg+ibVZEYwK8copvsQ+x+W6/qLsc+ZEyv7VG5IHyhtI4VNi9zwvkk5IcAPpvk613ymQUnpaYgHXavknjXu5No0D0d9zP1wn90uNkDxf/vjorgyCOKwa3Q63zVvjINt9BKWAdU3PL2G0gFggvSI+l06skwQmQCeufR/OQAlYlN6VrNSwtmBDoekjGpyS6ziJI96iyrR/y4SiT5xHAFIST3yu7dQw487VbFxB6MD2r76Y4skJWHiTha6X8nS14P6j9LPfhAoc+3kzsM8m7W3g6hNCiTdunNq1i656hTV5TaqznAMMg842ZiqK9yxqaLxwOSmg5PpXs+vT+bmaQLYfuQfjIT1QL7WsHNbn08mpCK9f7Hfq918q1lnX3ns6lSWH6LTGhAvmEkU0CC9pTJlR0DggIxi/DJkkVro5O8G8wcT1AUNlQRG7dPsK5zAqEvrU5gstKkUBDA8lX8uAXRtQ94P5PLtwWFuX6WDeaRUT2plHfhXTFHLyu3Uqw6sBghyyPMkn3KtbZql0+YKGrK7apG4AoMZAXTbg0yz8YUN6pRckInuRqy48Nxr/8bWeg9Ahj+uUxj4/yxlSU/JA2+zWxTGXaPuFGTeMVTJ9YMuVbhlUd1K7QS8NhWh6erLpRyQy18XjP1Jj0dZxHKK3co+35vjPRW/P7oSCoFZRSY8lRbNXK185ew== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 12666833-9330-48c3-af7f-08dc49a34c95 X-MS-Exchange-CrossTenant-AuthSource: DU0P250MB0747.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2024 12:34:49.6229 (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: PR3P250MB0001 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/demux: Combine "Packet corrupt" logmessages 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: wxPTaQQu75+D Otherwise these statements might be torn apart by av_logs from other threads. Signed-off-by: Andreas Rheinhardt --- libavformat/demux.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavformat/demux.c b/libavformat/demux.c index 4345ed4c8c..e50d1a9cfe 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -572,14 +572,13 @@ static int handle_new_packet(AVFormatContext *s, AVPacket *pkt, int allow_passth 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)); + "Packet corrupt (stream = %d, dts = %s)%s.\n", + pkt->stream_index, av_ts2str(pkt->dts), + s->flags & AVFMT_FLAG_DISCARD_CORRUPT ? ", dropping it" : ""); if (s->flags & AVFMT_FLAG_DISCARD_CORRUPT) { - av_log(s, AV_LOG_WARNING, ", dropping it.\n"); av_packet_unref(pkt); return 1; } - av_log(s, AV_LOG_WARNING, ".\n"); } st = s->streams[pkt->stream_index];