From patchwork Mon Jul 26 13:41:03 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: 29057 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3801865ios; Mon, 26 Jul 2021 06:47:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzEut7GHsNbFCv//ymoK3bYBjNxNDkMJa4EQoT9l06UL7l5q6BIIZP8myID8bFHzsBg37fj X-Received: by 2002:a05:6402:1707:: with SMTP id y7mr16145681edu.167.1627307229473; Mon, 26 Jul 2021 06:47:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627307229; cv=none; d=google.com; s=arc-20160816; b=ndk1W5AmYolLF5DRingrxwlWHUmy+oLMYfVC0tM0QnI9rsH44ObixpPDY9rgGDaJ2D w38PEdV0iYUlSpq7IeNpfV04ihlJWSsZSsVBzZOIr4Y/ALO5wI3F6ObLULmDZo4XItsQ w5vBncJMNCNipYujpBmZArTI9vVmdUtMtMw3QjaqyRrHNT2VbbxSWvJp0MbG3NL4gzhw 1U/whKVkCOhD82XADvbzmfZabsHwztH19ZQTmfXPQEgCuvCEJ58XYlGsn2/OV9hRqcZq 9dbB/ONP7MxmMwNaZinKkHXP4Fy6jPZEWW/ln91BHhoQWUbpWQxEXA4FTjjEQDw6sPZY h7dA== 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=hZSl0xQT0XegT1e8oPMyluBbpebVhiT4ffMBdSQ0HA8=; b=RULvhQR6cJsoiWP2S3cEbrdmSuYe87BVUo+5qNVEuzKkN9zIOWwTPK26jaS9J9ag6T CEVWh7n9poWfnt0SFR8dKNpCLZmaC4WSI3RtLzZSO88dTzoN0qDysJ3orGx+0kKbTuaj wkhHDhP3MGCeZYUUewpePDq5FLoVPH+pFP6wtxgVVW4DrmeaVgp8WGJgYJBEgDv+vKnr E2x9O1AlQyQPe0jOVuRAdIeHhTNXK6muBimJ95ZySa8W48WZ44d4ew0fF8qkfhHhH+qI yX20TTtBwb9t/wGH78kopCM/9Qz/0ELbku8uDvpGJoRSYSW2WkU8CmNnQmK3J47At+PF yVmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=IS9Dmx8Y; 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 e8si33728365eja.349.2021.07.26.06.47.09; Mon, 26 Jul 2021 06:47:09 -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=IS9Dmx8Y; 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 0A77A687F7D; Mon, 26 Jul 2021 16:47:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 169A16880BA for ; Mon, 26 Jul 2021 16:46:59 +0300 (EEST) Received: by mail-lj1-f175.google.com with SMTP id l4so11353214ljq.4 for ; Mon, 26 Jul 2021 06:46:59 -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=O0X0ut7avnuakB1W3T/+oJ4oCFEgVfvXnRJXhg1aqgc=; b=IS9Dmx8YN9XlJ6AmDCGaYY2sW9aWOMCDyzN4nvSvtiECQb1cLtmn0SJiM2Ph45PZZ4 gqX4RT2g6GpJBp0oD60GrgxIq8fWeKrXcRKP7KPcuZjDnjFo05LXt1sGNr3UdDpGsnig 2mspdPwpKs6al3AHLDuFn43snJ4Z3oqZ9HxdwzcFwQriZtQ1du2wB3UIscJC2fsqB+kW PebEWR3BzFDXzy3HY/+iXJ+YyfgvDykayB3OaTikaNnhmKmXk1pvnjMlv3+grIn9hLYM rX7VvQTebV2sJjZkJE32qvUnSIfhetkV9R060OObDkcrXV68DtqwNV8pm4fxFR1PAvGd pl+Q== 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=O0X0ut7avnuakB1W3T/+oJ4oCFEgVfvXnRJXhg1aqgc=; b=B0oAk63c28VPDts5SY+C4cQFmi9NPszeYeN9BF0DO0h6nHRmPGpCQcUjwnSYzIJTJ3 lwPgvQ4KFngGvjms2awrt8Y0ssjXka1C4e0T8xohPQvRJHUjmPkBtZnrytAkds5F/Fq4 9PAQUesLWog8FfLvfZ2Z+5dqmosEa/OzHLoEd1Ns2hJN6AcXjb60FgvnxDYbEUVHyDIm sBDfNNgDyjvkR9BUlnLvmKIJcnsqAieH/0LcLP/vM3/KuIqKNeb34o8jmuelWjc5dUzl 2pxe+fE1rm0bDDLeYLYMqZst+BiPh3hVC673IRneVerLtFuYv/md7yPqxVVZVUX7b98L uLTQ== X-Gm-Message-State: AOAM533wfz2GMUxnwgXeWZAF1PZ5dMwV1tK0PEbNKRZ2G+Ya1mlmpK/X l7khIk0TpPhR8/HpGW1XXmlRQmP/G9ywOQ== X-Received: by 2002:a05:6512:68e:: with SMTP id t14mr13369925lfe.464.1627306871557; Mon, 26 Jul 2021 06:41:11 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id a18sm1714649ljq.14.2021.07.26.06.41.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jul 2021 06:41:11 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Jul 2021 16:41:03 +0300 Message-Id: <20210726134104.42737-2-jeebjp@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210726134104.42737-1-jeebjp@gmail.com> References: <20210726134104.42737-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 1/2] avformat/ttml: split TTML paragraph based or not check into header 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: 0h87oK7MOTxd From: Jan Ekström This way it can be re-utilized in movenc. Signed-off-by: Jan Ekström --- libavformat/ttmlenc.c | 9 ++------- libavformat/ttmlenc.h | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 7 deletions(-) create mode 100644 libavformat/ttmlenc.h diff --git a/libavformat/ttmlenc.c b/libavformat/ttmlenc.c index 7577cb543b..5c4cd8b5e9 100644 --- a/libavformat/ttmlenc.c +++ b/libavformat/ttmlenc.c @@ -29,6 +29,7 @@ #include "avformat.h" #include "internal.h" +#include "ttmlenc.h" #include "libavcodec/ttmlenc.h" #include "libavutil/internal.h" @@ -137,13 +138,7 @@ static int ttml_write_header(AVFormatContext *ctx) 0); const char *printed_lang = (lang && lang->value) ? lang->value : ""; - // Not perfect, but decide whether the packet is a document or not - // by the existence of the lavc ttmlenc extradata. - ttml_ctx->input_type = (st->codecpar->extradata && - st->codecpar->extradata_size >= TTMLENC_EXTRADATA_SIGNATURE_SIZE && - !memcmp(st->codecpar->extradata, - TTMLENC_EXTRADATA_SIGNATURE, - TTMLENC_EXTRADATA_SIGNATURE_SIZE)) ? + ttml_ctx->input_type = ff_is_ttml_stream_paragraph_based(st->codecpar) ? PACKET_TYPE_PARAGRAPH : PACKET_TYPE_DOCUMENT; diff --git a/libavformat/ttmlenc.h b/libavformat/ttmlenc.h new file mode 100644 index 0000000000..2da233b8f1 --- /dev/null +++ b/libavformat/ttmlenc.h @@ -0,0 +1,39 @@ +/* + * Generic TTML helpers + * Copyright (c) 2021 24i + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVFORMAT_TTMLENC_H +#define AVFORMAT_TTMLENC_H + +#include "avformat.h" +#include "libavcodec/ttmlenc.h" + +static inline unsigned int ff_is_ttml_stream_paragraph_based(AVCodecParameters *codecpar) +{ + // Not perfect, but decide whether the packet is a document or not + // by the existence of the lavc ttmlenc extradata. + return (codecpar->extradata && + codecpar->extradata_size >= TTMLENC_EXTRADATA_SIGNATURE_SIZE && + !memcmp(codecpar->extradata, + TTMLENC_EXTRADATA_SIGNATURE, + TTMLENC_EXTRADATA_SIGNATURE_SIZE)); +} + +#endif /* AVFORMAT_TTMLENC_H */