From patchwork Tue Jan 18 23:32:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33650 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4236352iog; Tue, 18 Jan 2022 15:33:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJzprBcxxKiCswG7X3eNL08xzPtrBQhkceiBqfQVvdb/UjyU8lAn536cw/CcyD2AQW0zKhup X-Received: by 2002:a17:906:dc8f:: with SMTP id cs15mr18866417ejc.147.1642548789280; Tue, 18 Jan 2022 15:33:09 -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 sh31si8801932ejc.725.2022.01.18.15.33.08; Tue, 18 Jan 2022 15:33:09 -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=lcAZNf9M; 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 9721468B15D; Wed, 19 Jan 2022 01:33:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067031.outbound.protection.outlook.com [40.92.67.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0404468B148 for ; Wed, 19 Jan 2022 01:33:00 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NbU5oiiH6p5SqHNtFJzaI4VMFq8LakmESFcMAClUntcugZxQ1u9eW3hJWPtOKKwvHcsl6qGJpkiaR4U5ajhP3wFTL18j22XXlLTXJRo/LYgtXMxqGXPCPNUDIe5HWi4x1MgQnM7KBpug4T5bhOmeEOT/CUgJ+GDXIHyxrUqbT7aPn1QG/JcNonHoV1LJHgjWoSyzCs7wvoVLSptci2o3FNC6JrKaoNWOmzVjP4iyvJk53I8yFHIPccL0a1wt29FEaWZpnPtDEUrxaMmBJ4QHKqB2NUmAo3QtqzgxWHuPe6JuxM/ghtv7WcG+iu53aBfHdwWKdlcgmt7LKshM9DCkhQ== 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=uVYTYM7EuTMb+maN5u12CZee4R8uH7c+iH6qdAii2bY=; b=CsMzK5ShneEbf60tvEASqXgduOpJko31NKVTTiJVQGLBDZMQ9G5Ej3PDnWK+BxQmN+6hBu69O66guMH/tHFKpjD4vJQzxGUVZpDfXC/eFqf/amN7iOlIXuDC7RYzY9y6Ir1FZ/4mP86BPieV/VKgA/StepxRflz9UoGR3MmnvoCq9zN5Hoy/atqt3g5IT6K9hzEqmW6VYpkQAn1mopV+AFv7ek1LIdNPusYYFW1SvJMOZY/a3Ki9i3psyEHpCAUjzFqOQ9lX3UWmzUiiZOj7LBpbY7/BFD6VkyWsvT6AEU/7qTcRHI9JEAAxxAyjV6xJgiTbpiNapjG1XNz6YcfiQA== 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=uVYTYM7EuTMb+maN5u12CZee4R8uH7c+iH6qdAii2bY=; b=lcAZNf9MqVlVvhL7jvL5oiHSWfkXQql1PAriP4E4sW9VD+fTyUYsAeb/e3+C4d2OSwk1C1L+mSFwMskhMXOpbKZqnUJfZc4EQ5dlkmKHqs5FA0xsqOK0DtXVsgoqA7KSI/vdzuKhRXCIZ2WV8aKAQdqJp5eK/6B6zeTgFUluCrIxbgVzN6SVsje8X4ylsbprP4KKv3fTzglR2L9LbTx7tX4aP8ibmWgDpr9ieqEUULfWXrDbsXz804rip+vDATatSqhjKcR9PDf+ZylLTa3hpSEeoeBMNvq+fXCb3pLkjnXfZtzuUddDC5f4YhczbfbXthp6OUmw30kQtjtVYMTZZA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM0PR03MB4529.eurprd03.prod.outlook.com (2603:10a6:208:c4::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.11; Tue, 18 Jan 2022 23:32:59 +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.007; Tue, 18 Jan 2022 23:32:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Jan 2022 00:32:26 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [DOq8XNTEggymAPFP4IVlu+Ov1aSbNWb1] X-ClientProxiedBy: FR3P281CA0044.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4a::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220118233230.743570-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1a7e0e35-b392-4982-8601-08d9dadadc8c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTy/gRYuf0ZoZ8SwmTovZBiHS5igjedW2/Veu5H0gHsVl7E9/QCF/Z0nnYr9q0SIJfVf6vSlF8t0ZH623b3GvAdWWWEpvItC7602H0FeJp7011JBIkPbGnTJxqTx4fEBPrpqk7txswL/31u+thEVk//gC8/2ANlv0DVG9LiGI8Kjl+1zWYwjTjQR7oNVzbN0hGAIlstubT9IHGKTi8Jq4o5zKMuS3QxYQyhXrLvRQAKjdwZFY8hQ1giA473GCdAz+p2AIeDX9roFFLaIV/yDvFpRkzpqkwr8TlOC2yiDRzDGBF29hJOmey0VMe9UqTXodYS5ExtoFh8oiYu0aLBjaZCsenxyJhFygemCIaINdjheYwWvRExoiPluVP/+X95lu4l7IBDNvKbT/14YXu1pRpNMs6B4ItZU/++ymINX3ZvuUqbONkxBRciB+RtaFYqQYu7Wcj7QI/OBW8Fz0SsuzBJ2j8NrzVaZIV6oTNhwJj9L5CWsaPxqxXOFVwNhXEX0qqc630R0lncdfqTlPsXfNfCV5oBdta9+9+RaTWGJ4HgTx8L3JdQxdToK8OuV8I4U7rkG0k8i2fAgR5U+wqkqExo2utFo2h3yC/GliaaL58o6ESEY6VWxsTQI6XyvfqjtEB+MBwZsz23NWtLOGL7pInqnv0P8XHINa6VwRjvKaHsTDXpbDECtKXcSnAvbVd4AowT94KhTdxQkyz80NC3SW0kWPAUya3dMTpemWIzG5cWGLKhnDwNuvtInZmtp3RumTw= X-MS-TrafficTypeDiagnostic: AM0PR03MB4529:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2LXmlhJgMh9HoA0Efq9TRp5K+elXF9o0e8xzkJ1IG9fmtSe8Hz344karUvptE5KbXuXWjeszFb/m9Vj0GyD6S1B4jm5bwggiF0qtlR6JfNYAXOVUBUltvww2hwZe0VsGEs7Y0/2aNQZTpVjJE7/hE4lYhUs/k2oAUPpFqeGgcv0eEsnWJimIS0HxOP4ZY4yyGQXiEpkQ2v2XsXLtyyljl6mv4PgJTdot65B9Xnxg+3+tIQkAjW/RTkab35CZKo2p1cYoQR7Oupu2x5Yzh512tZ66Im6QEz8juKjqHehJSREZzvL/b0OVFe1KO1V/7chDNQ1TIQjvYOcm2ZzmxCcYwVUADFzn4kbS0WlKcKDjan+5gZwZ3/9k5t+Na5mn5NaNvwTN4yQatNjV41dquVyZE9rGb2ZqTZs7+r+tcTU/A11GTWqpoHfFvwUpuxBtFexHl3Db6g/5s69MkMWLMjiLHo8RG6x9IG/05N7EE+VMzSZTY/nevD2vQxSVjUy+ba8FjoZz9rs/DG5uO0bcIKC3MwAZbnxeTwQoQOW++ga8NyvrDDGRIFetbU9uvCalNCcb44KD2zSfiQMIwPB3696Tbg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5QrEQGG9aBD8ZHGlvCt3TCgYsJFlHVlV8a20Rd6+/RQt0nCD3ga/94XlWKrNNh2CjKKVn5+1qv6wW/ybh+ITyS9qDjZp7vHDVvAOFUL1r+V5Al2Je6Q3AQd8lddGvUIMv6QaY1u53vaqNLdnCdv3HzJx7VMELaVze236AmnRnRRyQ06vrywgAmvVyukeYqt1FVUAPr9qh4ZOg/4hHNetsesCdBwTeCaDyOqDOn0thVeJxNypgSOveOuG0tIui+TaFVNofX3bmIBNO4SeRQBldKTfH0uWk4/UvnJDOquXKTw1ONF4Ovp+IDP4Erzzv4jE+KCmLv6YDWSgByItfadMnpRrbCjviy8Q6UWJUjPWdUnzEJ9vewIRb0HWLZIKoi0Q+zGly3TINi2VYRFTjewqK1hImeckCo5v9uQ6kD+tEvB2ekbQHb1sffFxCskRIYTILy2nWh07AL49dENRptNJ9jYY+rFga6+aroZoegbXOZEz/jpB4+OdO9UaHno3S/FzgjLxkXuv0odAka6E1TfSF/2EWgg+Zt8/lhVDXSWl6XoPA/tL2i7Cnq4R4e6bqkmZnGHz8eH81IDdEDzAEEK+I8Le+SiWqkC2PT5qZTsQrkSFiJV6sStJ3QpAWjHK2LJ9kSZO7b5QjVbPiTxnjIE/f4h1KPj0ePyufhYlBfXfJifwXqxaAJPxj5e2ZOKAGpj5RkQMesXmaJE5Htmu2n/VQAPscpsfYVXfIv1HanT6+Al+DDDLWR7vFMwdkfYcJiGBBiAPRGZnSu3aXebd5hNvDPzNx5mOPn6q9W1mnaNss28rs+zHEbZwivdRr9NSHH3kU522s36t+3Bz9gnadN9jO62SerqhsRH/Y2G8zt2R8jvWbKJiBvReaBqA9vYmCBO0+9XXHcT+NnGcFRlT411F3M5jLe5FUMtTTCDBOQpEkwqslT7BQjPHjUXh5XW+atE2hYhatvw1Kbv98n/7XLY5pA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1a7e0e35-b392-4982-8601-08d9dadadc8c X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2022 23:32:58.9589 (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: AM0PR03MB4529 Subject: [FFmpeg-devel] [PATCH 27/31] 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: q2hwknlPTGAL This tests the issue from tickets #4536, #5784; the output of this test is currently broken. Signed-off-by: Andreas Rheinhardt --- tests/fate/matroska.mak | 15 +++++++ tests/ref/fate/matroska-avoid-negative-ts | 55 +++++++++++++++++++++++ 2 files changed, 70 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..3bc35d0f4c 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -90,6 +90,21 @@ 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). +# Also tests muxing DOVI. +FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MOV_DEMUXER \ + AAC_FIXED_DECODER HEVC_DECODER \ + AC3_FIXED_ENCODER MATROSKA_MUXER \ + MATROSKA_DEMUXER FRAMECRC_MUXER \ + PIPE_PROTOCOL) \ + += fate-matroska-avoid-negative-ts +fate-matroska-avoid-negative-ts: CMD = transcode "mov -c:a aac_fixed" $(TARGET_SAMPLES)/hevc/dv84.mov matroska "-map 0:v -map 0:a -c:v copy -c:a ac3_fixed" "-c copy -t 0.4" "" "-show_entries stream_side_data_list" + # 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..9c23f4721c --- /dev/null +++ b/tests/ref/fate/matroska-avoid-negative-ts @@ -0,0 +1,55 @@ +6048ff1b45660eb544c1f0db450afff5 *tests/data/fate/matroska-avoid-negative-ts.matroska +3618353 tests/data/fate/matroska-avoid-negative-ts.matroska +#extradata 0: 551, 0xa18acf66 +#tb 0: 1/1000 +#media_type 0: video +#codec_id 0: hevc +#dimensions 0: 1920x1080 +#sar 0: 0/1 +#tb 1: 1/1000 +#media_type 1: audio +#codec_id 1: ac3 +#sample_rate 1: 44100 +#channel_layout 1: 3 +#channel_layout_name 1: stereo +0, -67, 0, 33, 63375, 0xc76606ab, S=1, 8 +0, -34, 133, 33, 46706, 0x0e08a7e5, F=0x0 +0, 0, 73, 33, 29766, 0x753c031a, F=0x0 +1, 0, 0, 34, 834, 0x7e7776bd +1, 35, 35, 34, 836, 0x14a3a0ff +0, 39, 39, 33, 19409, 0x4b948b6c, F=0x0 +1, 70, 70, 34, 836, 0xf55e9a61 +0, 73, 106, 33, 21086, 0x1b9412ce, F=0x0 +1, 105, 105, 34, 836, 0x415591f1 +0, 106, 273, 33, 62043, 0xc2356b56, F=0x0 +0, 133, 206, 33, 36175, 0x0a7df38c, F=0x0 +1, 140, 140, 34, 836, 0xe26c9bad +0, 173, 173, 33, 16028, 0xa57fcbe9, F=0x0 +1, 174, 174, 34, 836, 0xbc8c9b66 +0, 206, 239, 33, 15428, 0x9a91f357, F=0x0 +1, 209, 209, 34, 836, 0xddeb9643 +0, 239, 406, 33, 66072, 0xa542b6d7, F=0x0 +1, 244, 244, 34, 836, 0x08a494eb +0, 273, 339, 33, 34985, 0xbfd8ff45, F=0x0 +1, 279, 279, 34, 836, 0x94f09bb4 +0, 306, 306, 33, 16036, 0xfc39c6ea, F=0x0 +1, 314, 314, 34, 836, 0xd6358a3a +0, 339, 373, 33, 19893, 0x7e746f4e, F=0x0 +1, 348, 348, 34, 836, 0x76ac91f1 +0, 373, 539, 33, 77576, 0xeba2e5c8, F=0x0 +1, 383, 383, 34, 836, 0xb32a86ac +[STREAM] +[SIDE_DATA] +side_data_type=DOVI configuration record +dv_version_major=1 +dv_version_minor=0 +dv_profile=8 +dv_level=4 +rpu_present_flag=1 +el_present_flag=0 +bl_present_flag=1 +dv_bl_signal_compatibility_id=4 +[/SIDE_DATA] +[/STREAM] +[STREAM] +[/STREAM]