From patchwork Thu Nov 14 22:02:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 16276 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 0097F44735B for ; Fri, 15 Nov 2019 00:03:07 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D2C6E68A276; Fri, 15 Nov 2019 00:03:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1A4D26899EB for ; Fri, 15 Nov 2019 00:03:01 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id F1528E3585; Thu, 14 Nov 2019 23:03:00 +0100 (CET) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gUD8W94jfetS; Thu, 14 Nov 2019 23:02:59 +0100 (CET) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 58B61E3567; Thu, 14 Nov 2019 23:02:59 +0100 (CET) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Nov 2019 23:02:46 +0100 Message-Id: <20191114220246.23499-1-cus@passwd.hu> X-Mailer: git-send-email 2.16.4 Subject: [FFmpeg-devel] [PATCH] avformat/mpegtsenc: do not write SDT for m2ts 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: Marton Balint MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" BDMV does not seem to use it. Signed-off-by: Marton Balint --- doc/muxers.texi | 3 ++- libavformat/mpegtsenc.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index 4e76b40151..aa4bde518d 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -1633,7 +1633,8 @@ is less than 100 ms is used for VBR streams. Maximum time in seconds between PAT/PMT tables. Default is @code{0.1}. @item sdt_period @var{duration} -Maximum time in seconds between SDT tables. Default is @code{0.5}. +Maximum time in seconds between SDT tables. Default is @code{0.5}. Regardless +of this setting no SDT is written in m2ts mode. @item tables_version @var{integer} Set PAT, PMT and SDT version (default @code{0}, valid values are from 0 to 31, inclusively). diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index f37aa31915..a10a3e2450 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -1074,7 +1074,8 @@ static void retransmit_si_info(AVFormatContext *s, int force_pat, int force_sdt, ) { if (pcr != AV_NOPTS_VALUE) ts->last_sdt_ts = FFMAX(pcr, ts->last_sdt_ts); - mpegts_write_sdt(s); + if (!ts->m2ts_mode) + mpegts_write_sdt(s); } if ((pcr != AV_NOPTS_VALUE && ts->last_pat_ts == AV_NOPTS_VALUE) || (pcr != AV_NOPTS_VALUE && pcr - ts->last_pat_ts >= ts->pat_period) ||