From patchwork Wed Jan 19 21:29:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33666 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5187224iog; Wed, 19 Jan 2022 13:29:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJyCu95RaixrHhaCJqiqrmpstp4q6VQdz/UattCup7CpJW95BYmmeRZD1Tg8M2qPaq7Z/izv X-Received: by 2002:a05:6402:6d4:: with SMTP id n20mr6263522edy.69.1642627799376; Wed, 19 Jan 2022 13:29:59 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id kx3si474344ejc.685.2022.01.19.13.29.58; Wed, 19 Jan 2022 13:29:59 -0800 (PST) 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=fwGWDlmv; 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 37A5168B18F; Wed, 19 Jan 2022 23:29:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075047.outbound.protection.outlook.com [40.92.75.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0527B68B04C for ; Wed, 19 Jan 2022 23:29:49 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mVb0sv0oM+14pL3qNw7UDqO7oBnvSwI1bc0wE+9/olkp/Kt23Bqw47LMH0iK2tBUM4SbLQmSWdJW0zijBUddPIZ0tSQbuQAkVnT2IAHaD8gWRJpAO4Ga5H2hlvnjWqXHkoj/oUdfzQDpTysTgOIctQbHtgP7mVtfmJtxRxxw1vPwv0Z6HWYIdQ5YSQVtJRaIK/gY83lt9heVhfjLwuRyG4dccrKwFy3NWqDVwKLwPTl8ox6F0cHEYpr7pGpGeTSFEmVj3+Rb5CDrjvkuMl4vKiKHy8QNpr5E60AXOoAQ3pCSWqLUAzojBgCzNtggP50X6PtHAh1JlmwbIKkNyHK20g== 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=/oO1msTNqAvOwRt+wmycOepg+6XKBp/ILzfvmQrDuls=; b=BL6/62Uf2bT0q1EmhG0KVlJlWZ93o6+SqUxhGPTCZ9T6MG78y33B00Cz8P0/5H04aCirjTNqYIobWqqXuxVvzSPSyMu008P7Iot7uIGd5FFDGhrCwwz0AOEHd3xwn1NRLQMx/LwC5yRjCsTe55fjs0v5wl8fQEjq8MNZHhNJaHxPgFPmN0d7k+pO7JCeznd53Gw3beckIoF5mS/d1WiOOxdQoPAeJ5UpX2EIRJqPEPMu+Cw3hD9IyI0NGLSRfE7xum9Tw+5jefzRUI4X5IbdCraGO1isDMrwgVXG61LRXJcKrXPECMxUiKZieA4oVGH46EaCXWjawepW0yy4T3ItIQ== 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=/oO1msTNqAvOwRt+wmycOepg+6XKBp/ILzfvmQrDuls=; b=fwGWDlmvdAZxcMjeqo4XKpqFgTsOfWuMl9313pt/yA9f6V2omkaH0G08tIjDDnBvkQiF985KHm1pxb9fmVyG4cjrmmC9xtofkDFjADszGysq6F6BjXlgYENBnfirHkf5ZOr+zFUDXhi1X0UPs7P4xAiY60HArjIzFxCQ1+cOD6dMYy89z2RePsO6jeSKesEhtCSOWf9zeaGV//Oo8ax0tHG8RjdoSedLKJR+gv45S2W30SsPi65kMzq8CnO5+qsxkm07wJzosQLwIVD0vMy/dD+nWy35hW/eXOPrzBDPPh8FbplbMofYgMd7WFatY45ElebBhRuRFwAFaGoLTcwPnw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DBBPR03MB6796.eurprd03.prod.outlook.com (2603:10a6:10:207::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.7; Wed, 19 Jan 2022 21:29:48 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4909.008; Wed, 19 Jan 2022 21:29:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Jan 2022 22:29:36 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [Yj+zmgOCxyJN5Q/nG/wqaOEymo1Gn2Q2] X-ClientProxiedBy: AM8P191CA0030.EURP191.PROD.OUTLOOK.COM (2603:10a6:20b:21a::35) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220119212940.1071477-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ff25a5b7-532b-4814-2f7d-08d9db92d1d2 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTWvhYxqNXkVg0MddlohE8x3NN4xh3kOrExlX86/Z18ZFRi3fDZp0KBiJs71OwJHxdrZev53D9nJuWSxe9jNHi5xSZWwbRdYk/0EOaj2do3+2GyJRSR/en3hnQ5UrIT0WmpykfVqj1h++5pW0ffxbMKwcR/n12EdTfArpMjKrQNUH3hnzjZRBlIwW/nHUfB6HwQEO5v3X4HHE3bTB6BfUGhfuBwoCvbrAfuH1tTGEP/TsdzHCE91y6Gq87qZ2Ugr8KH+lNbYlt0JGRX8LYc9LOXrDuyfrjSnHJdNUMf2krZ1tdntgwORJVh9gIYUCJRXpy7vhgXEjA4E19lQlDviNucxDEIQmfWNubwjzQMPJGXa/trY9rOg0rsh3rE2VmL+anZzlYsAT6QF1uopJFDSpmPRqUdVPs7OgHPcKh+U3rY5o4C149g89p1+zq+M5A0gr7lgHC7wzzYPRMIXiGCFgSM/iA0PJ8vI5ofxaduMMoDW8fVdZIz9vBrCpt715UOaboEFeDE2lFcgu02CQVVG9WaZMA6X1QulhD3+xvcM4Z0I2HQaqoYI+8aZTHzguTJlvlJ0GsXchKgdRSTyu9p89ry60+4ih+OgD6fva7Ebs7cfe1X/cfaOJNKp/pkzLEaEQ4dU/PtmElWdx1TaIuSsB9rtZqVwjzLqZMRkNOopR0n0MDasYX8ZKtnxHR+RcLfq6UdnalT6UKdsn+uLB8Zp38vVyKutXjFHBS2/fW9jhUonsM5ZnPwq6+Ijuqv/iG/ltI= X-MS-TrafficTypeDiagnostic: DBBPR03MB6796:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: s6mDimyrj1PlLaGelLQS2pN5fBIchWccmU/75M9KjzlL7QLtE0tR6tevbXxHfpQokrex0/L2uKKH0FMgWc4KxmWLt5fzmqSEIiH4kxfvNPoJUbsgT8/CZa7MbToon8jH24lr/Z8M890HIDyhIZYAguU9cRHnudau+AdOHodVrclNaiO8JajPm8xIkAqtoEA78oWUP9ydizQR3EThWt3fYM8Cria5Vi64uXWttItmIDUCrm6R8b99nSzfNQm3po12LyYlZggTeV7EfwSZNI1XjE8p+jgLZCYGoM8FYIlB8pQmSzMrt60RcDOmN2LXR5Cs2Y3ZfEq1fUKVxaKf98RxzII46Y7b/mBPLSqWgO433atP6aNyB0pcoavYkdXIMk7/p8G7s5eIND0XjLBpHJkdeZaOmwHXNwWnArX90OeNVj85zbeKVgTNkOXkKhD6FwAKw5QZfZbrsop2p3CrnKWNH6H0hynpmWRTA/LnmGdS+WQApqmOc8rj5MOdPI8wmoQKjE4rdxr2zgZglxkLe5DcV5R8nfBQFdphgxxtUqMK7xDZ86THg5DcSZaHViMTZpOyR4iXzF7R/V7OHI8jMGl5Aw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3cZP/9HZTi6pnPGvKoH8ixSx+AKp9K9TA9Atz/GVghwwEKDK9A2JhuxZPGPw29mGkOS2xBDgT8be0i3ULP6xpMVnUSKKk6y/m3DhzlcE7wL5PTebSAIh0KB1Ux/hZrsQmbkQihUpnkPbOUzs0wnZ+QfuyAPlgceHtaPQc5HpX0YKgGnLakPfFlZioFaFVEt4YM6hD4g1fFaHEuEDN0QhZ4d7Yyq6wXe83O6/6cVK//oEONy/Ea1Q41X1/xkslXrgJyNDNPHmyeyMS1lR5UQ8gURZHY1x0XvtKuDT1A3BJBoKVa0fgMxSaV2uwse1XVYobcW7QwEWAX8KjykyTPRMA/IWx7Rz+VkNOIdjMIB8aa5V5qtnyGOtgUm08AyzwjlrvvE9PkMFu/fWYZMSoQtZmhhIBCLYEhAJAwAE0hBocu2yODcJil6f18fxiYDLZ2KbpnBKTeuwP+k26O1/w3LZB8aTbWmx94RwCNEQVBDP4PY2kV2k89tpkXeYBruOuVZvE3paeC54GFx7oJ00fbygiWoP2ICcfKfqGDAX6fqbaL7pz80PllG2XiBG+Xlxx9DD46bnsS26t6m7oFUF3IN5D134aNVUdwuBd+q2jVS8fryOxixZdKZcf4Xd4d0qeRdbpI0VAGbrJNnqG6r+RThRsOPnZLgkwzUVmHFbKXvi5UMlGggRaSWvA0Lr36BlOwNdA3Bx3UkbThdhEHWeReKyNX8317E1CHXDLXtDQDJxmbws5n/7+/HYODinbkMn5/7gd0rH4iD0Vcmu1mIrod2f816EmS/aaegC1pnlt+nKW2vWyA1jGZgqskYJbQ6GVTfHDCiHndf1JCF7Ks6DUC0C5DlbXWdkLC+bHLDvoXR8G+M/+BjxAbilsGadKMdXbeO3RSrEiK0CYvLcsEfjeXsOIh+CPBS/zxcgYsfGGCzHzL/KEZAOzmyMW5WRBbcrcD7DTsFZUe1wFPKSbyjQFspK5w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ff25a5b7-532b-4814-2f7d-08d9db92d1d2 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2022 21:29:48.3748 (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: DBBPR03MB6796 Subject: [FFmpeg-devel] [PATCH v2 2/6] fate/matroska: Add test for avoiding negative timestamps 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: /IxKck9cQIHi This tests the issue from tickets #4536, #5784; the output of this test is currently broken. Signed-off-by: Andreas Rheinhardt --- Now only performing codec copy. tests/fate/matroska.mak | 17 +++++++++ tests/ref/fate/matroska-avoid-negative-ts | 42 +++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 tests/ref/fate/matroska-avoid-negative-ts diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index 2fcac34d62..b65a76411b 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -90,6 +90,23 @@ FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MOV_DEMUXER \ += fate-matroska-dovi-write-config7 fate-matroska-dovi-write-config7: CMD = transcode mov $(TARGET_SAMPLES)/mov/dovi-p7.mp4 matroska "-map 0 -c copy -cues_to_front yes -reserve_index_space 40 -metadata_header_padding 64339" "-map 0 -c copy" "" "-show_entries stream_side_data_list" +# This tests the scenario like tickets #4536, #5784 where +# the first packet (with the overall lowest dts) is a video packet, +# whereas an audio packet to be muxed later has the overall lowest pts +# which happens to be negative and therefore needs to be shifted. +# This is currently buggy (the timestamps of the video frames muxed +# before the first audio frame are not shifted). +# (-ss 1.09 ensures that a video frame has the lowest dts of all packets; +# yet there is an audio packet with the overall lowest pts. output_ts_offset +# makes the pts of the audio packet, but not the leading video packet negative +# so that we run into the above issue.) +FATE_MATROSKA-$(call ALLYES, FILE_PROTOCOL MPEGTS_DEMUXER MPEGVIDEO_PARSER \ + MPEG2VIDEO_DECODER EXTRACT_EXTRADATA_BSF \ + MP3FLOAT_DECODER MATROSKA_MUXER \ + MATROSKA_DEMUXER FRAMECRC_MUXER PIPE_PROTOCOL) \ + += fate-matroska-avoid-negative-ts +fate-matroska-avoid-negative-ts: CMD = transcode mpegts $(TARGET_SAMPLES)/mpeg2/t.mpg matroska "-c copy -ss 1.09 -output_ts_offset -60ms" "-c copy -t 0.4" + # This tests writing the MS-compatibility modes V_MS/VFW/FOURCC and A_MS/ACM. # It furthermore tests writing the Cues at the front if the cues_to_front # option is set and more than enough space has been reserved in advance. diff --git a/tests/ref/fate/matroska-avoid-negative-ts b/tests/ref/fate/matroska-avoid-negative-ts new file mode 100644 index 0000000000..a687c8f63c --- /dev/null +++ b/tests/ref/fate/matroska-avoid-negative-ts @@ -0,0 +1,42 @@ +3349536550047c5c553215003ba2acb7 *tests/data/fate/matroska-avoid-negative-ts.matroska +973070 tests/data/fate/matroska-avoid-negative-ts.matroska +#extradata 0: 22, 0x2885037c +#tb 0: 1/1000 +#media_type 0: video +#codec_id 0: mpeg2video +#dimensions 0: 352x288 +#sar 0: 12/11 +#tb 1: 1/1000 +#media_type 1: audio +#codec_id 1: mp3 +#sample_rate 1: 44100 +#channel_layout 1: 4 +#channel_layout_name 1: mono +0, -37, 24, 40, 9156, 0xe5bd034a, S=1, 40 +1, 0, 0, 26, 417, 0x7198c15e +0, 3, 3, 40, 1740, 0x29ac4480, F=0x0 +0, 24, 123, 40, 3672, 0x98652013, F=0x0 +1, 26, 26, 26, 417, 0x3c67c32d +1, 52, 52, 26, 417, 0x8c24b1ca +1, 78, 78, 26, 417, 0x6ee576b7 +0, 83, 83, 40, 2532, 0xa2c42769, F=0x0 +1, 104, 104, 26, 417, 0x407603db +0, 123, 203, 40, 1728, 0xae823d3b, F=0x0 +1, 130, 130, 26, 417, 0xcf2804d2 +1, 156, 156, 26, 417, 0xcf2804d2 +0, 163, 163, 40, 1028, 0x286ac52a, F=0x0 +1, 182, 182, 26, 417, 0xcf2804d2 +0, 203, 283, 40, 1916, 0xd378899e, F=0x0 +1, 208, 208, 26, 417, 0xcf2804d2 +1, 235, 235, 26, 417, 0xcf2804d2 +0, 243, 243, 40, 1168, 0x424e12cf, F=0x0 +1, 261, 261, 26, 417, 0xcf2804d2 +0, 283, 363, 40, 1660, 0x5cec156c, F=0x0 +1, 287, 287, 26, 417, 0xcf2804d2 +1, 313, 313, 26, 417, 0xef163d04 +0, 323, 323, 40, 1004, 0xac0dce29, F=0x0 +1, 339, 339, 26, 417, 0x2a009b3a +0, 363, 443, 40, 3008, 0x0fc798bf, F=0x0 +1, 365, 365, 26, 417, 0xbedccb9d +1, 365, 365, 26, 417, 0x2214be3f +1, 391, 391, 26, 417, 0x8953b878