From patchwork Tue Dec 25 20:41:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Barsnick X-Patchwork-Id: 11547 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 5358044CBA9 for ; Tue, 25 Dec 2018 22:41:54 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0D4B568B03E; Tue, 25 Dec 2018 22:41:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F108668AFE2 for ; Tue, 25 Dec 2018 22:41:44 +0200 (EET) Received: from goodtimes.fritz.box ([79.223.42.222]) by mail.gmx.com (mrgmx002 [212.227.17.190]) with ESMTPSA (Nemesis) id 0LsCdj-1hMt0c1icJ-013x3J; Tue, 25 Dec 2018 21:41:49 +0100 From: Moritz Barsnick To: FFmpeg development discussions and patches Date: Tue, 25 Dec 2018 21:41:38 +0100 Message-Id: <6b1eaa365f8ffed7683ceffee9fb55e186361a1e.1545769801.git.barsnick@gmx.net> X-Mailer: git-send-email 2.14.5 In-Reply-To: References: In-Reply-To: References: X-Provags-ID: V03:K1:zmbFfUI/pLG2mq70PVWkv0uT4enfXfrGwwyltj9nSU+x+P5lcay mI1iUlRCOO98xUDHbJO8XrDEm7XB4ePjKY4gpOq7jhDs/tqmM4CQrT2yLNlyXyfQ0MUOzua 3/kwMkfB6BQfZ8nlywesgO4R+KQaK9sXwIqfuAZGdECQXGk+pXPve5iv7AcQGHzciHUn0BU jnb/uD5QFj2v2XfeM8x6A== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:xA19HLnTfZc=:uClLApBr4fw6G+KEgVbA3c vl4Dj6hunt4rqMXiDU+BgVt+Fk+ZV2nLJwM01f4A0f/kQaqBtkzwjAWmsiDzA0Vit0kH/7XhO d04ldCF8uPBHzrBdNgBa4o5ulJ0yXpPihbjFCqESeA2FnlmoSZ5XG/LU9Bdq+8OJ41/hD2Ar9 HdhqzKSdAg30+QOQaCbwdy6H1Iks6Xf24AnpTJ3k4mZq3J2QCkXejgH+b0qyqGxEdDZ/ItWUW zDsXJk0zOwIlEXNNVcUx+2PVQrZsV/hGtf7QR45X7HX7V4nsr3RfDWGTY3eKW8dQFWo4mBRmy sqZRCS5fZJvR+BH4wFxaHSbo5jfWTSRLCS5fA7gPLLvu2xN2geF5R/NnbJRebXnNKAOJt/1h7 ejdBDj01fV5KSqx8hvszfVuhiqAjZcRyYo9q5Mrh1LMTiKmWqGQjv9lzwHJCZwV1Tt4iqTLY9 h3fgz9o4vYsw6gV6S1t8BXIh10sb2H+cgO/Gv7KPiKHRN0Zs3nJg9hgLeVKPQzZUa94rbW5ZV WHtsy/C4aUymk1bryekjqaddEQD0nvNNvtqwK9nXD2a1hDraVkAci3KEjLX6WuP0DP0+9yJ7g QstB2i8ifu7OvJZETU4nLX2TZXJ54hk/qvdcipg95QoOOW0wz15O40waJJ51priOifi6+1nzl mDGjeg8K2yvTNDgOLGLWiVD1H4AC1VC3dsckpGUca9f6iMa4CssA+1oR3mueOLYdUrLRPpS3B bc4GN3UGJr059bHaGtbJWnvdmBocxEzPoZEQWhDtmz/AroiffsfihF1ZLxYheso830AgOdTKZ y5cw2ZzR06DQFEakZBXVD8tXKhH8Gd81Byp9lB7XcSE1VOThEiZmGLwDh+7S6d6fyF/PgFXhQ k7Tdjkezx2Do7Id/xyALUoxavR+yDW9XhNACSpE4k= Subject: [FFmpeg-devel] [PATCH 1/2] avcodec: add realtime bitstream filter 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: Moritz Barsnick MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Works for video and audio streams. Similar to the -re option in ffmpeg that only works for input files, and is only implemented for the command line tool, not available in the libraries. Implementation mostly taken from libavfilter/f_realtime.c. Signed-off-by: Moritz Barsnick --- doc/bitstream_filters.texi | 16 ++++++++ libavcodec/Makefile | 1 + libavcodec/bitstream_filters.c | 1 + libavcodec/realtime_bsf.c | 90 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 108 insertions(+) create mode 100644 libavcodec/realtime_bsf.c diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi index b779265f58..8c71100460 100644 --- a/doc/bitstream_filters.texi +++ b/doc/bitstream_filters.texi @@ -596,6 +596,22 @@ Set Rec709 colorspace for each frame of the file ffmpeg -i INPUT -c copy -bsf:v prores_metadata=color_primaries=bt709:color_trc=bt709:colorspace=bt709 output.mov @end example +@section realtime + +Slow down output processing to match real time approximately. + +This filter will pause the filtering for a variable amount of time to +match the output rate with the input timestamps. +It is similar to the @option{re} option to @code{ffmpeg}. + +It accepts the following options: + +@table @option +@item limit +Time limit for the pauses. Any pause longer than that will be considered +a timestamp discontinuity and reset the timer. Default is 2 seconds. +@end table + @section remove_extra Remove extradata from packets. diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 08f89ae0b2..a85a5e1fa2 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1085,6 +1085,7 @@ OBJS-$(CONFIG_MPEG2_METADATA_BSF) += mpeg2_metadata_bsf.o OBJS-$(CONFIG_NOISE_BSF) += noise_bsf.o OBJS-$(CONFIG_NULL_BSF) += null_bsf.o OBJS-$(CONFIG_PRORES_METADATA_BSF) += prores_metadata_bsf.o +OBJS-$(CONFIG_REALTIME_BSF) += realtime_bsf.o OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF) += remove_extradata_bsf.o OBJS-$(CONFIG_TEXT2MOVSUB_BSF) += movsub_bsf.o OBJS-$(CONFIG_TRACE_HEADERS_BSF) += trace_headers_bsf.o diff --git a/libavcodec/bitstream_filters.c b/libavcodec/bitstream_filters.c index 2c999d3c1d..ba7d3224c4 100644 --- a/libavcodec/bitstream_filters.c +++ b/libavcodec/bitstream_filters.c @@ -48,6 +48,7 @@ extern const AVBitStreamFilter ff_mov2textsub_bsf; extern const AVBitStreamFilter ff_noise_bsf; extern const AVBitStreamFilter ff_null_bsf; extern const AVBitStreamFilter ff_prores_metadata_bsf; +extern const AVBitStreamFilter ff_realtime_bsf; extern const AVBitStreamFilter ff_remove_extradata_bsf; extern const AVBitStreamFilter ff_text2movsub_bsf; extern const AVBitStreamFilter ff_trace_headers_bsf; diff --git a/libavcodec/realtime_bsf.c b/libavcodec/realtime_bsf.c new file mode 100644 index 0000000000..eb4b0b69ed --- /dev/null +++ b/libavcodec/realtime_bsf.c @@ -0,0 +1,90 @@ +/* + * Realtime filter + * Copyright (c) 2015 Nicolas George + * Copyright (c) 2018 Moritz Barsnick + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavutil/time.h" +#include "libavutil/opt.h" +#include "avcodec.h" +#include "bsf.h" + +typedef struct RealtimeContext { + const AVClass *class; + int64_t delta; + int64_t limit; + unsigned inited; +} RealtimeContext; + +static int realtime_filter(AVBSFContext *bsf, AVPacket *pkt) +{ + int ret; + RealtimeContext *ctx = bsf->priv_data; + + ret = ff_bsf_get_packet_ref(bsf, pkt); + if (ret < 0) + return ret; + + if (pkt->pts != AV_NOPTS_VALUE) { + int64_t pts = av_rescale_q(pkt->pts, bsf->time_base_in, AV_TIME_BASE_Q); + int64_t now = av_gettime_relative(); + int64_t sleep = pts - now + ctx->delta; + if (!ctx->inited) { + ctx->inited = 1; + sleep = 0; + ctx->delta = now - pts; + } + if (sleep > ctx->limit || sleep < -ctx->limit) { + av_log(ctx, AV_LOG_WARNING, + "time discontinuity detected: %"PRIi64" us, resetting\n", + sleep); + sleep = 0; + ctx->delta = now - pts; + } + if (sleep > 0) { + av_log(ctx, AV_LOG_DEBUG, "sleeping %"PRIi64" us\n", sleep); + for (; sleep > 600000000; sleep -= 600000000) + av_usleep(600000000); + av_usleep(sleep); + } + } + + return 0; +} + +#define OFFSET(x) offsetof(RealtimeContext, x) +#define FLAGS (AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_BSF_PARAM) +static const AVOption options[] = { + { "limit", "sleep time limit", OFFSET(limit), AV_OPT_TYPE_DURATION, { .i64 = 2000000 }, 0, INT64_MAX, FLAGS }, + { NULL }, +}; + +static const AVClass realtime_class = { + .class_name = "realtime_bsf", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; + +const AVBitStreamFilter ff_realtime_bsf = { + .name = "realtime", + .priv_data_size = sizeof(RealtimeContext), + .priv_class = &realtime_class, + .filter = realtime_filter, +};