From patchwork Wed Oct 19 00:36:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Fernandez Sanz X-Patchwork-Id: 1061 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp6893vsd; Tue, 18 Oct 2016 17:43:43 -0700 (PDT) X-Received: by 10.28.109.24 with SMTP id i24mr2671839wmc.111.1476837823199; Tue, 18 Oct 2016 17:43:43 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f128si1996166wmf.2.2016.10.18.17.43.42; Tue, 18 Oct 2016 17:43:43 -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=@nisupu-com.20150623.gappssmtp.com; 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 E9CE86897EE; Wed, 19 Oct 2016 03:43:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C9BE568978C for ; Wed, 19 Oct 2016 03:43:30 +0300 (EEST) Received: by mail-pf0-f196.google.com with SMTP id 128so783002pfz.1 for ; Tue, 18 Oct 2016 17:43:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nisupu-com.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=qG4A/D864q/G6lm4ElHzScNAFgRIKP8DWor3hCIt6as=; b=Cca2PrBeBBhAC20FNL0n9kIAuo4LydNdZGGmKMaANs/k1fTDE2CR2IboaoVIMM+Bts NvVrtYEiybZVo4zPldtENIHwdXHyd+JblctKxU1o5nWlHJCYQ/q/7QChdFFC8Q1XYCz2 fDhR9p+jMjdo3qmjtDz4U+zDno/iLTM1ZASdUVBa1tmVRKTJiSYw/uHO6fKGEtyHwhoj P6ulyW+Xm3B5kHx7Szk/5w8Emv2BA70eFZGCYHGxKxUig62bT7oph8lvqtRxa0LKLdqU FTDN06CN1WkS9Gfrc09viUe+XAPiu3EDtf719yonWf40zi0F3YHgnYy3gnjb9/fxwb1j D3ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=qG4A/D864q/G6lm4ElHzScNAFgRIKP8DWor3hCIt6as=; b=KVylPEStFjSnlp9GpBkSYSyGroCvqcZsMbwLav6hhSB/4fjn1hBxyoWAKdfQSjdJMb qNeSad+VbhfrXbKLbK6OTWtvdcP65UKEIBoDiNOFeBVM5z54R66jJV+gNInUMLsTPyKu vtOJateE5ajsirCjOYJTcxDb/IohACwK0cTpDvOpDUSTLSRcX7k1TGlcvS6rL+P2LWIs x0HoEt5lyGcPwKksX3V0UdcYo9gZkvMTg3kWptfb33ZbsZr0jpatNKQChx45Bph8Z3l1 V92qhVgbQigQ96mB15H7N3xn6OV9rMN3vNZJ3EE2Ie2XkZqHUoBM3jkCWcbvcRmaI4Fg In+g== X-Gm-Message-State: AA6/9RnELDW1tYBh3r/1J5TNOOFwMxZc8JXDELcbjxAXWT4UjmLZB34EotWklxLpXpWWWw== X-Received: by 10.98.204.67 with SMTP id a64mr5630628pfg.120.1476837812208; Tue, 18 Oct 2016 17:43:32 -0700 (PDT) Received: from carlos-linux-dev.monkeybrains.net (162-245-20-150.PUBLIC.monkeybrains.net. [162.245.20.150]) by smtp.gmail.com with ESMTPSA id b88sm58529133pfe.72.2016.10.18.17.43.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Oct 2016 17:43:31 -0700 (PDT) From: Carlos Fernandez Sanz To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Oct 2016 17:36:28 -0700 Message-Id: <1476837390-20225-3-git-send-email-carlos@ccextractor.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1476837390-20225-1-git-send-email-carlos@ccextractor.org> References: <1476837390-20225-1-git-send-email-carlos@ccextractor.org> Subject: [FFmpeg-devel] [PATCH 2/4] V14 - SCTE-35 extraction from mpegts X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Carlos Fernandez MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Carlos Fernandez Signed-off-by: Carlos Fernandez Acked-by: Michael --- libavformat/mpegts.c | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index b31d233..932ffc1 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -725,6 +725,12 @@ static const StreamType HDMV_types[] = { { 0 }, }; +/* SCTE types */ +static const StreamType SCTE_types[] = { + { 0x86, AVMEDIA_TYPE_DATA, AV_CODEC_ID_SCTE_35 }, + { 0 }, +}; + /* ATSC ? */ static const StreamType MISC_types[] = { { 0x81, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AC3 }, @@ -872,6 +878,13 @@ static void reset_pes_packet_state(PESContext *pes) av_buffer_unref(&pes->buffer); } +static void new_data_packet(const uint8_t *buffer, int len, AVPacket *pkt) +{ + av_init_packet(pkt); + pkt->data = buffer; + pkt->size = len; +} + static int new_pes_packet(PESContext *pes, AVPacket *pkt) { char *sd; @@ -1590,6 +1603,27 @@ static void m4sl_cb(MpegTSFilter *filter, const uint8_t *section, av_free(mp4_descr[i].dec_config_descr); } +static void scte_data_cb(MpegTSFilter *filter, const uint8_t *section, + int section_len) +{ + AVProgram *prg = NULL; + MpegTSContext *ts = filter->u.section_filter.opaque; + + int idx = ff_find_stream_index(ts->stream, filter->pid); + new_data_packet(section, section_len, ts->pkt); + if (idx >= 0) { + ts->pkt->stream_index = idx; + } + prg = av_find_program_from_stream(ts->stream, NULL, idx); + if (prg && prg->pcr_pid != -1 && prg->discard != AVDISCARD_ALL) { + MpegTSFilter *f = ts->pids[prg->pcr_pid]; + if (f) + ts->pkt->pts = ts->pkt->dts = f->last_pcr/300; + } + ts->stop_parse = 1; + +} + static const uint8_t opus_coupled_stream_cnt[9] = { 1, 0, 1, 1, 2, 2, 2, 3, 3 }; @@ -1868,6 +1902,12 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type return 0; } +static int is_pes_stream(int stream_type, uint32_t prog_reg_desc) +{ + return !(stream_type == 0x13 || + (stream_type == 0x86 && prog_reg_desc == AV_RL32("CUEI")) ); +} + static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len) { MpegTSContext *ts = filter->u.section_filter.opaque; @@ -1975,7 +2015,7 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len pes->st->id = pes->pid; } st = pes->st; - } else if (stream_type != 0x13) { + } else if (is_pes_stream(stream_type, prog_reg_desc)) { if (ts->pids[pid]) mpegts_close_filter(ts, ts->pids[pid]); // wrongly added sdt filter probably pes = add_pes_stream(ts, pid, pcr_pid); @@ -1995,6 +2035,10 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len goto out; st->id = pid; st->codecpar->codec_type = AVMEDIA_TYPE_DATA; + if (stream_type == 0x86 && prog_reg_desc == AV_RL32("CUEI")) { + mpegts_find_stream_type(st, stream_type, SCTE_types); + mpegts_open_section_filter(ts, pid, scte_data_cb, ts, 1); + } } } @@ -2317,7 +2361,6 @@ static int handle_packet(MpegTSContext *ts, const uint8_t *packet) } } } - } else { int ret; // Note: The position here points actually behind the current packet.