From patchwork Mon Apr 26 09:34:22 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: 27418 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp3807405iob; Mon, 26 Apr 2021 02:41:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyudcpEe1T9NoGBQyQ8lF4+IO1vY4paGnt5L95ruuPGHEeaqu/VFToMs+VCso2F693J0eyA X-Received: by 2002:a17:906:8303:: with SMTP id j3mr17653456ejx.85.1619430118599; Mon, 26 Apr 2021 02:41:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619430118; cv=none; d=google.com; s=arc-20160816; b=FdzC6JMQHgLLpAnCJoGQex730PHU8GLIIhSyec5pFVLV6NnCgjaeUSUEGPkxg+Pudt 15Ka7S6wnsfifVIhjfYx8OzUOVcsV020JhCASL+NAWpXiWHbV4yRQ00bqozv0t5tZbZo ItCKyzgXS4lhXpxGVK3A7EZxk9Ilc3s9UXZ1kflqbFJwfQ5YveVnMnXUsQ4iPCa13PSm bWhPflyLa38scV+yhje1kIaJhIaqAwKlvHIAULdmia2Rr+nleLmq/xWQbBUtMC3tnMJc U5+BGHBFiOnp7mABkfTrB0wUHLzcu0NrDYH5eft1FG8wZuGj2x4mq5nX7CgFOEhx44Nd BQjA== 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=mzwXt5XuuZiCwhsQ2+QWn+qPqPTcQbfKhlP0JyIFsXU=; b=BkNtF4fnbyBK3qz4VoFUr9rydMbS61qF9WgBL+tRMXNErNUFx1VFaMfqvQVp10q81Z Dw7/4jrfWySnQ2mLtfzMpnIJXF6zwZk/4q1oNnlxT7lvp2LKOJ50KRLF6V+nS+HuUPPB 3U/WjrYl05VvFzbSGiiWIP3AlQULJ/kUz1BEAefATb04/xZ05TPrgDswVZ3kLs+ESCAE rDrbgQdKTMP4MyR3U4Vx10OR/zVYwG8r98KLk9LFIstRQcwFfnbRRM5+cY1hpnOUdcbY YjJwsd2FMIsqCx0BYSttNjaxDbGGa6hTVTqhfZ3+gLPUlEpeZ1bQpgrArLYW52m1bLdm o1Sw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Yt5wHaQh; 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 i4si13272500ejy.112.2021.04.26.02.41.58; Mon, 26 Apr 2021 02:41:58 -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=Yt5wHaQh; 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 B39DA689B02; Mon, 26 Apr 2021 12:41:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F1822689A1C for ; Mon, 26 Apr 2021 12:41:48 +0300 (EEST) Received: by mail-ej1-f41.google.com with SMTP id r9so83460443ejj.3 for ; Mon, 26 Apr 2021 02:41:48 -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=Yt5wHaQhgEOJMPUYuyj+3YJ3Jh0058nuUUKUXQu8p1qnHtytZGrvEN0/A2eW7WEpR3 a+NP8q47Fg4NxN0ZqiDsnpd8TiDVQDXEst1v1nFadmNgDG7HOjB6uaJwk+3cXTVWIrfX eywSExY+oXUNN0wOLPJFREm1k0AVdBBnsKR7YNdjW5Lmu2KuxbOc8DCzJiqa9ut24iLK FsOdLDXAjtUsRWbLxyv79SWUit2kc02bx+K9L2zFZt8fupXbGzabNjuUnm0LlbIiEU6q BjuTmQFTMKqT0N/G7oQgMYff5Vcmw2aF/cJcA+fcjVbnktmyqP1CsFuuGtrJeaTL77L1 /ioA== 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=fHW01sa46VlTEzlQAbqBgMwCSedPm3ulIu3AdtRuwk138MQRj+dlhxFpOfQDNJfxbR EXV2OVA9QKoG1N0Q5vtVDaqiGo+p5KYhdU3NiliNEEgoiZdH9ekYfuYrhBk7EtYr2fAk /d1YaLjKnhDMM5r3Dm+adryIUHBaW60XnJgVPg0EVAwowqUDRJBpuXHGonWzcqVhI+CL RpmyVpCXFwd5SvzurmyLY82+cSwM54kqRwp98NXWbw+uhSda5tkMYRUgxmJphK0+Mqe/ BYZiH2CCTe9HyFn7Hf6H9bGavUh6EhmrVt9BarqOWKV342IKAm+cIauVMj9/qxBO1Jic 68Sg== X-Gm-Message-State: AOAM531pgprIOij4Zwhb87PkfUIDZdrQdowVzOugeqpOhMehiiZ6Etog qneqVnVU4dGN9IXkv39i7nPYl9haBDo= X-Received: by 2002:a05:651c:c4:: with SMTP id 4mr12329978ljr.415.1619429669535; Mon, 26 Apr 2021 02:34:29 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id m7sm1402883ljp.102.2021.04.26.02.34.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Apr 2021 02:34:29 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Apr 2021 12:34:22 +0300 Message-Id: <20210426093425.17900-2-jeebjp@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210426093425.17900-1-jeebjp@gmail.com> References: <20210426093425.17900-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 1/4] avcodec/ttmlenc: split header writing into its own function 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: c7bFaDJJydHq 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; }