From patchwork Sat Jun 12 09:30:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zheng qian X-Patchwork-Id: 28247 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp1178089iol; Sat, 12 Jun 2021 02:39:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxAebEHIMIOjmXJ/E7xBz6gxbZCDSiCBDbZJkNAaVcEXgegqtYpyCSHrCTjKmay00HZRCM7 X-Received: by 2002:a17:906:a0d3:: with SMTP id bh19mr7389793ejb.205.1623490798765; Sat, 12 Jun 2021 02:39:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623490798; cv=none; d=google.com; s=arc-20160816; b=E/JB1XLUx4YWO//fUnFtayUklOFlGowJX7Z6n3eAVeYf3x6rYpT2FpgRgv32zJGzFL SDd/9SO+E87OsFIAaGl/od9SiVOf5mRUkX51I810Qhvkk9yzWulgM7Dagt/1C48XSVI4 AjkxvfCjUZX/RYduoRVnBAu32r136pgN68euahWydTfxtUO2LGzqMA+pUTSYAap2bCCj EqLRWcsljBaFvE3hUZx94Aeya4VRSZ0yjZyMdHOAsks+rSJrxxnl4sAJ1uAKb1+sOaaJ 5ypnLTf2fnxDpLnMAEt6A0TWjJuvkvnyBwTyzpSscA5en66L2FsZI9thADzd3jQLKWBI uCgA== 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=rawmf1yk4SRjHxNGsULBh6F1FoUqKAERTOrAqsIx3FLsMBCEtWcNL5AomqbpbpsMDK kduGG7ErXub/7hVJu4bF1XxgXBsRoQTZ7ohFegu1mHWtkk6b4jsvELjbAIPIxm/GaKop sWPaG8h6fP9pJeuXWiDNlsTZOT+m3WzR/aO0OAP2YngdrFvBvL35mHciLk5oUHs+dZ8s 6Li5CvmzETMhIF2+ZEpzoqFOFJVZ0Y2cBgNwkiDaX7nYkMoTjEVzeIRUEkuISTL2cHPm pS0dPiwhw0wtylbeSdt4qhWHNo+XDdrLbauM68qzJu8TCn8UGBE6IvqjVuYiEnP9h3ht ip6w== 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=ySBCCvJl; 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 h3si1096616ejo.7.2021.06.12.02.39.57; Sat, 12 Jun 2021 02:39: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=@xqq-im.20150623.gappssmtp.com header.s=20150623 header.b=ySBCCvJl; 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 6A1926800F2; Sat, 12 Jun 2021 12:39:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 218326800F2 for ; Sat, 12 Jun 2021 12:39:49 +0300 (EEST) Received: by mail-pg1-f173.google.com with SMTP id o9so4509972pgd.2 for ; Sat, 12 Jun 2021 02:39:49 -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=ySBCCvJlfN/JF9NvpAnqg20h70CxCVc/ITqjrrn3tJk7dzMBFRgSh3BzwEh6NOaQ5o xHEpkM7t2Xb7tKZcjrKAeYw1fOrQwk/FnRInCLsJ+XqXXjxLfK3aYcr+YhoaFDJ/2kWx PdYeFa2mSk/5WirlfvwlTIEtHeVLG1FaD8k0HqwCOxSkMfEICS3HGbKtcQDhk3u7NAxV sGeE6qv/pTiAcW32zwlS1wamUGfZTP6F/JsqNSqgXJ1HoMnTIYn2Al9qhFcKt/ipgyHS B9mx00IWz0pGwP/iiLcqivofbObq4bJG8omUha4OXwSj5tYqyU0fVTy1vLzSNZ47GmBL wOsA== 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=CHpaGAQTtqS49hSJz08H4ITkr5RRmWXezOnl6exYVl16Gwguz4VM+wtuHbV/VILnRD ykB+yX7py19ryzrHg8CKjePaC705hxVrRn1d2DK7Fd61bYq3USd1l0yTvrmUoCvUTE+e or97IpclFfeOXgskm79ELbgyheHBWhy1hEqmKZZwwErrUbVJKDiCE5hNLj4hV9949YHQ kXRVcdecCxybyHPRogxdUSDKS+TEjX0ImFQ/5XqGj0X1zpdgKkJF36cdbe9XfLMPwRb2 u42NaUFQF96KAQLKoprc+YchMWA63qUclhC1iFxStEkeVH5FFkP0lvWhY1iKvWPPqBru +qiA== X-Gm-Message-State: AOAM533uxCLPw/y1Ydb6iW4+EairvGl5zUtyNlW/ccVYWFrcZgIgT9bE ykB0KHQ3IqmMvS2EYgGqg0Qzw5ehcjTsmQ== X-Received: by 2002:aa7:978a:0:b029:2f6:c116:e5f5 with SMTP id o10-20020aa7978a0000b02902f6c116e5f5mr6702201pfp.21.1623490282906; Sat, 12 Jun 2021 02:31:22 -0700 (PDT) Received: from zhengqian-xps.lan (ngn-nat1.v4.open.ad.jp. [202.222.12.138]) by smtp.gmail.com with ESMTPSA id z3sm487719pfb.127.2021.06.12.02.31.21 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Jun 2021 02:31:22 -0700 (PDT) From: zheng qian To: ffmpeg-devel@ffmpeg.org Date: Sat, 12 Jun 2021 18:30:30 +0900 Message-Id: <20210612093032.64034-3-xqq@xqq.im> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210612093032.64034-1-xqq@xqq.im> References: <20210612093032.64034-1-xqq@xqq.im> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: MEJNT9mgeLR7 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; }