From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 7577A400AF for ; Thu, 20 Jan 2022 02:53:43 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 16E1468B28F; Thu, 20 Jan 2022 04:49:16 +0200 (EET) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 60C2368B256 for ; Thu, 20 Jan 2022 04:49:05 +0200 (EET) Received: by mail-pj1-f44.google.com with SMTP id d12-20020a17090a628c00b001b4f47e2f51so5489141pjj.3 for ; Wed, 19 Jan 2022 18:49:05 -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=tuSdVT04MJLMDzTS0QBMXKj2+ae/uTA+E9k21/WB6X4=; b=SK2fEzaPd0rZq62Osx5YvDYDzMl8qbiMZ/sc6nGBV3W+NFuYuw84t4KlvIKgrpusiG bk78YZyIwPVrhwazyc47I0cMaGdTZa2Ayu5hYD+gA50t2iFhAMCrlSCkIqVUv9xYFJAv HkKQSM8KIu9cjfzmv2FOHgt9R7ILbehm0n+Me9HU1xQxvyktXoFcYAfwBK0eowmgvELY ZeNlaeEwN/08edcNc/NVkByWMh8OnrdkJcCUYlNVoXzLiOE6beP+VWxQMMquamhAGFQX lHno+naEpwAj/6U8zFuzMnA/uQiFtv91DTT6l3K3TNGeNUoXSph2OZYuGSEX96nYuZso yqsw== 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=tuSdVT04MJLMDzTS0QBMXKj2+ae/uTA+E9k21/WB6X4=; b=F9OU/1r7QXdRu4kY4/GGfAfFnUnW4XMkU3W7CB2QNmKITzDIcdkNN3cV7r2l4XNrj0 GzQgZRCkc7rPrg87dk7cxRoQy/gYV/x1IqTsd/4wBYaSWzRAZUmi6MqhKRxESKjwGyT6 xVsL0zEnrUOSGpuc4zEayeGljhof+jcgU87aWlMjZwY1x4+IXgH75eyMFO9EGCMTnLnr iwPJhYOa3ctgO8zSR0EPeEzPWp8vxRFfEjw6cHjLT6eanrLBb3RgOPct7NneqYcaFhpU cALubEBEQnVRR4qfppjdtyLaoDsTYdT15HBV//XbyWyUqKWet9uFabxs2NmLVOsGTn2I 1XkA== X-Gm-Message-State: AOAM531MZ8LqfwtKtqutPHwLiLMuJq6KEWt4dYS4z1jcSke20rV03KBf qNhSxajHngSKQKkk06N5aoSepWCPed0= X-Google-Smtp-Source: ABdhPJxUos8p/RKti4dqqOURUbfTQX+dBmciH3ViAeKzoEmkscoFCiThJGq3p1PjfuVYQfugu8vt5A== X-Received: by 2002:a17:90b:224c:: with SMTP id hk12mr8036008pjb.171.1642646943609; Wed, 19 Jan 2022 18:49:03 -0800 (PST) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id j4sm400266pjv.46.2022.01.19.18.49.02 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Jan 2022 18:49:03 -0800 (PST) Message-Id: <7ab6dedf807b362ebe698c9f081a148851ea5b7e.1642646916.git.ffmpegagent@gmail.com> In-Reply-To: References: From: ffmpegagent Date: Thu, 20 Jan 2022 02:48:35 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v2 25/26] avcodec/webvttenc: Don't encode drawing codes and empty lines 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: softworkz Signed-off-by: softworkz --- libavcodec/webvttenc.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/libavcodec/webvttenc.c b/libavcodec/webvttenc.c index 48945dcb8e..62c4aa7ffd 100644 --- a/libavcodec/webvttenc.c +++ b/libavcodec/webvttenc.c @@ -39,6 +39,8 @@ typedef struct { int count; char stack[WEBVTT_STACK_SIZE]; int stack_ptr; + int has_text; + int drawing_scale; } WebVTTContext; #ifdef __GNUC__ @@ -115,17 +117,24 @@ static void webvtt_style_apply(WebVTTContext *s, const char *style) static void webvtt_text_cb(void *priv, const char *text, int len) { WebVTTContext *s = priv; - av_bprint_append_data(&s->buffer, text, len); + if (!s->drawing_scale) { + av_bprint_append_data(&s->buffer, text, len); + s->has_text = 1; + } } static void webvtt_new_line_cb(void *priv, int forced) { - webvtt_print(priv, "\n"); + WebVTTContext *s = priv; + if (!s->drawing_scale) + webvtt_print(priv, "\n"); } static void webvtt_hard_space_cb(void *priv) { - webvtt_print(priv, " "); + WebVTTContext *s = priv; + if (!s->drawing_scale) + webvtt_print(priv, " "); } static void webvtt_style_cb(void *priv, char style, int close) @@ -149,6 +158,12 @@ static void webvtt_end_cb(void *priv) webvtt_stack_push_pop(priv, 0, 1); } +static void dialog_drawing_mode_cb(void *priv, int scale) +{ + WebVTTContext *s = priv; + s->drawing_scale = scale; +} + static const ASSCodesCallbacks webvtt_callbacks = { .text = webvtt_text_cb, .new_line = webvtt_new_line_cb, @@ -161,6 +176,7 @@ static const ASSCodesCallbacks webvtt_callbacks = { .cancel_overrides = webvtt_cancel_overrides_cb, .move = NULL, .end = webvtt_end_cb, + .drawing_mode = dialog_drawing_mode_cb, }; static void ensure_ass_context(WebVTTContext* s, const AVFrame* frame) @@ -211,16 +227,23 @@ static int webvtt_encode_frame(AVCodecContext* avctx, AVPacket* avpkt, } if (ass) { + const unsigned saved_len = s->buffer.len; - if (i > 0) + if (i > 0 && s->buffer.len > 0) webvtt_new_line_cb(s, 0); + s->drawing_scale = 0; + s->has_text = 0; + dialog = avpriv_ass_split_dialog(s->ass_ctx, ass); if (!dialog) return AVERROR(ENOMEM); webvtt_style_apply(s, dialog->style); avpriv_ass_split_override_codes(&webvtt_callbacks, s, dialog->text); avpriv_ass_free_dialog(&dialog); + + if (!s->has_text) + s->buffer.len = saved_len; } } -- ffmpeg-codebot _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".