From patchwork Thu Jan 20 03:25:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 33731 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a0c:e44f:0:0:0:0:0 with SMTP id d15csp658577qvm; Wed, 19 Jan 2022 19:29:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJwMVipIG4PaS5pYnKG40Fd7P2e66gniioWF+sct0XNPFCANPeE2DPmcWjfbF5/YcL7w4vUJ X-Received: by 2002:a05:6402:2204:: with SMTP id cq4mr6461717edb.383.1642649397415; Wed, 19 Jan 2022 19:29:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642649397; cv=none; d=google.com; s=arc-20160816; b=uzsT9PzQbUJFNKbLGyQu6J0SLKGkkGKxypyBOAFoBxqqOQoVtUYt1fAJaNvEb13ebM dm4nWtEi3F3Y2IRwYfsm7r+nAcODkB1D4qfDvKhxQC1NFNmhRf5fa/gsua9hUAAseAZP 1fmSvCXGACOsr5LThw1L5kacf6BjYCkcVsyKzX72DgHeBt3+fGOCQPn+PbeH8jWzLxzd uixj+MJZXjGJ4oXF/f31uflxEGKVFYidsQVIOf0MFGjPzejy78sBZzXNv+TfLWnlfQRY VjnDApxI3t+QJjBimGAinDv4LmSYMawxsjKodBN7TMxFlPrL7dmJaVblO6mMUhTx1Tp0 vcCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:mime-version:fcc:date:from:references :in-reply-to:message-id:dkim-signature:delivered-to; bh=KB04cco0No4xge1c4IQGsu0fJap6WNSZQ56YrIeWIag=; b=DctPYRzga2UlzSqcn9ZHbjm0z8BXpRcrIp3rJWnZjF5utJzAwDMyFHa54LvYIIOddJ RwMgeZEiIwAsWuZWWvz4hqbmxP0+5qr7ZBFRaoC4/JkxKWY9umTkhVYdmp8noulTTut1 QlQDp29Tc3hkO/ULulB345dTeC99KEhE/xKo71qxnb1CoNn4lm3i5XwTg11ZQM0DR9Un 2HdQMOunAVdqarSOhvJ7N7TDggGgPm20iOpoq2qpE9/ocpO1Ad3ykZRnXRtzc49ZWJnQ 61YIinfehI9T80muuVNq/ShFUxqv5ZIqha522cJ3qrHC3Je0YfDXYecBKuXX+JeK3ocr WMhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=D8Dvmryy; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a20si1157093edb.81.2022.01.19.19.29.57; Wed, 19 Jan 2022 19:29:57 -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=@gmail.com header.s=20210112 header.b=D8Dvmryy; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 472FB68B333; Thu, 20 Jan 2022 05:26:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7682B68B2AB for ; Thu, 20 Jan 2022 05:26:01 +0200 (EET) Received: by mail-pf1-f175.google.com with SMTP id a5so4157923pfo.5 for ; Wed, 19 Jan 2022 19:26:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=kvfdnmsm1ycOUMPMsqonIN9VM28V0LuiM2jsDLNw1I8=; b=D8DvmryyKYngdI2sOuUAd4OBQhQN9lVsM+3Bg5OWkRokTJg0ZPifvcEsi6sQIxqiyg yKGNUhO0cbhcrzAVqZEJdvFJa9gz0HcWCamjzKoJBOmG5764mWOowIu0++JClVpiODIj XYrQkx2oQGpu5UZ0E/VPne5ks/4MhmUtsi9IzO47mxNHGXfFvhwA23Ip7TBrkg9JIQGH bWqPNL5I6ujBl4ajX5ecLIuJwXhL+4XAtjzeKjd1GoAFRiz9wVZcGnQnQ3bNiAffCIgQ tgrjvfeRnevkfFJHl6/bs6DvmpKiaeGekIZKPmJa6bf6oiAZuAO3hpNtQ18UJZcF1o4d cO2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=kvfdnmsm1ycOUMPMsqonIN9VM28V0LuiM2jsDLNw1I8=; b=Mu8JdUo0JNriZcsZkKr4ESZe9UwTR0YwuVS8gvHuT7sUe5jeSBHTXBqRMIe3kBIISo ECHzZ0LFAOjwViDQBP3fwhry8SdWCqrqFGbshr1G5r/l3HgLCuf9sjitnpw5tTUh1Z+D aITwc/rZs9VNCSAYrfXD7pRZd1zdJ7QFOpJwaHSZcxS8lCHySD47zHzZKrhQ+byn85r+ uxy1eBVzwb2PGxxXYB1HyXKS/N0htPTHce6pkx6GpJSfGZAfnputIxzoqdshbp5QxIyF XfUXdWjpgyCdzdBtSOsYD7YLnMAzeZXuiqkNYTs7hjQtwoIRe1H1rFKWQsFNH+OtzBN/ NkAg== X-Gm-Message-State: AOAM531hWzpYwTgg8cCvBCXtdh5pqSWfU4U26DNb4X7JMHxlt443JT9Y vqAYpiuvyC3uECFuevA/A2W2NzT48h8= X-Received: by 2002:aa7:961b:0:b0:4bf:306a:e057 with SMTP id q27-20020aa7961b000000b004bf306ae057mr33937395pfg.84.1642649159717; Wed, 19 Jan 2022 19:25:59 -0800 (PST) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id j8sm1037441pfc.127.2022.01.19.19.25.59 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Jan 2022 19:25:59 -0800 (PST) Message-Id: <5fca566749053291c27a8f7df7a2b6240913850b.1642649134.git.ffmpegagent@gmail.com> In-Reply-To: References: From: ffmpegagent Date: Thu, 20 Jan 2022 03:25:31 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v3 23/26] avcodec/webvttenc: convert hard-space tags to   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: Michael Niedermayer , softworkz , Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: yqO5YSUZwOlw Content-Length: 2821 From: softworkz Signed-off-by: softworkz --- libavcodec/webvttenc.c | 6 ++++++ tests/ref/fate/sub-webvttenc | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/libavcodec/webvttenc.c b/libavcodec/webvttenc.c index c0436f5739..48945dcb8e 100644 --- a/libavcodec/webvttenc.c +++ b/libavcodec/webvttenc.c @@ -123,6 +123,11 @@ static void webvtt_new_line_cb(void *priv, int forced) webvtt_print(priv, "\n"); } +static void webvtt_hard_space_cb(void *priv) +{ + webvtt_print(priv, " "); +} + static void webvtt_style_cb(void *priv, char style, int close) { if (style == 's') // strikethrough unsupported @@ -147,6 +152,7 @@ static void webvtt_end_cb(void *priv) static const ASSCodesCallbacks webvtt_callbacks = { .text = webvtt_text_cb, .new_line = webvtt_new_line_cb, + .hard_space = webvtt_hard_space_cb, .style = webvtt_style_cb, .color = NULL, .font_name = NULL, diff --git a/tests/ref/fate/sub-webvttenc b/tests/ref/fate/sub-webvttenc index f4172dcc84..ee9de2859e 100644 --- a/tests/ref/fate/sub-webvttenc +++ b/tests/ref/fate/sub-webvttenc @@ -132,26 +132,26 @@ but show this: {normal text} \ N is a forced line break \ h is a hard space Normal spaces at the start and at the end of the line are trimmed while hard spaces are not trimmed. -The line will never break automatically right before or after a hard space. :-D +The line will never break automatically right before or after a hard space. :-D 00:54.501 --> 00:56.500 - A (05 hard spaces followed by a letter) +     A (05 hard spaces followed by a letter) A (Normal spaces followed by a letter) A (No hard spaces followed by a letter) 00:56.501 --> 00:58.500 - A (05 hard spaces followed by a letter) +     A (05 hard spaces followed by a letter) A (Normal spaces followed by a letter) A (No hard spaces followed by a letter) Show this: \TEST and this: \-) 00:58.501 --> 01:00.500 -A letter followed by 05 hard spaces: A +A letter followed by 05 hard spaces: A      A letter followed by normal spaces: A A letter followed by no hard spaces: A -05 hard spaces between letters: A A +05 hard spaces between letters: A     A 5 normal spaces between letters: A A ^--Forced line break