From patchwork Wed Dec 15 00:03:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 32504 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7668126iog; Tue, 14 Dec 2021 16:03:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJytSa+aCEMY2NV9cJ8E4Mxk38zw+JC+KzSfU1rXmADAMdU2TybAw67sJY7qk8iWPmO8yCKj X-Received: by 2002:a17:907:7f9e:: with SMTP id qk30mr8274981ejc.313.1639526626530; Tue, 14 Dec 2021 16:03:46 -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 cc13si192734edb.395.2021.12.14.16.03.45; Tue, 14 Dec 2021 16:03:46 -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=@hotmail.com header.s=selector1 header.b=rDM2El9s; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 21AA168AFF8; Wed, 15 Dec 2021 02:03:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam08olkn2036.outbound.protection.outlook.com [40.92.46.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9E5E768AF67 for ; Wed, 15 Dec 2021 02:03:35 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hIxNC4jsHa5IX1plUoszREJuretYGrbawbpGYN8SwtIZD/T4prJlFKaDt9JsVXcLdBkcrEgJ7TQ14VM5R/2h/iA2EGoC1fraGVEGSfDoc8dGjyaV58bV/eE5BqLcxKcDXMznJFhzkGrS/6ascdCjmbieKFHdX9nlWqfs6ApSr+S0AhLHnL2bwG6FLM88c87JKJfOC6xJ/zT0a0LtUMbPX8pOwoJpFFYKwRw59HYXjTBIOf2llJecznZfY00+SyxI2WmWUXy0WZgGuhxjgh4y8w6kwJP8Y6H297Yuq9+ou6lCsIFGPrfrayk93G6lKmjGV5HxQJ9W7mhzDAbdR37g3A== 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=0p/UZvM4BthqC0e9rqz5kP3Wx5WBrTmZDgVkSCn/Dgs=; b=a1Em+P02hzJl2ikZH9cInnqLRAkFosUnO4CQ98iH2rStMVD5T4hGD6nLobxzgHMIRmiSGf4sQ54IMLH1j02RjY/zOdPYm7MbIiT48wYaHd0lQC+Cev/3aEQRU5zj9NoFow91ucKcOzq+nIi1Qoq0sD+1eYIqON/WWVbk87klrgirHnKbRA8PLR47jRluVM7x1WBRZiQjw0JKm6+hv71BhkKYiZ1pdGmhy2vfZgEjQJ9EtFuZTPBQ7c+D4c6LSw02MrckUgd/1K5LeZrKz0wAWGzlVXj1PjUVgwMmyApDWSKLdAuDGY04un3x9PLyeIN9yFX8I3RpIenjoRWdXhDoHQ== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0p/UZvM4BthqC0e9rqz5kP3Wx5WBrTmZDgVkSCn/Dgs=; b=rDM2El9sfrULxjwNbRZCF6HUtyU88Tpfr3KDNgltphQcS8cDuktED4Ns2U1Cs95Cu0LbD7ZUmlmucsr8quoB2l7smhDyyqhpUZtqJWz8Jb4H0gv2tyhT3O+AXJZJDd6tIjbolyfxojXUE7X5HXt+gFRT/ym8DAotbtbVKEFjhQQ6SarcRPXFDHNNMIXfwkt0A/rBQODqIbwLMe7AsD2pe75XUdzos45WqQHGbTS7wKW2ER+F9yVpHN/vVHnAdSt/Ve8sAO+M/fdBj0X6qTpbrJB1jr/m/GO3PNqH42SYsOo1kutveF2iSWkF+PUIcoajEdFSuS811M3P36ARqIiKNg== Received: from BN0P223MB0358.NAMP223.PROD.OUTLOOK.COM (2603:10b6:408:145::16) by BN0P223MB0023.NAMP223.PROD.OUTLOOK.COM (2603:10b6:408:15e::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4801.14; Wed, 15 Dec 2021 00:03:32 +0000 Received: from BN0P223MB0358.NAMP223.PROD.OUTLOOK.COM ([fe80::c141:3e6e:c087:424d]) by BN0P223MB0358.NAMP223.PROD.OUTLOOK.COM ([fe80::c141:3e6e:c087:424d%5]) with mapi id 15.20.4778.017; Wed, 15 Dec 2021 00:03:32 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v1 1/1] TEST Committing ref files with mixed EOL, marked as binary Thread-Index: AQJa6/OnBgOWbPmp/IU/1dfxU46KZgF2Nqe6ArXsT3U= Date: Wed, 15 Dec 2021 00:03:32 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [FuqjCBZYzdel1K9rFmu8h/Pddyr0R9J6] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 77af89fe-9cfd-4469-75cb-08d9bf5e5504 x-ms-traffictypediagnostic: BN0P223MB0023:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 1NfFXMHhMkiXMStV/flIBrte6u1+yNS2xOQOgLXWCLL7BjHq1k/VraWphSF3gjkicvrZ5R5JS+1NwfPh6rnA9Fl0qVYRi1QYwACkmCD+owwKwBtp2jHzXp/TIA5/ugmGd7exL8Awx3FyE4TaXual4GvN3DeCuPdmiQVQPZYLbIvfUh7JLyTkKAU86iJ2HmE0Olxld7IrwwYxA0qd+05IvHjIXAablTi71AVzZAkwF/Kd8OxDC7wuh3nvEg25YZjXZAX90qw/4uJLhfEB2jlTIL9L0hsO+svjkkdX8gfIG05NSzsg7nQA6pqsjQvnvyS9JCAhAtESKL/aIeEgLCeg9qR725GH+bRVd08Wlx+rbYEo6GWc/7qz0QKfY8WlSGg0AG/SfLgA26krXKnOcehR4ir4RiR7IM4r8dlmdgShHrrAedvY6DyLVbEII2RklyVAxFpxV8dXzo5Pwt08LDxiFh94n1yq+cIvYZDvxXN6hwWiEJQ1ohfUCnkfkAEyGN+PhN779+ghTZdm+qVB/e0CtasEcIoFVYU0BxtEHotq66T5a6YccQ9idwpLG1xWg5M8FdJuENny8hb6U+NRls8vlA== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?s9L3u2N7ILDMv9S7393Ro4J90W4E?= =?utf-8?q?FgbvMzBmphPTzlHj9oAZqDTA/IO+/YG7Zyr18iVAoJWGHsw7uaU/SJ0t8hHhNyBxI?= =?utf-8?q?H63ViY6HiLpLkf0wjdmknkbMOrGlUqSwDpY4OS0QKEudcTnZ7lMCQKFk4byaPWM+O?= =?utf-8?q?bSF/empjuSgfhnpc2dAP4gfLBXKgISXaahyBSG3PNgRXQZ1lbGd5Q2qsSvtcQ54vY?= =?utf-8?q?qigaiFYI0DDxOObldu8VAS6IELEe0jw25kBWWMAiYIx+9wIqMS0THY4coyQ6P720r?= =?utf-8?q?NUQS5zQ5QCBZnKb2506e91b603eLgQ3UZ5qrBecV1EaelOGyF9PmTsTXW2wXbSQUS?= =?utf-8?q?Xr+24i1ovP36gNrkwq0A4ESLerFddefK+ftXzjZf/pPBLWDxW29377CC+ioU+jb4A?= =?utf-8?q?jxYfi56E3/ZWLB8ffDdBbiJvaWgdF21mKW09D/pMiIrdLETawJqU2Xqy1wT9IwsWT?= =?utf-8?q?cG/nmD6djs0NwVdsHJIRAAWijeUN6LB2DQbEh+9ItRTHs9+KMogIMVG2QmBHunJ1r?= =?utf-8?q?UNONcXKjJNy9V0dIm9BK3lI0lIHUoUgeK0F8yW9mN/bH4ZqgoNuzvxXL9S6Jy6v5j?= =?utf-8?q?rg0zyis79EMOwToaZjpBytD25T7/yBbd/neuNFcbuHvD+GMAhFaa3/bOzS9Oe7M4F?= =?utf-8?q?X7nwaflwUd3uioNc/L9xQpVPSmC+t7lH0eq2Q9HJgDQ5IZYQsg3XTEZ3DCgRhllkZ?= =?utf-8?q?whrZkwDvVpINNp4NPuK/eHLn60ovxKftwMOX2sxr+iRHFw4sT2wSKNGcMVh+UczL4?= =?utf-8?q?2ZMq0PhLl2p7zZQZ/yaeHr+gb8tIZ9KCf2khVdW7EV3swbPHay19LUwsd6KMJu37a?= =?utf-8?q?bikLS5FKiHZ8MciiNCLH+PKgxvyJbh/UUDDGhy7Aelo5+xiX8RKAj8mI5h5O+WwFH?= =?utf-8?q?ohG8pvWB5tgkhuep2LYW0XWGMZ/PfGvp2oy3EgyR/HIQ=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-1ff67.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN0P223MB0358.NAMP223.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 77af89fe-9cfd-4469-75cb-08d9bf5e5504 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Dec 2021 00:03:32.2885 (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: BN0P223MB0023 Subject: [FFmpeg-devel] [PATCH v1 1/1] TEST Committing ref files with mixed EOL, marked as binary 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: waSttHVOMI9l This commit couldn't be applied due to mixed line endings in the ref files. For this test, I have added a .gitattributes file, marking these as binary (-diff) Signed-off-by: softworkz --- libavcodec/ass_split.c | 7 +++++++ tests/ref/fate/.gitattributes | 3 +++ tests/ref/fate/mov-mp4-ttml-dfxp | 8 ++++---- tests/ref/fate/mov-mp4-ttml-stpp | 8 ++++---- tests/ref/fate/sub-textenc | Bin 4635 -> 4602 bytes tests/ref/fate/sub-ttmlenc | Bin 7866 -> 7833 bytes tests/ref/fate/sub-webvttenc | Bin 4323 -> 4290 bytes 7 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 tests/ref/fate/.gitattributes diff --git a/tests/ref/fate/sub-textenc b/tests/ref/fate/sub-textenc index 3ea56b38f014d0dae3857ed2534c1b9e7d027ea1..910ca3d6e3ebdcc8e652e19fbf686a86f70f368f 100644 GIT binary patch delta 149 zcmbQO@=JL`CaRl2 jmS1x6JpO0_uqsDhE>nfP{G!~%oXPk3r8a8_d}agyLL@NN delta 178 zcmeyRJX>W$CU0y^Mowm4YD`9XW=>8_MqX-JYEeu^Qc-GRc1%WMX-R%=Vo7FlVopwF zOh!>=dPWIQGBqu~2&f|;s4y|D1f)JOCL<%UC?zJNxF9h(RWByPO4o&p%h+)8Iv%mf o=XtrgVlrTGasyxGlbiUXk%Trs;+J3o05}9f%m4rY diff --git a/tests/ref/fate/sub-ttmlenc b/tests/ref/fate/sub-ttmlenc index 4df8f8796f58015d76ae184a8c99e4c4c4ab1475..aea09bb31e2ec581bd31d288fc4dceece32f5268 100644 GIT binary patch delta 135 zcmdmGJJWWI&%$%Hdy# Qz*jg~o}Yd5U%qFI0GnznSO5S3 delta 163 zcmX@4_*ij68&6nFMowm4YD`9XW=>8_MqX-JYEeu^Qc-GRc1%WMX-R%=Vo7FlVopwF zOh!>=dPWIQGBqu~2&f|;s4y|D1f)JOCL<%UC?zJNxF9h(RWBxE@_8OPu9yrMoZP`% YF*%D@5>@CrGB<^<5Q)3_7T*g-0PG<@@Bjb+ diff --git a/libavcodec/ass_split.c b/libavcodec/ass_split.c index 05c5453e53..4155592954 100644 --- a/libavcodec/ass_split.c +++ b/libavcodec/ass_split.c @@ -484,6 +484,7 @@ int ff_ass_split_override_codes(const ASSCodesCallbacks *callbacks, void *priv, while (buf && *buf) { if (text && callbacks->text && (sscanf(buf, "\\%1[nN]", new_line) == 1 || + sscanf(buf, "\\%1[hH]", new_line) == 1 || !strncmp(buf, "{\\", 2))) { callbacks->text(priv, text, text_len); text = NULL; @@ -492,6 +493,12 @@ int ff_ass_split_override_codes(const ASSCodesCallbacks *callbacks, void *priv, if (callbacks->new_line) callbacks->new_line(priv, new_line[0] == 'N'); buf += 2; + } else if (sscanf(buf, "\\%1[hH]", new_line) == 1) { + if (callbacks->hard_space) + callbacks->hard_space(priv); + else if (callbacks->text) + callbacks->text(priv, " ", 1); + buf += 2; } else if (!strncmp(buf, "{\\", 2)) { buf++; while (*buf == '\\') { diff --git a/tests/ref/fate/.gitattributes b/tests/ref/fate/.gitattributes new file mode 100644 index 0000000000..19be64d085 --- /dev/null +++ b/tests/ref/fate/.gitattributes @@ -0,0 +1,3 @@ +sub-textenc -diff +sub-ttmlenc -diff +sub-webvttenc -diff diff --git a/tests/ref/fate/mov-mp4-ttml-dfxp b/tests/ref/fate/mov-mp4-ttml-dfxp index e24b5d618b..e565ffa1f6 100644 --- a/tests/ref/fate/mov-mp4-ttml-dfxp +++ b/tests/ref/fate/mov-mp4-ttml-dfxp @@ -1,9 +1,9 @@ -2e7e01c821c111466e7a2844826b7f6d *tests/data/fate/mov-mp4-ttml-dfxp.mp4 -8519 tests/data/fate/mov-mp4-ttml-dfxp.mp4 +658884e1b789e75c454b25bdf71283c9 *tests/data/fate/mov-mp4-ttml-dfxp.mp4 +8486 tests/data/fate/mov-mp4-ttml-dfxp.mp4 #tb 0: 1/1000 #media_type 0: data #codec_id 0: none -0, 0, 0, 68500, 7866, 0x456c36b7 +0, 0, 0, 68500, 7833, 0x31b22193 { "packets": [ { @@ -15,7 +15,7 @@ "dts_time": "0.000000", "duration": 68500, "duration_time": "68.500000", - "size": "7866", + "size": "7833", "pos": "44", "flags": "K_" } diff --git a/tests/ref/fate/mov-mp4-ttml-stpp b/tests/ref/fate/mov-mp4-ttml-stpp index 77bd23b7bf..f25b5b2d28 100644 --- a/tests/ref/fate/mov-mp4-ttml-stpp +++ b/tests/ref/fate/mov-mp4-ttml-stpp @@ -1,9 +1,9 @@ -cbd2c7ff864a663b0d893deac5a0caec *tests/data/fate/mov-mp4-ttml-stpp.mp4 -8547 tests/data/fate/mov-mp4-ttml-stpp.mp4 +c9570de0ccebc858b0c662a7e449582c *tests/data/fate/mov-mp4-ttml-stpp.mp4 +8514 tests/data/fate/mov-mp4-ttml-stpp.mp4 #tb 0: 1/1000 #media_type 0: data #codec_id 0: none -0, 0, 0, 68500, 7866, 0x456c36b7 +0, 0, 0, 68500, 7833, 0x31b22193 { "packets": [ { @@ -15,7 +15,7 @@ cbd2c7ff864a663b0d893deac5a0caec *tests/data/fate/mov-mp4-ttml-stpp.mp4 "dts_time": "0.000000", "duration": 68500, "duration_time": "68.500000", - "size": "7866", + "size": "7833", "pos": "44", "flags": "K_" }