From patchwork Tue Jun 14 08:09:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan Doshi X-Patchwork-Id: 36216 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp929950pzb; Tue, 14 Jun 2022 01:10:24 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uTwBTnLXwC6bf9Rww07qopVXV05CIFOj5zqEWF2T0LKM630Zp8AVJEOj4Du3FVq7Mn/qHK X-Received: by 2002:a05:6402:61a:b0:433:406a:8d25 with SMTP id n26-20020a056402061a00b00433406a8d25mr4388915edv.276.1655194223841; Tue, 14 Jun 2022 01:10:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655194223; cv=none; d=google.com; s=arc-20160816; b=IKMHjwrmSqy60hUP1PkoQKkoIJgCM6w16V9ZKfr+xbsDa8KX8l4S3YIVo8erNjo1Eu 0dzuzVuZVVnWBhNuRYpjgBeVrbz6QvwW7o+1KopvmovwAYvUhZu7wp/MakH3m6YZYpp5 mhP58w4LKU7jeTVJ9nUfvo2EwMZPF9VObL/u11CumBQ0F85INhHGzs3gFo0Yh3MyW0uW o+3Q7skJ3fGkyQis2mLJuraKTFOUcliq9f1ku4MHsLR/lLYDg3bOLMVrOPJhiyca6pJM SoNY7diRoU+ok1O0PDaNaI9N/iVa4EhbYBj1QkEO05Qmpa9F79tKSjvWvB3OuDOfC0VF eMiQ== 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:mime-version:message-id:date:to:from :delivered-to; bh=ZoRV8CNZmcGqtZzeDrZPIAVqeu9tjb24PDyk4hbpCgY=; b=UIp+3RUL76wqUjBR66RiSof4qApNF/eLHkmOgJRVvCAOEGVehk/S7TarR6WY8z5uOh lTptnKpLQOVlmlR1TA5Tw5FTyYwfL4VE3T5szfBXSzBG9Ge4raHZnE8t5gEI6Ud7dhHl ykTWhL5+6FbLQU8AGjOkO9hqsKworTABtLcVZKvV2n4XATa4FXu1QCDAtOtvbhdDMr6t EHaQEMEiuLXlkEEV1cgf9tC8DG7HbhVIMekVE4md5TmmuksRR393EPTwK5bu6UbIpVAI YBTv0Dvr3COvfu2QGpgeJSDN7Md6Vu6SA9YQQlK0nR3HILglUzLtgEDk9g6NaMbDi3iq bzEQ== ARC-Authentication-Results: i=1; mx.google.com; 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 b14-20020a056402084e00b0042dd2760210si12191599edz.543.2022.06.14.01.10.22; Tue, 14 Jun 2022 01:10:23 -0700 (PDT) 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; 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 D27A968AEFA; Tue, 14 Jun 2022 11:10:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout-p-201.mailbox.org (mout-p-201.mailbox.org [80.241.56.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4522E68B000 for ; Tue, 14 Jun 2022 11:10:10 +0300 (EEST) Received: from smtp202.mailbox.org (smtp202.mailbox.org [10.196.197.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4LMh1r1ZK5z9sQh for ; Tue, 14 Jun 2022 10:10:08 +0200 (CEST) From: Gyan Doshi To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Jun 2022 13:39:37 +0530 Message-Id: <20220614080937.5263-1-ffmpeg@gyani.pro> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat: set start_time_realtime when demuxing 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: yrIzNy3eXdyx Add new flag AVFMT_START_REALTIME for the couple of demuxers that set it internally. --- doc/APIchanges | 3 +++ libavformat/avformat.h | 1 + libavformat/demux.c | 3 +++ libavformat/rtsp.c | 3 ++- libavformat/version.h | 2 +- 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 5857e67ae6..4aa9e36777 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,9 @@ libavutil: 2021-04-27 API changes, most recent first: +2022-06-xx - xxxxxxxxxx - lavf 59.26.100 - avformat.h + Add AVFMT_START_REALTIME flag. + 2022-06-12 - xxxxxxxxxx - lavf 59.25.100 - avio.h Add avio_vprintf(), similar to avio_printf() but allow to use it from within a function taking a variable argument list as input. diff --git a/libavformat/avformat.h b/libavformat/avformat.h index f12fa7d904..4e247d68fc 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -499,6 +499,7 @@ typedef struct AVProbeData { The user or muxer can override this through AVFormatContext.avoid_negative_ts */ +#define AVFMT_START_REALTIME 0x80000 /**< Demuxer sets start_time_realtime */ #define AVFMT_SEEK_TO_PTS 0x4000000 /**< Seeking is based on PTS */ diff --git a/libavformat/demux.c b/libavformat/demux.c index 1620716716..28c6966e71 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -628,6 +628,9 @@ FF_ENABLE_DEPRECATION_WARNINGS force_codec_ids(s, st); + if (!(s->iformat->flags & AVFMT_START_REALTIME) && s->start_time_realtime == AV_NOPTS_VALUE) + s->start_time_realtime = av_gettime(); + /* TODO: audio: time filter; video: frame reordering (pts != dts) */ if (s->use_wallclock_as_timestamps) pkt->dts = pkt->pts = av_rescale_q(av_gettime(), AV_TIME_BASE_Q, st->time_base); diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 88e9ef5226..2cafe33887 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -2489,6 +2489,7 @@ const AVInputFormat ff_sdp_demuxer = { .read_header = sdp_read_header, .read_packet = ff_rtsp_fetch_packet, .read_close = sdp_read_close, + .flags = AVFMT_START_REALTIME, .priv_class = &sdp_demuxer_class, }; #endif /* CONFIG_SDP_DEMUXER */ @@ -2648,7 +2649,7 @@ const AVInputFormat ff_rtp_demuxer = { .read_header = rtp_read_header, .read_packet = ff_rtsp_fetch_packet, .read_close = sdp_read_close, - .flags = AVFMT_NOFILE, + .flags = AVFMT_NOFILE | AVFMT_START_REALTIME, .priv_class = &rtp_demuxer_class, }; #endif /* CONFIG_RTP_DEMUXER */ diff --git a/libavformat/version.h b/libavformat/version.h index 966ebb7ed3..0708d619c0 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #include "version_major.h" -#define LIBAVFORMAT_VERSION_MINOR 25 +#define LIBAVFORMAT_VERSION_MINOR 26 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \