From patchwork Sun Jun 13 02:34:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zheng qian X-Patchwork-Id: 28255 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp1744712iol; Sat, 12 Jun 2021 19:35:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw2UFTZ639nc+tXQH2U3B8gQDPAQiX1ELI3vIdSGb0VZmBh2GUeL3BnR0qFjle3aaY48JfJ X-Received: by 2002:a17:906:d967:: with SMTP id rp7mr9521443ejb.424.1623551704285; Sat, 12 Jun 2021 19:35:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623551704; cv=none; d=google.com; s=arc-20160816; b=AuQqcriEn6mJ7KHCghuwN8HgLEAeIjX0a5BpiVqH6STqQnrGqJXIHlIydPX/u2af1/ hzt8tEPMgC5u69JtfjnFD0r4BG5bpysfzKYTGURCVu7pZMlg5nJwIuLOyYJ7hetNPcJt EwK72m3Y3oDd0dZGPC/ST8hJ6qkpyLqGbY90DDs0YW3vuCMb9j0LqQ8uvuEHSb11k6/Q gikBolQzlzTlrDos1prXh6zYOBrMvqsH+PcjtLfUnHb/PthfsR2W+YJ1Mp4bjn8xkUr4 EMbQR3+EhUFkf5K0FMLPFkR6oZ+TUgT3zkntTY/Pu8UFN5fre58c2iAq5SUrsKF2CzK5 439A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=MOJ//ZsqHc+5dEAQXO57iT4tZm3/95fszPpNaAfRvF4=; b=S8FJNI2cGUAqS6rrB3DwEyUCT4NoeEKdweUDNwgLDLmvsNbfC/J6om83QIcJuabZgg 4paLXzUPgC0IUkkEdaVNEPeRrV/UrsIZBRhejR/NKsejpAxuBZrzsxGujmvhylgJv5wN 1RrWxKFYNmcSytznfU3xCkN/kPgdBnsmd0gZ0jgF0K1lwO3ZWukoWjNYv//NYm616eQ2 dQKDdWL7tnvqc+8b96zsr+5HTa3gwRuqADJj6OyPiil1wKuf1WOzQRekKjjhPgSa7e0F HnWwDuN+oL++wK//IKtm1015FpE7gIDfWH2YOccHQakpv7+16fxg0Gmi2V3RZbmxhewI ouMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@xqq-im.20150623.gappssmtp.com header.s=20150623 header.b=gZzUlx1x; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id op2si8209464ejb.522.2021.06.12.19.35.03; Sat, 12 Jun 2021 19:35:04 -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=@xqq-im.20150623.gappssmtp.com header.s=20150623 header.b=gZzUlx1x; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3214C680B71; Sun, 13 Jun 2021 05:34:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB3DA680C54 for ; Sun, 13 Jun 2021 05:34:34 +0300 (EEST) Received: by mail-pl1-f178.google.com with SMTP id e7so4778260plj.7 for ; Sat, 12 Jun 2021 19:34:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xqq-im.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ftN8uwtv3JhokMQEroQYggvVitKaCLk0eyYneD9wf+M=; b=gZzUlx1x4CFA4bFRa41+lYnA3hpZHdypIJH9QbIl3Ti9AIs2fA4p+xwoOwyHXrnWTI AodgNlDUYSnewRSfg5bEJXqpYtRfrm8uNwuquImGTd8z9w8KGIaxsu3YmlOYF86GUoRw kU4AChI+X6ZIbK+unsqg2rb0OHWVEJ4X12Bw9IdthFC7wx0rdwtIeUiBKLj0aruw6MWf N/NuMgnisTy2ZhCYq0QjLJ7NahBN9dOGvfvR3nTnoySQ+OXdWvdIGq6wPm8EYAXZ0g8o m0UAU4t/+XTkUq5ihnZ25XI36+ZBSjTcsR2G4QJWOJmqSrgGQe3CmYYYqAiZToixhcMa 1+DQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ftN8uwtv3JhokMQEroQYggvVitKaCLk0eyYneD9wf+M=; b=OBiFs4ksnbKEXtcLkeu4pD4oEOGrmKK19CqcogqcWa8QrtaJAL6KVbmxnPQR9UR/8F +Dx2QUg6miKRNqOOsRH1v4GAcBP4G4poAoviyrzhMDGNp9Jbq1nmhXA1lRu3xnA85OTd +tKbRZ9+YMO+kDgLWNcJx3bRkDfiFsFjhvt9O0FoQYC/sAB0sGn2zDOmOG5POVcegMEM AbiUjAf7+2cVrrPU0SmMNARITSi7P6/8SAUmwVxJG8t+9RCmQehODBxvBGBMxItzw3UT PyBDkvBK2pI24z8WUlLDS4DaRR18o+wJ0iECvpx25+e2x9Dii3v1B2yiwQ25DdDw2jn8 x2Rw== X-Gm-Message-State: AOAM530Y+kYy9qb8H304sz99MBAxmWyLJ4eSY6f8mjw2nFramNMVw/QU KsMJNiaiIExyRB7iijp8I77WyNPHJp6IZw== X-Received: by 2002:a17:90a:ab96:: with SMTP id n22mr11836066pjq.92.1623551672965; Sat, 12 Jun 2021 19:34:32 -0700 (PDT) Received: from zhengqian-xps.lan (ngn-nat1.v4.open.ad.jp. [202.222.12.138]) by smtp.gmail.com with ESMTPSA id x33sm8966924pfh.108.2021.06.12.19.34.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Jun 2021 19:34:32 -0700 (PDT) From: zheng qian To: ffmpeg-devel@ffmpeg.org Date: Sun, 13 Jun 2021 11:34:19 +0900 Message-Id: <20210613023421.23039-3-xqq@xqq.im> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210613023421.23039-1-xqq@xqq.im> References: <20210613023421.23039-1-xqq@xqq.im> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/5] avformat/mpegtsenc: Add muxing support for arib_superimpose 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 Cc: zheng qian Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: iDJFDB/h3sgx Signed-off-by: zheng qian --- libavformat/mpegtsenc.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 98dac17994..68f69d5df8 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -287,7 +287,7 @@ static void putbuf(uint8_t **q_ptr, const uint8_t *buf, size_t len) *q_ptr += len; } -static int put_arib_caption_descriptor(AVFormatContext *s, uint8_t **q_ptr, +static int put_arib_descriptor(AVFormatContext *s, uint8_t **q_ptr, AVCodecParameters *codecpar) { uint8_t stream_identifier; @@ -296,11 +296,19 @@ static int put_arib_caption_descriptor(AVFormatContext *s, uint8_t **q_ptr, switch (codecpar->profile) { case FF_PROFILE_ARIB_PROFILE_A: - stream_identifier = 0x30; + if (codecpar->codec_id == AV_CODEC_ID_ARIB_CAPTION) { + stream_identifier = 0x30; + } else { // AV_CODEC_ID_ARIB_SUPERIMPOSE + stream_identifier = 0x38; + } data_component_id = 0x0008; break; case FF_PROFILE_ARIB_PROFILE_C: - stream_identifier = 0x87; + if (codecpar->codec_id == AV_CODEC_ID_ARIB_CAPTION) { + stream_identifier = 0x87; + } else { // AV_CODEC_ID_ARIB_SUPERIMPOSE + stream_identifier = 0x88; + } data_component_id = 0x0012; break; default: @@ -320,11 +328,15 @@ static int put_arib_caption_descriptor(AVFormatContext *s, uint8_t **q_ptr, *q++ = 3; // descriptor_length put16(&q, data_component_id); // data_component_id // additional_arib_caption_info: defined in ARIB STD-B24, fascicle 1, Part 3, 9.6.1 - // Here we utilize a pre-defined set of values defined in ARIB TR-B14, + // Here we utilize pre-defined sets of values defined in ARIB TR-B14, // Fascicle 2, 4.2.8.5 for PMT usage, with the reserved bits in the middle // set to 1 (as that is what every broadcaster seems to be doing in // production). - *q++ = 0x3D; // DMF('0011'), Reserved('11'), Timing('01') + if (codecpar->codec_id == AV_CODEC_ID_ARIB_CAPTION) { + *q++ = 0x3D; // DMF('0011'), Reserved('11'), Timing('01') + } else { // AV_CODEC_ID_ARIB_SUPERIMPOSE + *q++ = 0x3C; // DMF('0011'), Reserved('11'), Timing('00') + } *q_ptr = q; @@ -414,6 +426,7 @@ static int get_dvb_stream_type(AVFormatContext *s, AVStream *st) case AV_CODEC_ID_DVB_SUBTITLE: case AV_CODEC_ID_DVB_TELETEXT: case AV_CODEC_ID_ARIB_CAPTION: + case AV_CODEC_ID_ARIB_SUPERIMPOSE: stream_type = STREAM_TYPE_PRIVATE_DATA; break; case AV_CODEC_ID_SMPTE_KLV: @@ -771,8 +784,8 @@ static int mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) } *len_ptr = q - len_ptr - 1; - } else if (codec_id == AV_CODEC_ID_ARIB_CAPTION) { - if (put_arib_caption_descriptor(s, &q, st->codecpar) < 0) + } else if (codec_id == AV_CODEC_ID_ARIB_CAPTION || codec_id == AV_CODEC_ID_ARIB_SUPERIMPOSE) { + if (put_arib_descriptor(s, &q, st->codecpar) < 0) break; } break; @@ -1444,6 +1457,9 @@ static int get_pes_stream_id(AVFormatContext *s, AVStream *st, int stream_id, in if (stream_id == STREAM_ID_PRIVATE_STREAM_1) /* asynchronous KLV */ *async = 1; return stream_id != -1 ? stream_id : STREAM_ID_METADATA_STREAM; + } else if (st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE && + st->codecpar->codec_id == AV_CODEC_ID_ARIB_SUPERIMPOSE) { + return STREAM_ID_PRIVATE_STREAM_2; } else { return STREAM_ID_PRIVATE_STREAM_1; }