From patchwork Sat Sep 10 19:58:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37836 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1645126pzh; Sat, 10 Sep 2022 12:59:30 -0700 (PDT) X-Google-Smtp-Source: AA6agR7CtRiZO+lnK4tUfXQw5NggaUfDcDzf1bmxVUxk9kD3pHaTEjFlf9DKrFzgzuDPkLL90LF+ X-Received: by 2002:aa7:c61a:0:b0:44e:7d1d:7814 with SMTP id h26-20020aa7c61a000000b0044e7d1d7814mr16180363edq.44.1662839970222; Sat, 10 Sep 2022 12:59:30 -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 h10-20020a056402280a00b004477be72d56si2434815ede.521.2022.09.10.12.59.29; Sat, 10 Sep 2022 12:59:30 -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=erj3oCrl; 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 9F7E268BB29; Sat, 10 Sep 2022 22:59:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072064.outbound.protection.outlook.com [40.92.72.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 09A4568B9EC for ; Sat, 10 Sep 2022 22:59:19 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AIwsXRpoB2O0TRIcSV14hcTdeA+LwLN7cjtU8kuwE+BUd1sYIv+QgSQD6VLP6+g7OqYfHBkepUhMNRd93tswvENvWNfMysif4VeIxn2GfNI+XglsOYdBtD8cpfARxCjUWieQNBDrwpFIpTjUwfHq9UaBHvEjhccY60XbRy30nZYXs/Byk2FJai+oMca/Yd4tSoK9gFCPMK0ZZEjUxMMporXDIsUphl4mEFLnKdI9CSPZvhkW1R0+YppJ/tjelWJ+uXoE2/EElN0lVX/Cx7WfMSagwStTyX7z1VqRL6ppHEtBMq+blc2HdzIWLFZV6CMjcQBieCH3JkHVDqT9iMs49A== 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=Y6+NePtMFwsbU9H0/UybK9FJTeeu2z1qI/PPh/ch5vg=; b=BGbHNn2XyrYXhFGFLkPgIW2aW9w79uH27Mnbk+RtJJt5ASBfC/a4xqo8Ij3xSqd9AMjv6yGynLw5DYTL3u2m0Pq4BBIaLxD5buOQ+IWuYibs9mV8y6A5r3RRY0WC/E2TlNjKM29pfIbmjo2bSrapwbrZ6MG1yvftIU5bQhxqbI9IxcJ1BJg9PJmjRnH0uJUqXBQy2VjFZdU5WLRgEIlsdstBc9/vdNrVszPC7QfNZ2PWDb8Q5KLHqr/9uucYi6Aq72wCdtWnaYaY03no39nqp4G7m92HlqRz7byFHunMvRGeoPAOrMod5Wt5noLK7Y96HmH0xkQwb5awlz85wLM2jw== 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=Y6+NePtMFwsbU9H0/UybK9FJTeeu2z1qI/PPh/ch5vg=; b=erj3oCrllBNXuEzTj1klhYx65DU8L+/c+iPNX51zfekZKuSbLbspnrsAxGSUvkqI3wSxIkQWUfja79rU1oHUlN6HTsW6ihuaYTyBv2fnIlDeN+g4YqexDOiABheYubmYAPL+sWRzxKvfR2FjnLloWYg9Xw7vCQcq7gj8JzTDJEL3SMGlijd6KEqANGzsRmbM3z4s5fPcDYf34G8i9GImE6NVVIaXyY2kdpz896k2L52Xzb3+F3m5cx7Mbw3VahKrpoQZAeykYv+bL2uouxb/bXAj2XVljIxaEXsc6TId2kzvK7qPh1TYGwD9bj1qlHmpFXsPiAdSX9GQu7YqmUQLFg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0219.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37a::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.22; Sat, 10 Sep 2022 19:59:18 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::36a0:c1e3:9fee:2125]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::36a0:c1e3:9fee:2125%2]) with mapi id 15.20.5612.022; Sat, 10 Sep 2022 19:59:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 10 Sep 2022 21:58:22 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [vdTjjivAiGX9aZJlZvp0OeKDkuxxLtEHORK4AflczHo=] X-ClientProxiedBy: AS9PR06CA0178.eurprd06.prod.outlook.com (2603:10a6:20b:45c::10) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220910195823.3133712-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0219:EE_ X-MS-Office365-Filtering-Correlation-Id: 84d03c27-b910-4530-ba38-08da9366f124 X-MS-Exchange-SLBlob-MailProps: a+H6FLLcF3qo6C/2pr8DHB2giRZSNnyPfR+2/PY44o3zEVayFEwSUZhCGvppaEXHSQLg+RLmHivA5Az7MV+2QCdGlUhNsPz9zYF2Dx6+4t6F0uJiise29X6HKVBJYxB+epiWL54zWLmpW8JVbbYpiMfy0MPI7xDGtrifp9U9BV9jOvlaBZbiKpTxiM68iX6KKV73AGSqLGHX+MzD/YTUXtCEnMSH69prh5rTPQ/3+jmBTQMaa7V0XKDbzk9OVoRJCqxOzM+PCqapUiurruxOQt8y8Dz3wOa8P4Kh7Xom75z0afRl46ZbzYHo8K0NVURyep9hNXi1BGtbeSk8MHnNSTGYN4H9RbNvcL0qmFmiQsGLc+OCRZA6DZirspwhL9BQZkyP8r4AbOvSnGfGCH0dp0dClP1vFqLj6e/J1JrLySHeLs7b7y1fCnw9qhEx+RRWG71FTL8RI6xHE12go00bzVhbI7T+7moGW9Y1Dx/65cifC61yq8ICRAn0xDXbkMydOIGYf0nUk17UaWss3x6OkUMUm2TmHOCqDDAAql/jNUU8kmT9t/ikU+PKqmEJPFDafvfImGJFhTPqsDug2IoehJIanWkfABYXatR2SwGCT9FZSWuMzlTYGlM+GU2+oU0ElGYih++7LphyXxrjM5Scd/aOhZ1QBfgIhbuHLb+gLWtcTNBozbhvs6Wdg2VlxEOJRWa0UXZDGdja5HA78v4seDrT3kKcec9NqLZyOPgSiPGeEwpj47pqUdzr22bqXc97KrJfzXkEu15tcCXW/PhM/v0R4FQ4uL8T06hEqcklR6z3mw7f+L9KAz0Px1Ub2Hn1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fxZ3V4atNZzDgnsiPvRb27PDoMCk+8HDbmoUvPdfCcpvh/Ig12gWkM7ULcKUn/0EH5xOQwdQUK8GOwzoY5Ef5I9Qlsnm4/kIZOmqqSDj7fXTSgOjfQmkEZPAKWmYmkFZ6ESs5fa9ElGyjMyx21D/vFSzaF26vmmAyLg/4owZ4wllY4CkDqQL3kvgJxFeQz8S+K51icRdTOPs2Cq3JM3z0kYy7DAP1bxQtttOKTvvTV45m+iUPP1oG8/TKc32NPOezx7jsICZlOCdT1Ps10zdu9w4RE191vjm1VxOF9jlu8BiS9OkYOs1L4e0pRO2DqWORaKFwTSeNef5oXXb6Wczm7NIOh9eyx4zhOdro9wtSDrLjLoyqsOPA9xvAfhHtneIVMT58zEwAEmDFLg1SybgUkg6L7dbvE40LlWT45p+GjaLsdCIEpwYtLSH8h3MyuOIBG3JzWE9QN5ZsbfCoGB0CudOhhoiuQiShPTPttbSIHyKWypGL4HG0Q5XUjQJzeID+GrtMLWe3Q1N2t5qGLYj6HsVtYPgvFY4jY/jr/p0NCwKL8j+cnlIUNhxRdBMHRKnDg7S8TuiEPbtFi7Hmh6ZDbnk+tFIhZANI2bmXBn261nCSgdef0FkmrKsr/xy/xUToBC9U0b63TFAybmO/eLsAw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?HJrlrehbuR0YccQ/N6saFPnjpbpx?= =?utf-8?q?75HHX59uOmw1a5Wmib4SLBxZdkclgqiNOZEcLHYw+YghF+6nIczEBVAs8JrC+B9ZN?= =?utf-8?q?MLqmHO/A2Wf7/mANNCJqHK4E+h3qbat11281eNhKDbnJvS3CQyr6kgl69OHlxb4S1?= =?utf-8?q?YEP7G31N8Lw1U3Io76Y1ZxsaGKYmD6Bz03QQMVsEXKJZfF4Lvz8EDRzPxPHBAKSHw?= =?utf-8?q?oFN6A7K8EmfhJNcf2BmhyViCvv12Ew9/nCD4Mykk+ongs+mMWOLMd29lnkTpebPDy?= =?utf-8?q?VID8TAQY9F6MSiwd1dRn6Nms+lS2PFYeU1nRmO0hz4xEYO5GxyUE9u324ev4Xm4Kh?= =?utf-8?q?3fMgLe4aYJqHU9qIOPSgyk+C4xPLcCoM3dJCPDRQsRmSknChdOmosuSZTut13jDnw?= =?utf-8?q?ZPkd25Z5I5e8qNhf2vi6P0sfb7gitOHobGKPSmKGWVbVM0pLXBlqr/f1mPcwkbbrY?= =?utf-8?q?VNtbOylBFmwkTNXEVkFJxBa3Z8SJ5rUway/+znY5BROMRibP7YBRq6Pxj1FOUSx6c?= =?utf-8?q?ssxcZ7tct7EZGkxEN/WNtV86/YT7Jtpt7lDoD7uoC6qf1buI05SskzsbCAMm7/B89?= =?utf-8?q?rlh/Ve5UCkpLQu8FAiycJ8tw8v9Tevz/jMYTczitH7GN8k3FxAgM7k04SoRLgiU+N?= =?utf-8?q?yG/1VVYS3Q8Goim0PI+rcFCygwP1v6o+mqU99Jkhn0qLFKKi2UWYJWntFOz82dNsA?= =?utf-8?q?UpIe5nQr0oey+H7D4ex2jbCegeLTOkdEfgS8PBqfPVV2oBGlJWORLK2sqtztx/oHJ?= =?utf-8?q?emo8SVIDnU/TfVi4RJWILzkNs9hCNc9Rr1wygu+bOe5hvQp8QVYqzKLnL5jtcQnEN?= =?utf-8?q?nfEsS/7oOGxRRbLnTki/f0/Nov5fOKwyFq9ilvJCCQJyjutpEKbgsYrn7iQpO5idK?= =?utf-8?q?wLV5SJR3koDDha7ptiVPXpZT1S2/mYydOFM8D4KHVuEnyO6t6AXeNMsqQNHPfUgNT?= =?utf-8?q?2o/ju9zrg9e84W6N8n4Y7klh+uT7+RbXniZsY9q6L8Yl3DCm3M/GK2NfNjf+A7hUa?= =?utf-8?q?fRMUy4yy43fqeEDantZ1qioGuKUYZ9sRcG+eGA6rer9RSVHSjVrL+crkUwgPwKibD?= =?utf-8?q?YkIVei7LRZD0nC70bLh/4gGgjvljaaTxBnhRyU48yTyac1Lmci6p04x7b8cHD5sSb?= =?utf-8?q?+SN1IHJhgwNwtTo6DHSu1+WXwcJzCBVkM4dj/9KL3MXTwMq8F8YQwHVk5E6Yc1qoF?= =?utf-8?q?Q1VBMSxwZf2cbsx1x/Og0r4LTKc3/HR2qod1uo4lxLGH44vf5WYa6IymW6LLdKY+G?= =?utf-8?q?sFIgIyZeQRkot2Y4?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 84d03c27-b910-4530-ba38-08da9366f124 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Sep 2022 19:59:18.1609 (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: AS8P250MB0219 Subject: [FFmpeg-devel] [PATCH 1/2] fate/id3v2: Add test for reading and writing UTF-16 BOM tags 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: B32B5PMPcNTC Signed-off-by: Andreas Rheinhardt --- tests/fate/id3v2.mak | 5 ++++ tests/ref/fate/id3v2-utf16-bom | 42 ++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 tests/ref/fate/id3v2-utf16-bom diff --git a/tests/fate/id3v2.mak b/tests/fate/id3v2.mak index 4dca681e38..7ad4d877a4 100644 --- a/tests/fate/id3v2.mak +++ b/tests/fate/id3v2.mak @@ -7,6 +7,11 @@ fate-id3v2-priv-remux: CMD = transcode mp3 $(TARGET_SAMPLES)/id3v2/id3v2_priv.mp FATE_ID3V2_FFMPEG_FFPROBE-$(call REMUX, AIFF, WAV_DEMUXER) += fate-id3v2-chapters fate-id3v2-chapters: CMD = transcode wav $(TARGET_SAMPLES)/wav/200828-005.wav aiff "-c copy -metadata:c:0 description=foo -metadata:c:0 date=2021 -metadata:c copyright=none -metadata:c:1 genre=nonsense -write_id3v2 1" "-c copy -t 0.05" "-show_entries format_tags:chapters" +# Tests reading and writing UTF-16 BOM strings; also tests +# the AIFF muxer's and demuxer's ability to preserve channel layouts. +FATE_ID3V2_FFMPEG_FFPROBE-$(call REMUX, AIFF, WAV_DEMUXER FLAC_DEMUXER PCM_S16LE_DECODER MJPEG_DECODER ARESAMPLE_FILTER CHANNELMAP_FILTER PCM_S24BE_ENCODER) += fate-id3v2-utf16-bom +fate-id3v2-utf16-bom: CMD = transcode wav $(TARGET_SAMPLES)/audio-reference/yo.raw-short.wav aiff "-map 0:a -map 1:v -af aresample,channelmap=channel_layout=hexagonal,aresample -c:a pcm_s24be -c:v copy -write_id3v2 1 -id3v2_version 3 -map_metadata:g:0 1:g -map_metadata:s:v 1:g" "-c copy -t 0.05" "-show_entries stream=channel_layout:stream_tags:format_tags" "-i $(TARGET_SAMPLES)/cover_art/cover_art.flac" + FATE_SAMPLES_FFPROBE += $(FATE_ID3V2_FFPROBE-yes) FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_ID3V2_FFMPEG_FFPROBE-yes) fate-id3v2: $(FATE_ID3V2_FFPROBE-yes) $(FATE_ID3V2_FFMPEG_FFPROBE-yes) diff --git a/tests/ref/fate/id3v2-utf16-bom b/tests/ref/fate/id3v2-utf16-bom new file mode 100644 index 0000000000..dd2566de2b --- /dev/null +++ b/tests/ref/fate/id3v2-utf16-bom @@ -0,0 +1,42 @@ +9b8bfdf87a8d3d089819ef9f6f264ec4 *tests/data/fate/id3v2-utf16-bom.aiff +885482 tests/data/fate/id3v2-utf16-bom.aiff +#tb 0: 1/90000 +#media_type 0: video +#codec_id 0: mjpeg +#dimensions 0: 350x350 +#sar 0: 1/1 +#tb 1: 1/48000 +#media_type 1: audio +#codec_id 1: pcm_s24be +#sample_rate 1: 48000 +#channel_layout_name 1: hexagonal +0, 0, 0, 0, 19650, 0xd5662610 +1, 0, 0, 227, 4086, 0x00000000 +1, 227, 227, 227, 4086, 0x00000000 +1, 454, 454, 227, 4086, 0x00000000 +1, 681, 681, 227, 4086, 0x667b2643 +1, 908, 908, 227, 4086, 0x9a09957d +1, 1135, 1135, 227, 4086, 0x763e27c5 +1, 1362, 1362, 227, 4086, 0x2a47f536 +1, 1589, 1589, 227, 4086, 0xed32e5f2 +1, 1816, 1816, 227, 4086, 0x2e96c720 +1, 2043, 2043, 227, 4086, 0x84c5b5f0 +1, 2270, 2270, 227, 4086, 0xe3dfeefc +[STREAM] +channel_layout=hexagonal +[/STREAM] +[STREAM] +TAG:title=Дороги +TAG:comment=Other +[/STREAM] +[FORMAT] +TAG:artist=Мельница +TAG:RATING=0 +TAG:album=Ангелофрения +TAG:title=Дороги +TAG:tracktotal=11 +TAG:totaltracks=11 +TAG:genre=Folk +TAG:track=2 +TAG:date=2012 +[/FORMAT] From patchwork Sat Sep 10 20:00:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37837 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1645343pzh; Sat, 10 Sep 2022 13:00:17 -0700 (PDT) X-Google-Smtp-Source: AA6agR4mMzIJRr/5nQGEv2XAhkIAP4pekgzSzdl+fFBUNqS3jdN7+HoQHVB/TzXgr2OfVx0oiE1N X-Received: by 2002:a17:906:9b86:b0:73d:72cf:72af with SMTP id dd6-20020a1709069b8600b0073d72cf72afmr14008829ejc.440.1662840016881; Sat, 10 Sep 2022 13:00:16 -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 di22-20020a170906731600b007307f95bc5dsi3768847ejc.383.2022.09.10.13.00.16; Sat, 10 Sep 2022 13:00:16 -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=flaDtNtU; 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 B04A368BB2A; Sat, 10 Sep 2022 23:00:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072054.outbound.protection.outlook.com [40.92.72.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1603468BA7A for ; Sat, 10 Sep 2022 23:00:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UfqGB+aVLT436/ILDRhNSYCAipRdWUDkiJ+FtU5k0nxEzIaeacJRZQ7rydHDoHoH0fk1K1w2UQy/0oPraIxBa9z0xGQLeO50HvSPfoop+d2TxPJ9P/MBYpsMW02VohqTCEU8QoR/mrLaDd8FZoJJh5jjT74tER/7/67QgyonJoY+MglAetCee1BNHo41pb9DFh5S62nd50/xBARwFgYooEaBxztLhceepjSxzH5R5o6Qco4DVd+y69AyXkAq5Qtpsh8iAM8nAqJWiY+8SdzQkCAtCVmjZ7OjCBz1qtxGhS+BWgA774NrMAiOQxTql2DQciK0d60+wZnE0aoXM2wIsw== 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=FcUONzgtMRR0TNETjwTlYqFwPLZTup4IZdsOsKQw8aQ=; b=X/p+n3QYUnI/2h3y6TnEqQcBMfS/2sv3xwPkpeWo6ooPBk7tyxWUxykKR5QgI5RF7lLST0Tv6Am4xMUvWgrgOhRyCxJ9PyZzAwQS+ecR+dU51pzIcgsIxDgZzyM1Quwz+/w8EF5qCu+uVwCMQ/7YJNcSmKrhUAoS9Dz1WV80+KUIdKbY6BlDnfpeV6A9vkdCf/cn/2g7/4EEkokGOAkPXXXS+Nr1T+u4Teh2qacd7Qo58Ruc38dQXa28hHWsLKbcV3QNmVsl3vAvNsD8TWK/67E6vWYNn51g3rGTGWx477Vok9RddgV1Deg+ED+pOyK8BaQdqok/X7vVZvJipUlreg== 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=FcUONzgtMRR0TNETjwTlYqFwPLZTup4IZdsOsKQw8aQ=; b=flaDtNtUvHKkVBXaz42qBTc3/ZXMfNoIwwIaRv7PTr22v4znWqJPVHNJETWN28SnpTugnaRRUbeeTVKhEI8Sm2pIh5uZBrcQExIixShRk0mpvHc98jcwOD8FYaozlzqe83+AmgNxe6TO+mlVbWEIHzBgpxGGcnqN3j2KPRlNQU+WumbgtqTTvFWfYIooMZ1mxB8z+OOne07xaYl9JgzOVrn+2Qpz9TUoRTqjRMjJk/DrrJhSFZTAbxaADcUPJPShWDUrIp6gvDxhIYQL8h1Hjba/9vNEMHLVe3IdqNokZLgJT5isEWfOh+1hxuJIIVdLAwa+NL0eKlmLXSD72Z7NYg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0219.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37a::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.22; Sat, 10 Sep 2022 20:00:06 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::36a0:c1e3:9fee:2125]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::36a0:c1e3:9fee:2125%2]) with mapi id 15.20.5612.022; Sat, 10 Sep 2022 20:00:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 10 Sep 2022 22:00:03 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [MtlvmOwWSqNCwDB/GclKpgxetBoOvmsb0tHfxuprsrc=] X-ClientProxiedBy: AM5PR0402CA0011.eurprd04.prod.outlook.com (2603:10a6:203:90::21) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220910200003.3228292-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0219:EE_ X-MS-Office365-Filtering-Correlation-Id: df595b1c-37fc-4420-6bfc-08da93670ecb X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKxxnu9+Jh3HQy+dp9k5aEso0giqOT34xyUky/GZz3x+MbNmWXjntKb0NHf/42z+zrdaCQV1UV1ZcRRwZMqjjLYiON6g2gcqIDn9Cx7P80f9ZeWlwR6OZVkKIdM6ixdn4c4UdCkKqv6dLvbQe8Uog9Wiux/4eZGmIloyhWRvqlf2h5s3PYMGyIOPFtyfEO+8121pcNs0mGqgrXVDrz2/XDSDFzBEyqthqv+NdyyW28dKcGNoFOUbJjDynOFqQ4QKzoxrDvWlD1bK6APdBdAsjSGKj7OX5bm6+uZid9t7u8iRPBtEJ+wRVRP8fTQ5770GKvTLk8ljQNZi/9GTIwTAOhJk7HNFt51gTxIFRfz6L4izQ/OGfTIZGv5mA9NgcdDbs03Bo4oMzBQtvSGE8T8zbQv7q7RypgAl2jR3gmclz56R6N4TAtORo0YbwL16OsIP2E4gMBdugSyPk6iKEEcf250fYtHdT+5dSHk19pNEbo2gzOjFDaQA3Y9DJK2wX7Qg3z6KnEBLr97uF8vjNhBcpGTYaQh8ewxh5KcpikliXXFIDDqM1LblZOauq2OzyQhwb9jzOb4CMvm/1BuQqgL+TVR3ghN6GEx8vr21MuRVBCaan5iQYlqX2LlXCLuZXtqEGII8/UbxVQ7Ek0jpzSf7fsBbm+X7JMreElMX1/INF2k3SBp9AEP1jto21eAmum9uO0APTvf1kxUIQyZtmIVnaqwo727EzV8bqPI= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WiiB8WHO4cp8Q3slpZ6ypYGZkgIfclKn16qXrcxCUnYSBBhcg1AW5PzAdOuCFZFsNniHMCj8H8Yo8d+gAPZsomwv+Cod/lp5D1WLwSyNsOjuvBrbBn9cLyqDlBzwbSV0haawXEyGmZUdcXdof2d3nOiitddWBKZehSaYb0jHjV/jmaaN1opLW+9P+XyS/nrrGyt0oP7ecdiYxXAAWA0fM80AyidgiLq7uYa293cPFk4eXATtVtaEWn+pFqn0iaPQ4NY7NoAxUiFqmt/aYiTsuXO3HKrrCvkaHo2Pz2d/DWAyciU3SsV/Yix/pij8q0+QlP2hDsU8GKgZ/XoUrhx7XGSCos0qaH+A9Y7NnzPdnYCz9ezET6a8bQotGN3K4Y3aTImjVdhC1jCu85I4+82KBhA2jsFcDQrpjltRAai3L277kc0GF3zTDQJpwjQdcVa7Hd8pT94R68opDZgWdx+FsbMb+Zs8UeR0Mf0NpC6kEq4mAPZNeSkArwo3whvjNXmQlg9QQA4Y6Xaj4u2tRz180C8Q2W7nglo+5i7trXfyRfzxhDdwQ8Q7j4P+6vrcgM/Om7EeGf1EDpnbjjYjFbj7wK1uPLMooHl9u+Lo9sKZSCQrvZpXEDitVTvtsnG0OGUCaXLOni9GB0T5M1pKJ5IiOQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8HBiuEyhxMZbx9MkJvsx6bPT8CmljoFBWIWQE1RBqm1Y6i0auxcz50Qp+1eKxAuaGUrjVVwsICTm3iW9PK5g1pnDBH49a4A8va3KGdf1EpbWFT2ZVYkqI/48shel0RkLeXL2ye7hhY/oppfyHVPiR+nkJ2bcmix5rebCKgRpy1OlnXAtj6AFEfx/xoWFNQbnwZRALrkl3zkwN8BW7Zh0rC8JH2MQGQp0MhGBSFO2sm7sioq6JxURT0LGprsJdSs5H61ET4TxMwZvWMrUOnq8MsQZdYPzOzftyRQP0wWI1tKdgiWNwlawDsieHfxrHPL70q5HCDuAfP3un9gh85zrr2jJwYfLqvK2TbFN4k2taymyT7W1vDwv6UNG52bcIOxCiKrcloMdByovIAxrmeEGzNaAtkkT2cdriwF1zrLWOxOhWcA2C+eJ0GYF2soFDVND+YIWaH+sS08soNMrPq/Jhgfc2qbQWwEjakNnqbw+H6SuByGXmr/4SGxW2X8H1+pk6ZAgwLdoRtoZyjVAfysc5pe/CCXFdFeTrR1pptZs/1nVSJHI2/Cu3fLLy2/FWaHrHpKjD1k0TR0LylxP5G2BAAl1PnW2v9ziC/JmMZ2ovUu4Iag3cob/UKedk1eb4/Nh2p0hDECh9dcqMgWVdWtbEl8uKJc1/Pp/G6YGYwzVPF8fV7BkuKmhxirDm09rL81iw55hiQj6BimaA/7MhiN0x2KzmcC21e9zQdt0rvotY9wf9NXTC610ulWA67+03b/rRrC3fjT15v/w+3Wct1I9wpYI8k6Kl+tUMHzE94qASjgONMGEEcK0HRzXeNS2AgEBSF5ITi4WKnFrjfns5VB7tmlQ4C4z2TndaHZzd+t5rGL496wNjpImI1CGuWkPWMktFXvd968nbnzs/ls5YJPulWrayluvbBCUYEiU3ocwRH5GasrgEGmM7JkLVSGn7gXeEYBhwNsvSJ551KQKJhMa4trDZYtR2Xkf0MoMCbhhzs8++FmZlf58DUMaYWAEr5banga+L5px6m4tdXcnWnNl0fExq5qvwMcMHK83c06JZeS7EwBLQBwF00IQHUzQJeO6GqfwlYpzpPFKw16cCPDrYOqNd2rOIz5trlXIzvqNLs2QEXB1bqLP7JRIVyewr5JDBfQGjaye8APu0q6B1heLEWMd6UuapnwpFFibrrPadnU7hkDVC282i8RP/1yDgPlIGjEHWoZwcrzdHeixYJoy5bDhvxl3NST0vfHvMO8JpHJf+6nyNCmWgbaU/1XQQIZQDA6LlNYO2CD4mUlJUYHYV2jQZ/Mwb0XVZ7dtz/z+okmVGPOPjhhczIj5pZO8p/oZ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: df595b1c-37fc-4420-6bfc-08da93670ecb X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Sep 2022 20:00:06.8441 (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: AS8P250MB0219 Subject: [FFmpeg-devel] [PATCH 2/2] fate/subtitles: Add PGS remux test 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: bR+/V3MepQ4b Signed-off-by: Andreas Rheinhardt --- tests/fate/subtitles.mak | 5 +++++ tests/ref/fate/sub-pgs-remux | 15 +++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 tests/ref/fate/sub-pgs-remux diff --git a/tests/fate/subtitles.mak b/tests/fate/subtitles.mak index bc464edce6..e6684a814b 100644 --- a/tests/fate/subtitles.mak +++ b/tests/fate/subtitles.mak @@ -50,6 +50,11 @@ fate-sub-mpsub: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/MPSub_capability_te FATE_SUBTITLES_ASS-$(call DEMDEC, MPSUB, TEXT) += fate-sub-mpsub-frames fate-sub-mpsub-frames: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/MPSub_capability_tester_frames.sub +# FIXME?: The dts in the input file are not monotonous and so the +# timestamps of the remuxed file have been fixed up. +FATE_SUBTITLES-$(call REMUX, SUP) += fate-sub-pgs-remux +fate-sub-pgs-remux: CMD = transcode sup $(TARGET_SAMPLES)/sub/pgs_sub.sup sup "-copyts -c:s copy" "-copyts -c:s copy" + FATE_SUBTITLES_ASS-$(call DEMDEC, PJS, PJS) += fate-sub-pjs fate-sub-pjs: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/PJS_capability_tester.pjs diff --git a/tests/ref/fate/sub-pgs-remux b/tests/ref/fate/sub-pgs-remux new file mode 100644 index 0000000000..e965d93bec --- /dev/null +++ b/tests/ref/fate/sub-pgs-remux @@ -0,0 +1,15 @@ +cf306b7bc30122effc6429e35364f640 *tests/data/fate/sub-pgs-remux.sup +49382 tests/data/fate/sub-pgs-remux.sup +#tb 0: 1/90000 +#media_type 0: subtitle +#codec_id 0: hdmv_pgs_subtitle +0, 6072, 6072, 0, 30, 0x32b303ec +0, 6072, 6072, 0, 22, 0x27510416 +0, 6072, 6072, 0, 160, 0xe2024133 +0, 6072, 6072, 0, 22943, 0xc011fe0e +0, 6072, 6072, 0, 2969, 0x35604c6f +0, 6072, 6072, 0, 3, 0x01800080 +0, 35426, 36102, 0, 30, 0x2db303ac +0, 35426, 35862, 0, 22, 0x27510416 +0, 35426, 35426, 0, 160, 0xe2024133 +0, 35426, 35862, 0, 22943, 0xc011fe0e