From patchwork Thu Aug 1 20:38:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tomas Hulata X-Patchwork-Id: 14183 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 33AB24484F9 for ; Thu, 1 Aug 2019 23:45:46 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0BC5168AB7A; Thu, 1 Aug 2019 23:45:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DCF3368AB78 for ; Thu, 1 Aug 2019 23:45:39 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id n9so75078765wru.0 for ; Thu, 01 Aug 2019 13:45:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netbox-cz.20150623.gappssmtp.com; s=20150623; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to; bh=RW6deVlW7HGJplyL/4hXXRbXPYpc72hSO7a5ex3fug4=; b=KbmbhRzqeYPGq9AM2j2Fi1NTkriZ54bgAqdo95HNwneABsEvXap6HGuPrZ42K2joyG h6wO+qWDukdE0/ItP8hw+S4HOei/CaBhyyLSPwxqXKI/cNQojbmjGUYjFayBbCpywos+ OMh7g4NcWUI1U20GVuu9mZEAq9E9c27qW2J/gMolBswju7yjOIJT9XHwMk20a3YOQN6Q CSuH7NfhHkBSxNcvvfTu68jtTMyC9dqrN8kkFRyrqylGmTUhJeb5/UmtDHy64QluLWKU gUe29rrUPVBKu3ZHGsSv9ewQfeITYYLEFw+qRB1xscdEFahaZhJn0R7SXddEdCs4tdOB fdOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to; bh=RW6deVlW7HGJplyL/4hXXRbXPYpc72hSO7a5ex3fug4=; b=bMhNi18/Tdq+wZpGANkiDpzhUuW/7BQjziGVZIcsu7Px44yTRpQsmzERNZ5lFl/WJP IaDVxhBtQ5rDTEyWkhXaPOjiEGwQUVJmnxQTa/PjhoSoX41ESVI4vW4YhDHFq0XyxseW 3En75wvJoKHr+9K5hbSilmAyRF0RGVZKBBjo1qhMx7zWQZC6i+sB92TQxa0ZQtVb9xgu ZTdSJmJ2/cId1At0AMT0Hturjhh+2owU34Lx9J7u0sJpmInqNl4vouQ/vsCNMK9VZP0I 0ZGuBNbYVqRZ7iNIPc7YhDD0FPnEueteGKsiDYKMz+qmPMiVqlHy4Zdkwm3bsshxlsyN tB2w== X-Gm-Message-State: APjAAAXtsotPZ5cY/fxTWsbRsphONlIRiQTpMAxeiFri+KH0OB0D9qHw mVXLdFg2cARqn5cj9j7WunduvHK61DU= X-Google-Smtp-Source: APXvYqyY6abCqxZdQU0EExJKYcPDQKZ3LeOe7aztjETx+8EGCrkm+lF70WaqrpTtOjWRqEGiUfzeoQ== X-Received: by 2002:a5d:4cca:: with SMTP id c10mr135697538wrt.233.1564691927617; Thu, 01 Aug 2019 13:38:47 -0700 (PDT) Received: from [192.168.2.104] ([95.82.135.180]) by smtp.gmail.com with ESMTPSA id f192sm75058401wmg.30.2019.08.01.13.38.45 for (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Thu, 01 Aug 2019 13:38:46 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org References: <222fb2aa-bbab-8d28-14f0-9570ebc62b5b@netbox.cz> <20190606215834.GM3118@michaelspb> From: Tomas Hulata Message-ID: <024f530c-0067-8248-9cc1-68ecf0129603@netbox.cz> Date: Thu, 1 Aug 2019 22:38:45 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190606215834.GM3118@michaelspb> X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: Re: [FFmpeg-devel] [PATCH] mpegts pat and sdt period should respect user options 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi, sorry for delay, I wasn't tracking response, let's try it as attachment. Thx On 6/6/19 11:58 PM, Michael Niedermayer wrote: > On Wed, Jun 05, 2019 at 11:13:20PM +0200, Tomas Hulata wrote: >> When mux_rate (CBR) is defined, pat/sdt period setting is now respected. In >> case of VBR, leave it as it was. >> >> --- >>  libavformat/mpegtsenc.c | 12 ++++++++++-- >>  1 file changed, 10 insertions(+), 2 deletions(-) >> >> diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c >> index fc0ea225c6..5ad1f813e0 100644 >> --- a/libavformat/mpegtsenc.c >> +++ b/libavformat/mpegtsenc.c >> @@ -999,10 +999,18 @@ static int mpegts_init(AVFormatContext *s) >>      ts->last_sdt_ts = AV_NOPTS_VALUE; > git doesnt like this patch > Applying: mpegts pat and sdt period should respect user options > error: corrupt patch at line 10 > > [...] > > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index fc0ea225c6..d2706b7d80 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -999,10 +999,18 @@ static int mpegts_init(AVFormatContext *s) ts->last_sdt_ts = AV_NOPTS_VALUE; // The user specified a period, use only it if (ts->pat_period < INT_MAX/2) { - ts->pat_packet_period = INT_MAX; +       if (ts->mux_rate > 1) +           ts->pat_packet_period = (int64_t)ts->mux_rate * ts->pat_period / +                                    (TS_PACKET_SIZE * 8); +       else +            ts->pat_packet_period = INT_MAX; } if (ts->sdt_period < INT_MAX/2) { - ts->sdt_packet_period = INT_MAX; +       if (ts->mux_rate > 1) +            ts->sdt_packet_period = (int64_t)ts->mux_rate * ts->sdt_period / +                                    (TS_PACKET_SIZE * 8); +       else +            ts->sdt_packet_period = INT_MAX; } // output a PCR as soon as possible