From patchwork Tue Mar 30 08:23:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 26649 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 6A9E244A0F6 for ; Tue, 30 Mar 2021 11:30:28 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4E98A689B09; Tue, 30 Mar 2021 11:30:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 613C468028B for ; Tue, 30 Mar 2021 11:30:21 +0300 (EEST) Received: by mail-lf1-f45.google.com with SMTP id 12so12143817lfq.13 for ; Tue, 30 Mar 2021 01:30:21 -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=7ZdffR6VTqK9gxQdmDxFJY8eo35zn1YjPRwkPheLq3w=; b=X1926460HXId9ATdhEdsO160/EN1lGuqJIAiu/xpQugbr5Z7yv1YVJ19ykSo5l0Jyh VB3eB1Nad7dGVT5VofJimlE5CKeWOldDXjsoIK1TVZ1bUShXK25odA8r1BiphSnRi3nz B/ub7zSI6TgEk0D930ScFO3VuYGAdSmJK3bQr02bEkmnJxPGiGNa0ha4KTDeUKL46wwS kBZo75Mtvt/aYfr9ZFmb9/ekA4izqeBHQ8ObmNREvm3W7LWLG84XDq1+XF3OqtOeDvDK Ls0Hly9HWfYPX45BuNODTk+GoKgdPGgCc8GbNJqziWt96eeRGmRK/bdp6obCUc4rP/FA sTFw== 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=7ZdffR6VTqK9gxQdmDxFJY8eo35zn1YjPRwkPheLq3w=; b=DDd+15Bw5RNHHNzhS/PysRLU/OYuYGQMuOEq/zPgAxaM0j8OvG1zw2RxpJ5jzC5s2G fUyFKv7LLrbnFlQOYVl+KtGu3cxNnVRVZhRwNF26+ODolqPT4bagVR/1bmMLyD5u/6nD 9t1yLQgqEUfrpCGxekTrYM/wGhktfF14VlGLEDxW7BzXH51N5oJubKYkpg5mhPW4xrRh A4aFtRj+raM5vc6Lp+lmxTkA8zw7WeP98BT2RPCyxALcfg3sFb+JwXNgZ8+fLN2BMZsG TjQlw4izOp9lIwnAy8sevfOPCl2cstLXVVnxZV6gjtTaT3rFDzaPS9f+o1Fca06JgHsf eCjw== X-Gm-Message-State: AOAM531mIO4rh8wDTGou2ox4jIb6oTP1j5dskfpSWR7qnVW/amSNXw5c biXKdlUBZTAfQDFqYTN6A1RFCWEMoqs= X-Google-Smtp-Source: ABdhPJxRNA/+6MOPE2smdMrX9xaKf9CuMWvcRQJ2lq1Xo5T6imyLJ2iZVAiFhmfQYy8Op0MPeu8Pwg== X-Received: by 2002:a2e:bc1e:: with SMTP id b30mr11567794ljf.351.1617092630232; Tue, 30 Mar 2021 01:23:50 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id d34sm2089414lfv.102.2021.03.30.01.23.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Mar 2021 01:23:49 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Mar 2021 11:23:43 +0300 Message-Id: <20210330082346.8404-2-jeebjp@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210330082346.8404-1-jeebjp@gmail.com> References: <20210330082346.8404-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/ttmlenc: split header writing into its own function X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" From: Jan Ekström Signed-off-by: Jan Ekström --- libavcodec/ttmlenc.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/libavcodec/ttmlenc.c b/libavcodec/ttmlenc.c index 3972b4368c..e3c155fdd1 100644 --- a/libavcodec/ttmlenc.c +++ b/libavcodec/ttmlenc.c @@ -173,16 +173,8 @@ static av_cold int ttml_encode_close(AVCodecContext *avctx) return 0; } -static av_cold int ttml_encode_init(AVCodecContext *avctx) +static int ttml_write_header_content(AVCodecContext *avctx) { - TTMLContext *s = avctx->priv_data; - - s->avctx = avctx; - - if (!(s->ass_ctx = ff_ass_split(avctx->subtitle_header))) { - return AVERROR_INVALIDDATA; - } - if (!(avctx->extradata = av_mallocz(TTMLENC_EXTRADATA_SIGNATURE_SIZE + 1 + AV_INPUT_BUFFER_PADDING_SIZE))) { return AVERROR(ENOMEM); @@ -192,8 +184,25 @@ static av_cold int ttml_encode_init(AVCodecContext *avctx) memcpy(avctx->extradata, TTMLENC_EXTRADATA_SIGNATURE, TTMLENC_EXTRADATA_SIGNATURE_SIZE); + return 0; +} + +static av_cold int ttml_encode_init(AVCodecContext *avctx) +{ + TTMLContext *s = avctx->priv_data; + int ret = AVERROR_BUG; + s->avctx = avctx; + av_bprint_init(&s->buffer, 0, AV_BPRINT_SIZE_UNLIMITED); + if (!(s->ass_ctx = ff_ass_split(avctx->subtitle_header))) { + return AVERROR_INVALIDDATA; + } + + if ((ret = ttml_write_header_content(avctx)) < 0) { + return ret; + } + return 0; }