From patchwork Mon Apr 19 14:09:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27016 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp556630iob; Mon, 19 Apr 2021 07:12:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz5whULmxkY9RhxsFK3c0OtkJBU5b1qc9QborMU+C71SK6tqOUapldjFwqSAcFSvB+Xf4q1 X-Received: by 2002:a05:6402:176c:: with SMTP id da12mr25603072edb.325.1618841570920; Mon, 19 Apr 2021 07:12:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841570; cv=none; d=google.com; s=arc-20160816; b=KE0RO9tGnMdoG9tib/hzlL1xiwVF//dg2QUWdRVi1BTTscP7oAVr5RLC5irrXfAz8D mmYG26+zmXF3s8Nvp0UOuVnZIexFIhdDVsWsyWVCBoz5vskjlggPQ3sGhHv7JbTYQ9Gu mQgjD8mQd2aiVSxDag5K+Xx00y5KTa2+QmuvCuyL7FNxiqJEY5yYMjSLh2zgl+7xEs9D HemqGuF0VnrrO0pSGpdj4pO8RLcKG9yhuhnNvwpAtK3/wSTF5vi3RYVUCjRUPtY5MMA1 xwgo1bmGmPGL0XxgGiu7uckSfBN7RhjslGwLrUbv79ZKH9Tn5RD9fCHMH3xBdEEvJRtn uCEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=KbZEfdU8lEs6CiJ1npVplvVQFmUPsJYzhQfA+3db5UE=; b=JOopbcLV4Y+h86gGpjRIhvhu/BUvICgWYDdNKsgJ13dNpVDVW8gr2ezDrznIDrQeuN kmOHnykPl0NDq77fP7wAZbW6RWP/wm4eXp0wijyUCvd1SFcc7cN2E/vlnGKopBPWjUd2 MqiZ63+l1317ziNZQKsEXS7F+gdyKrOG/B7i2rsCR0UQXV7RBaGgQZUteoUfYxae0ALU fWiaLidqf97SiESUqNb3jrMvl6mObbdHxVlWGgijSco97mkP0bm3W1P94F8pKJsSo4dD awDwN9cCUMT2TPwJ1YclnQy88GQwtLwpBJkT5ObiLN4rK5UINLBcvUjd6D9ivcWwfJ2z OOOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=crfEFR5+; 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 u16si3147441edi.298.2021.04.19.07.12.50; Mon, 19 Apr 2021 07:12:50 -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=@gmail.com header.s=20161025 header.b=crfEFR5+; 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 DC0E3680BD4; Mon, 19 Apr 2021 17:11:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f172.google.com (mail-qk1-f172.google.com [209.85.222.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A9AAD680A7F for ; Mon, 19 Apr 2021 17:11:28 +0300 (EEST) Received: by mail-qk1-f172.google.com with SMTP id h13so17165448qka.2 for ; Mon, 19 Apr 2021 07:11:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=GmIy1KBXeOOWbl7v/EuRg30joEyjtagL5GoafAG/OsM=; b=crfEFR5+OOX4fNgwqdrcMP6KjUVOdqS5iqrssjWpgWmKJY2vC5lPXFCuXZ+Mbjg5D6 faUK+Syog3XQTo7sRvNJIN0bzAQU2O3pql7TaG/rMrltLRRfE+04NdCwIXgrryZrM2Gz h2nDazjndEx/Ae1yCaMxBTJYCaiOZ6nGKNjunfkEYk3XPg0gAA66UbFuaUscGGybbSBe 7+6+c/MaIYzrcsF0TFI7af8ZItMWeOnxZE0pVhiRaSrhsrF3X4ieNVhLtl5bAcB+9UgT TxP7EszaNtcTy5wwwqAwoI7X3eqcmZcQ/ejOMxkIsMwvBpovgi5EVjJo+F2jaJe7C8Hz zbxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GmIy1KBXeOOWbl7v/EuRg30joEyjtagL5GoafAG/OsM=; b=Q32ai5P4/foqrQP+B6yBk3dVAziC+hQ+jv6AmyVXH1q7qV7bobUJJwghT0p7ZNrUuV gk7NokoM6rBFagRfISu6AFfyj+ul6Z4WBob6Y92DZTbCT/nWwGwkUXsQ7S3MZ7wpCc9s egjvFQNqX+zpmfphgNRW4h54+KfVSTyo6nLy4j0WUU1XafWNqVx0C/UeYLeAfZWw7dsL 4rUfpJ+KUHyNnouos4LZIeWKQwBaf8tLwtukpmy5qRkpI4Rrs1oDfDskOBmcV59rO0ZF uG5Qs0g2WzCZkFvonWWpse4R9T0N4EcrpNLjwwUwtA1v/BSwkxRC6TE9RYBPvdu2DCYG VwfQ== X-Gm-Message-State: AOAM530IoHZFk3COq1zqd7oRw1SQR225Y2aTQFabTfjt/29YZJglbSDV 9i5NRfTVTBOWuoGg7+q1mgN5vsxTIOc= X-Received: by 2002:a37:a794:: with SMTP id q142mr11980549qke.216.1618841487257; Mon, 19 Apr 2021 07:11:27 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:26 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:18 -0300 Message-Id: <20210419141024.8174-22-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419141024.8174-1-jamrial@gmail.com> References: <20210419141024.8174-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 21/87] avcodec/(movtext|srt|ttml|webvtt)enc: Reindent after previous commit 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: L1gHuVsV43ad From: Andreas Rheinhardt Signed-off-by: Andreas Rheinhardt --- libavcodec/movtextenc.c | 12 +++++------ libavcodec/srtenc.c | 16 +++++++-------- libavcodec/ttmlenc.c | 44 ++++++++++++++++++++--------------------- libavcodec/webvttenc.c | 12 +++++------ 4 files changed, 41 insertions(+), 43 deletions(-) diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c index 1b37d135e1..3c166639ba 100644 --- a/libavcodec/movtextenc.c +++ b/libavcodec/movtextenc.c @@ -655,12 +655,12 @@ static int mov_text_encode_frame(AVCodecContext *avctx, unsigned char *buf, return AVERROR(EINVAL); } - dialog = ff_ass_split_dialog2(s->ass_ctx, ass); - if (!dialog) - return AVERROR(ENOMEM); - mov_text_dialog(s, dialog); - ff_ass_split_override_codes(&mov_text_callbacks, s, dialog->text); - ff_ass_free_dialog(&dialog); + dialog = ff_ass_split_dialog2(s->ass_ctx, ass); + if (!dialog) + return AVERROR(ENOMEM); + mov_text_dialog(s, dialog); + ff_ass_split_override_codes(&mov_text_callbacks, s, dialog->text); + ff_ass_free_dialog(&dialog); for (j = 0; j < box_count; j++) { box_types[j].encode(s); diff --git a/libavcodec/srtenc.c b/libavcodec/srtenc.c index 160f3bbf3a..08c52c2d56 100644 --- a/libavcodec/srtenc.c +++ b/libavcodec/srtenc.c @@ -244,14 +244,14 @@ static int encode_frame(AVCodecContext *avctx, return AVERROR(EINVAL); } - dialog = ff_ass_split_dialog2(s->ass_ctx, ass); - if (!dialog) - return AVERROR(ENOMEM); - s->alignment_applied = 0; - if (avctx->codec_id == AV_CODEC_ID_SUBRIP) - srt_style_apply(s, dialog->style); - ff_ass_split_override_codes(cb, s, dialog->text); - ff_ass_free_dialog(&dialog); + dialog = ff_ass_split_dialog2(s->ass_ctx, ass); + if (!dialog) + return AVERROR(ENOMEM); + s->alignment_applied = 0; + if (avctx->codec_id == AV_CODEC_ID_SUBRIP) + srt_style_apply(s, dialog->style); + ff_ass_split_override_codes(cb, s, dialog->text); + ff_ass_free_dialog(&dialog); } if (!av_bprint_is_complete(&s->buffer)) diff --git a/libavcodec/ttmlenc.c b/libavcodec/ttmlenc.c index c4964572f9..26ab76e9e7 100644 --- a/libavcodec/ttmlenc.c +++ b/libavcodec/ttmlenc.c @@ -88,37 +88,35 @@ static int ttml_encode_frame(AVCodecContext *avctx, uint8_t *buf, for (i=0; inum_rects; i++) { const char *ass = sub->rects[i]->ass; + int ret; if (sub->rects[i]->type != SUBTITLE_ASS) { av_log(avctx, AV_LOG_ERROR, "Only SUBTITLE_ASS type supported.\n"); return AVERROR(EINVAL); } - dialog = ff_ass_split_dialog2(s->ass_ctx, ass); - if (!dialog) - return AVERROR(ENOMEM); - - { - int ret = ff_ass_split_override_codes(&ttml_callbacks, s, - dialog->text); - int log_level = (ret != AVERROR_INVALIDDATA || - avctx->err_recognition & AV_EF_EXPLODE) ? - AV_LOG_ERROR : AV_LOG_WARNING; - - if (ret < 0) { - av_log(avctx, log_level, - "Splitting received ASS dialog text %s failed: %s\n", - dialog->text, - av_err2str(ret)); - - if (log_level == AV_LOG_ERROR) { - ff_ass_free_dialog(&dialog); - return ret; - } - } - + dialog = ff_ass_split_dialog2(s->ass_ctx, ass); + if (!dialog) + return AVERROR(ENOMEM); + + ret = ff_ass_split_override_codes(&ttml_callbacks, s, + dialog->text); + if (ret < 0) { + int log_level = (ret != AVERROR_INVALIDDATA || + avctx->err_recognition & AV_EF_EXPLODE) ? + AV_LOG_ERROR : AV_LOG_WARNING; + av_log(avctx, log_level, + "Splitting received ASS dialog text %s failed: %s\n", + dialog->text, + av_err2str(ret)); + + if (log_level == AV_LOG_ERROR) { ff_ass_free_dialog(&dialog); + return ret; } + } + + ff_ass_free_dialog(&dialog); } if (!av_bprint_is_complete(&s->buffer)) diff --git a/libavcodec/webvttenc.c b/libavcodec/webvttenc.c index 2419dd3d07..fcbd9698f4 100644 --- a/libavcodec/webvttenc.c +++ b/libavcodec/webvttenc.c @@ -171,12 +171,12 @@ static int webvtt_encode_frame(AVCodecContext *avctx, return AVERROR(EINVAL); } - dialog = ff_ass_split_dialog2(s->ass_ctx, ass); - if (!dialog) - return AVERROR(ENOMEM); - webvtt_style_apply(s, dialog->style); - ff_ass_split_override_codes(&webvtt_callbacks, s, dialog->text); - ff_ass_free_dialog(&dialog); + dialog = ff_ass_split_dialog2(s->ass_ctx, ass); + if (!dialog) + return AVERROR(ENOMEM); + webvtt_style_apply(s, dialog->style); + ff_ass_split_override_codes(&webvtt_callbacks, s, dialog->text); + ff_ass_free_dialog(&dialog); } if (!av_bprint_is_complete(&s->buffer))