From patchwork Thu Feb 23 08:05:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Davy Durham X-Patchwork-Id: 40470 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp195704pzk; Thu, 23 Feb 2023 00:06:18 -0800 (PST) X-Google-Smtp-Source: AK7set8ZMIrfjteJikzWcoPtOSHMnJiUdLh/A7vniJAWnZQl1nmXQp1fnR1kPrpkJ5FYmUPEpruV X-Received: by 2002:a17:907:2bf4:b0:7e0:eed0:8beb with SMTP id gv52-20020a1709072bf400b007e0eed08bebmr20226768ejc.41.1677139578038; Thu, 23 Feb 2023 00:06:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677139578; cv=none; d=google.com; s=arc-20160816; b=WkQVuca6rNiAIeaJN4/OpVWZLIujA4xembY7Kpajt+t4OTAK17Vimt9yGo4A3FavCU 5MWVr4ymDmty4Nf+rIBXiEtTPayHGqXEuVOwLd1RL9bMOPXYKjAWH09MKn7HFRjVOlHS YF16ruCdMmm5cVb/DGST1YsI3mCSnUlP8bZ+j212vT9iFHx/2M/HwkKv/8M6SlEcqydA XQ7QhrPZQbij7D0UAeLjiesws1hK9SPg36TIX82bx7tI4/ejTq5luHG3Sq8RxPJsMubV 2B/Fxw8xGYFVJDByvtV3VTgTrAm+nrZp1ufIHlRsM1tmj7xa+Q7ztuKJ5zJBlhZb/usA ulaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:content-language:to:from:user-agent:mime-version :date:message-id:dkim-signature:delivered-to; bh=8gnXU1xvkGaTt2RyxrrQuOxttFO5OcPDvHUQCCz/Dk0=; b=YoID+wiX8KPUPfoQE2Uk+EwbgK9QXuRk/Y/5zWZ+CavbNQFp1EWZojGcvR5Y9X6KTu lH5PoAntZQAjvt12bL2gphIA+xRm9S3dVoSxZK6UGFwTFzvvn7v2B7oMpKkttX1u3+Z0 3TlZkyCYDdds0fh3HbIaSFGGSb/zZzV2Yu5NDiHhBYzieKmB4hQbb47oKS5tCJpCu+71 jKZkS3gpVGH1YB+XHN1pU+FrX7KwEYTq/KGuCL00j0Z4iD35NJb0E9ZR8AbGYspEZF58 DG6+Od4knAtpsnP08892Tia7zk+jwi9vbQMJC0LpPuig/zOdiNpKQ8Af7yZP2lMz0Lw5 eIMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@davyandbeth-com.20210112.gappssmtp.com header.s=20210112 header.b=E3SMx3zo; 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 f17-20020a056402161100b004acc9d32198si3921982edv.582.2023.02.23.00.06.09; Thu, 23 Feb 2023 00:06:18 -0800 (PST) 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=@davyandbeth-com.20210112.gappssmtp.com header.s=20210112 header.b=E3SMx3zo; 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 5343468BEEB; Thu, 23 Feb 2023 10:06:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f182.google.com (mail-qt1-f182.google.com [209.85.160.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0683368BFFC for ; Thu, 23 Feb 2023 10:05:59 +0200 (EET) Received: by mail-qt1-f182.google.com with SMTP id h16so9851384qta.8 for ; Thu, 23 Feb 2023 00:05:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=davyandbeth-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:content-language:to:subject:from :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=F5OWy5S3xyVU6VMZJZkO+flMYokZkQgPLULwmHwSYe0=; b=E3SMx3zoOwqmizr9WV+sR8qhHF4GZQdJFV0lxfucCjd5CEGx7aTd33mtYiQZSMQFuq givl+GtpaNzrH+xDwjr/7+0RknC6aHd6YRm4NpoyGNF/vEj2aeLbBuw/VQwkMfuEAoV7 GkgWlOxqmCACME60YzTrehpi3ADms9sF4IViMryrWUZPEs9KyMaGQFjujkl8XDYjEolu yGKY0t+dTNHun25CNMagNb5580fBtLDE3rX6TiqcD5JgWeQxYM4fJYFD7wyBFwdyz9VF FWDFoOBScRWxG5K/1nbQ17PzouCtrqdveGN/Y7SzXHFU6dY8CWOokq0j/3gkKVYExn5x 999g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:content-language:to:subject:from :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=F5OWy5S3xyVU6VMZJZkO+flMYokZkQgPLULwmHwSYe0=; b=p+l+QnufO4nFlw0F7aB8vutQLJmKoVMbtvmUxHfEhHQ8HQlMU6795wZuXvnmr8LufS Ravt5XI3mo9g6/lEjmjNuWWf0hTJBPe/acNfzJsDBGZV18xFJNjb7/qKFGIq4o8dbjQ5 gzQuhalR198gp0SCAq+PIyW7fklhYLmfRSc+uiJJWsFJyJB6sqznQ/4hB6QEZ6PiFzvY pmc4rOffH+guh5EH+4m/St7qFMXTRdG1vaP1JLCHZ8k1l/WpNPKuNlAlIepyLrc0zk/v 78yu6Aef/s0m1rkw9155IO2bh5IPecBCk+GrSPNlNNRHL4XYQ9sCufZVMagYE0qIy/TB hkaA== X-Gm-Message-State: AO0yUKV/zb0sPMrX0PK1kdjYWvfmNt0vm5DptPzAOtDtQ3mkHwvINCKz xqjDgHnwE0dSjnkA6LeiIBZcSEomcPgBXvHEan6fLw== X-Received: by 2002:a05:622a:1889:b0:3bb:995c:424c with SMTP id v9-20020a05622a188900b003bb995c424cmr17641587qtc.22.1677139557961; Thu, 23 Feb 2023 00:05:57 -0800 (PST) Received: from [192.168.1.92] ([68.249.219.17]) by smtp.googlemail.com with ESMTPSA id cf7-20020a05622a400700b003bfa52112f9sm4014289qtb.4.2023.02.23.00.05.57 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 23 Feb 2023 00:05:57 -0800 (PST) Message-ID: <81384d39-2923-d6ec-21ed-0ee7e1f33d28@davyandbeth.com> Date: Thu, 23 Feb 2023 02:05:57 -0600 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 From: Davy Durham To: ffmpeg-devel@ffmpeg.org Content-Language: en-US Subject: [FFmpeg-devel] [PATCH] fftools/ffmpeg: Added ability to set a input burst time before readrate is enforced 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: yVSSeg7clp6f Implemented is the -irb flag (i.e. "initial read burst") that causes ffmpeg to read the specified number of seconds of input before a given readrate starts to be enforced. All inputs have to reach this point before the readrate is enforced. The reason for this change is, in the scenario of live-streaming by transcoding from an pre-recorded or delayed source to an HLS or DASH webroot, we can more quickly prime the system of the first few seconds before the real-world read rate is imposed. Else, one must wait for an entire segment length before the data can be fetched from the web server. Signed-off-by: Davy Durham --- doc/ffmpeg.texi | 2 ++ fftools/ffmpeg.c | 3 ++- fftools/ffmpeg.h | 2 ++ fftools/ffmpeg_opt.c | 13 +++++++++++++ 4 files changed, 19 insertions(+), 1 deletion(-) if (!f->pkt) exit_program(1); @@ -3734,6 +3744,9 @@ const OptionDef options[] = { { "readrate", HAS_ARG | OPT_FLOAT | OPT_OFFSET | OPT_EXPERT | OPT_INPUT, { .off = OFFSET(readrate) }, "read input at specified rate", "speed" }, + { "irb", HAS_ARG | OPT_DOUBLE | OPT_OFFSET | + OPT_EXPERT | OPT_INPUT, { .off = OFFSET(initial_read_burst) }, + "The initial amount of input to burst read before imposing any readrate", "seconds" }, { "target", HAS_ARG | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_target }, "specify target file type (\"vcd\", \"svcd\", \"dvd\", \"dv\" or \"dv50\" " "with optional prefixes \"pal-\", \"ntsc-\" or \"film-\")", "type" }, diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 767df69b7f..16ab1a336f 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -1633,6 +1633,8 @@ it may cause packet loss. It is useful for when flow speed of output packets is important, such as live streaming. @item -re (@emph{input}) Read input at native frame rate. This is equivalent to setting @code{-readrate 1}. +@item -irb @var{seconds} +Set an initial read burst time, in seconds, after which any specified readrate will be enforced. @item -vsync @var{parameter} (@emph{global}) @itemx -fps_mode[:@var{stream_specifier}] @var{parameter} (@emph{output,per-stream}) Set video sync method / framerate mode. vsync is applied to all output video streams diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index e7384f052a..e4697c8772 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -3768,6 +3768,7 @@ static int get_input_packet(InputFile *f, AVPacket **pkt) (f->start_time != AV_NOPTS_VALUE ? f->start_time : 0) ); float scale = f->rate_emu ? 1.0 : f->readrate; + int64_t burst_until = AV_TIME_BASE * f->initial_read_burst; for (i = 0; i < f->nb_streams; i++) { InputStream *ist = input_streams[f->ist_index + i]; int64_t stream_ts_offset, pts, now; @@ -3775,7 +3776,7 @@ static int get_input_packet(InputFile *f, AVPacket **pkt) stream_ts_offset = FFMAX(ist->first_dts != AV_NOPTS_VALUE ? ist->first_dts : 0, file_start); pts = av_rescale(ist->dts, 1000000, AV_TIME_BASE); now = (av_gettime_relative() - ist->start) * scale + stream_ts_offset; - if (pts > now) + if (pts - burst_until > now) return AVERROR(EAGAIN); } } diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 391a35cf50..aa079ab3e9 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -116,6 +116,7 @@ typedef struct OptionsContext { int loop; int rate_emu; float readrate; + double initial_read_burst; int accurate_seek; int thread_queue_size; int input_sync_ref; @@ -422,6 +423,7 @@ typedef struct InputFile { int nb_streams_warn; /* number of streams that the user was warned of */ int rate_emu; float readrate; + double initial_read_burst; int accurate_seek; AVPacket *pkt; diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 6e18a4a23e..57aa4929fa 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1378,6 +1378,16 @@ static int open_input_file(OptionsContext *o, const char *filename) f->rate_emu = 0; } + f->initial_read_burst = o->initial_read_burst ? o->initial_read_burst : 0.0; + if (f->initial_read_burst < 0.0) { + av_log(NULL, AV_LOG_ERROR, "Option -irb for Input #%d is %0.3f; it must be non-negative.\n", nb_input_files, f->initial_read_burst); + exit_program(1); + } + if ((!f->readrate && !f->rate_emu) && f->initial_read_burst) { + av_log(NULL, AV_LOG_WARNING, "Option -irb ignored since neither -readrate nor -re were given\n"); + f->initial_read_burst = 0; + } + f->pkt = av_packet_alloc();