From patchwork Mon Aug 16 12:26:11 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: 29566 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1992528iov; Mon, 16 Aug 2021 05:26:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwUFYzetE844vQnrLuM2gftkmt3Emo7cOsjwrRdu+xn+DqdqaLCZUek59jO75mW4piestIj X-Received: by 2002:a05:6402:50c9:: with SMTP id h9mr3188824edb.357.1629116804087; Mon, 16 Aug 2021 05:26:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629116804; cv=none; d=google.com; s=arc-20160816; b=hT7KeIMkAF0M5qJge6DHkKmdX5dctjGxpW5nKvqtzg69XY4L0+4OqenARVJ08RspvN YoVmiKpTctHpEP5CuG8cr7wSpzjX48cboAndGEQvkK2jBkIaJvurDF+yT4DH1n6WYL8S od7l91kFB0EsKJzBviw5zOmCmxiYN6IKkq96lBqihKBz9m6nsSuErSX0xssTODQ9RrS9 x/3xU8hFT+4cWM+EmN0oL/pAh39UpKDYHc4ifJWqkyCJ5XDzZvDF+veA0l0XFYPYd5Vi QPYU4GynfbDtBILZ9j5FTc589i09RaiZXBRO6VvXWJjMTEm9axvYJG8YxOq3FQOQsH4S LX8w== 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=79DisVOmWmFS67rn7lUqDAOxt+AThL3D2kBmR+kImkc=; b=kEMzrnigob+jlRqiNrM4ZZlXQ1yemFrB6/2zqSPMg2i0KBfjK7V9UyubPtTg7vCTSR g3e2CCbssZ7X0Gm3RdAMsH+V0v9qRp4SZwJ0JiZAolJMX+Gr1oU7L/FCY4tTJqpjk0Np GREBVlr3ZMP1sWsb9098zjcKkEDOKElwMqcKlW9Y1bAekuNcX5KO8hv72E3ZI41DYYty PxBJa1LN3qUYSJQMwzlxLSj+JbS5B9gkJgNVN6AzhqTzWgSApSllRt0CHpCGZuE629E0 BKIM9wUXiF6nKlT21Ig7EQ+XF5QU43Lcj636ziPDx9dUfIXGDi34rPkYVl7r1i9UBgcu +EoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=i8+cl8IT; 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 bx23si9793277edb.189.2021.08.16.05.26.43; Mon, 16 Aug 2021 05:26:44 -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=i8+cl8IT; 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 E76F468A3C6; Mon, 16 Aug 2021 15:26:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2BE0C680C01 for ; Mon, 16 Aug 2021 15:26:20 +0300 (EEST) Received: by mail-lj1-f179.google.com with SMTP id f2so5183350ljn.1 for ; Mon, 16 Aug 2021 05:26:20 -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=0Xybs5d52jY8OzbMXopNKNh/qiA1OwhmKwpjkhUN9ow=; b=i8+cl8ITG+17lkR8IRxbZgyBThg/uqsmW33bZo24UMG3BXWcZRm/pkBlKUW0wieR6D LxhHxE6/E63w64U3lyl7OFFMsY+4nCuwHUkbWgnlVRcVWfkc7Z1sy2Xi8aoCo8pUYB9R c9B/VkovV3MyuVpdewDfJEHjydWBLYwYPMhMUhV0PRxHgRlTloupbHAJG1EYSrnmlOeR N5SArTJnocNZgrh/ggHpN8Q/THlJOTHIIpErB8s8Y+byWKcfi5Zk6TfCpEk7RVpPYpj/ 6tMvcuiy4G/nhktyYGCLR+VTZRKnCG8EQn5GgwQNWcyuM/HOljZsni/AOC0Yeyr22uxO VKYg== 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=0Xybs5d52jY8OzbMXopNKNh/qiA1OwhmKwpjkhUN9ow=; b=tQEWDxu6SI6hom4ljuHuX/+wDRIr6IfCgCO6k54EKu5iwR4rxaYNJg+6EPIX41Mcc7 VAwVfcxvLiy81jO/YFxLFRSkmdkZ4YR+SNfuIDnwuaWlPo6/k2u0H/R/fyc8MN+pqWNt R5itS3xnPyhqSbw66kgJuedx6H1E5PAKNwKS9aFIgL2+RYcytT/duquMBg3hFyZ1kaS6 UfZPTNmhn5Ck7EL3yL59IhhBXnbmiHxkdJc6vVuSNM/o2jfrDOR2Jblw8DbeTNDSEbZg GKA99wk3VLiI7suRRLlVB273PS9S9x+brIbjGCZgZeHjbLdFSzdLK7DfzY7C9TLqWO78 ThCw== X-Gm-Message-State: AOAM531ZLt/LOtukB0U3sp0V7cufJLC9v/WSKyKm2/spgJ6/2AtocJNn ne8jg5esELqvYktr11KCGTWs7RgvMpI= X-Received: by 2002:a2e:4612:: with SMTP id t18mr12435860lja.346.1629116779497; Mon, 16 Aug 2021 05:26:19 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id i3sm930249lfr.217.2021.08.16.05.26.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Aug 2021 05:26:19 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Aug 2021 15:26:11 +0300 Message-Id: <20210816122612.7444-2-jeebjp@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210816122612.7444-1-jeebjp@gmail.com> References: <20210816122612.7444-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 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: Tu687ZNDaQ1H 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 8546d35196..896fc81958 100644 --- a/libavformat/ttmlenc.c +++ b/libavformat/ttmlenc.c @@ -30,6 +30,7 @@ #include "libavutil/avstring.h" #include "avformat.h" #include "internal.h" +#include "ttmlenc.h" #include "libavcodec/ttmlenc.h" #include "libavutil/internal.h" @@ -138,13 +139,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..5a6954f3c1 --- /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 "libavcodec/codec_par.h" +#include "libavcodec/ttmlenc.h" + +static inline unsigned int ff_is_ttml_stream_paragraph_based(const 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 */