From patchwork Thu May 7 06:17:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: leozhang X-Patchwork-Id: 19524 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 782064496D2 for ; Thu, 7 May 2020 09:17:34 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 58E8F689E53; Thu, 7 May 2020 09:17:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smg-bj-02.qiyi.com (unknown [202.108.14.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 48048688399 for ; Thu, 7 May 2020 09:17:26 +0300 (EEST) X-AuditID: ca6c0e64-3d7ff70000008de1-af-5eb3a7f530d3 Received: from mail.iqiyi.com (Unknown_Domain [10.16.130.5]) by smg-bj-02.qiyi.com (Qiyi mail Gateway) with SMTP id 51.C9.36321.5F7A3BE5; Thu, 7 May 2020 14:17:25 +0800 (HKT) From: leozhang To: Date: Thu, 7 May 2020 14:17:21 +0800 Message-ID: <1588832241-63824-1-git-send-email-leozhang@qiyi.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Originating-IP: [10.13.40.147] X-ClientProxiedBy: BJ-CAS24.iqiyi.pps (10.15.221.33) To EXCH28B.iqiyi.pps (10.16.148.55) Subject: [FFmpeg-devel] [PATCH v2 3/3] avformat/fifo: add option to delay output 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" Suggested-by: Nicolas George Reviewed-by: Nicolas George Reviewed-by: Marton Balint Reviewed-by: Andreas Rheinhardt Signed-off-by: leozhang --- doc/muxers.texi | 14 ++++++++++++++ libavformat/fifo.c | 8 ++++++++ 2 files changed, 22 insertions(+) diff --git a/doc/muxers.texi b/doc/muxers.texi index 14528f1..272cf24 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -2285,6 +2285,10 @@ It is the same as the speed option to realtime or arealtime filters. @item realtime_limit @var{duration} It is the same as the limit option to realtime or arealtime filters. +@item output_delay @var{duration} +Time to delay output. This will block every output packet for the extra specified duration. Default value is 0. +This option is useful when user wouldn't want broadcast what's comming next immediately in live streaming applications. + @end table @subsection Examples @@ -2312,6 +2316,16 @@ ffmpeg -i your_input_file -c copy -map 0:v -map 0:a -f fifo -fifo_format flv -re @end itemize +@itemize + +@item +Add 20 seconds delay to rtmp stream. +@example +ffmpeg -i your_input_stream_address -c copy -map 0:a -map 0:v -f fifo -realtime 1 -queue_size 6000000 -output_delay 20 -fifo_format flv rtmp://example.com/live/delayed_stream_name +@end example + +@end itemize + @anchor{tee} @section tee diff --git a/libavformat/fifo.c b/libavformat/fifo.c index b819aeb..ba463e4 100644 --- a/libavformat/fifo.c +++ b/libavformat/fifo.c @@ -89,6 +89,9 @@ typedef struct FifoContext { int64_t delta; unsigned inited; + + /* Time to delay output */ + int64_t output_delay; } FifoContext; typedef struct FifoThreadContext { @@ -439,6 +442,8 @@ static void *fifo_consumer_thread(void *data) memset(&fifo_thread_ctx, 0, sizeof(FifoThreadContext)); fifo_thread_ctx.avf = avf; + fifo_sleep(fifo->output_delay); + while (1) { uint8_t just_flushed = 0; @@ -681,6 +686,9 @@ static const AVOption options[] = { {"realtime_limit", "Time limit for the pauses when realtime", OFFSET(realtime_limit), AV_OPT_TYPE_DURATION, {.i64 = 2000000}, 0, INT64_MAX, AV_OPT_FLAG_ENCODING_PARAM}, + {"output_delay", "Time to delay output", OFFSET(output_delay), + AV_OPT_TYPE_DURATION, {.i64 = 0}, 0, INT64_MAX, AV_OPT_FLAG_ENCODING_PARAM}, + {NULL}, };