From patchwork Sat Jun 5 15:04:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 28091 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2032672iof; Sat, 5 Jun 2021 08:05:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyd+OKoGR0sqJqzQo9lc/0QV3yB0cx38yHloFCZDeZvRvL6pgGyxsv66HlP/SdVbnrH10Iz X-Received: by 2002:a17:906:f849:: with SMTP id ks9mr9237458ejb.402.1622905527684; Sat, 05 Jun 2021 08:05:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622905527; cv=none; d=google.com; s=arc-20160816; b=Q9hmcxYJgiTXz0Ti8mVI5wSiSWnp/BiOhMmQTq3V2RXvB+Lh7Ji36vYcA8ypAom7YP 1cyXk1dvd+y+qWq5KhSadQIaaHJCIpq9H7iCypdR2hkUT7ti/nxWt3wxhaYxCL+6xXnf gSs3oUEgoT8xWpMDGFfzhGQb3osAci05IOUqwazVgpCxE2w/uj/3Av2U5BDAPyqi0Yq3 C3FxPqlAt2bji+/YTFtfTm2aZrV6mIqEphme8TThfeIDKcaFMaiEaePfBurtjM6+7h74 Ozc69aEYaqal6YZ7/lniXhb8mJ260lvc/mPp93c6au6k0wAxJCS5nY/P7P3QKyig+se5 LXmw== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=Nfiv3PzyufK3JlGRXQQjfGjxsKDkeHnKnUZtxXLml48=; b=ulrGro3Ftwk8uRmhPRjlwOu0mJE0RmXjab9noVs1m3pJ8rZDmERgSfOFt8gsBDw8+8 +eLm0sXREVSSBmcq3qNFPye6CmOgep8+Au0MI39i/HaW4wp5Hy4n1nGWo3xBi0edvdAp Hjiw70m334aeJ7GfcwkPj39VOFttfL+K3jG2oZj83oZpPu5+ruLa4w+5vQX+s4Ue2VIh X6CJuXca5c/52RM8CU+jBG1hCGDjeBtjsb3AUQlGIuuoNMvV/d041Ajj0TcsDtbuugb9 OsfQQKHc/57NSbV2NIJYi+Cq3VQeHOWbETN2EYGjY73rZwpt/zvWwj34/jWmgz/hD+II zgAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=rAjYWtxP; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u3si5108403edc.326.2021.06.05.08.05.27; Sat, 05 Jun 2021 08:05:27 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=rAjYWtxP; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0CBBF68A54D; Sat, 5 Jun 2021 18:05:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f179.google.com (mail-qt1-f179.google.com [209.85.160.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8527B6881C6 for ; Sat, 5 Jun 2021 18:05:18 +0300 (EEST) Received: by mail-qt1-f179.google.com with SMTP id v6so412002qta.9 for ; Sat, 05 Jun 2021 08:05:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=+HDhZdIgvRLrlmq9V4KqH2RYj/1WJQjsSfrCKEAmQTI=; b=rAjYWtxP5HEJKuN+doi3fNavxm/VT5fjSBA9NwQPxLFY1wrF26ImEEOlWuvVoJR0Om LqgU8ep0e+3AdC1uTBAdlCO52AXhwJBjVSniTJImtVyv43KGEunvyWUSD5Joo7ZO8EwU Y2yT6u/kFRH6wZyTI6nPRbDV4U/FIwWhWlv0e/1Uoov3RfM99A01cKY0XJZB/wBe95aT HxQizHiQwXhAHi92FYyRSxSHwSfA/Lup6bu3DxJqc+kEUYl3yPk1EyZQY1oL49+jVyuW Vkc5Q9qg+dubtBRvjmAba3Tj8X5Hickgi3SemS2Qg8FXC/BiPbT8kTV4LbfXSVS8KUhC nawA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+HDhZdIgvRLrlmq9V4KqH2RYj/1WJQjsSfrCKEAmQTI=; b=rjG2lnTCxGxhz5q1N1dsf+2QfPL/FyFGE12Q9J4zYY+4YUWVf28936o32vI9bbQzcP T+sJK6l93ZFQcCCtRVYhQU5GFLPeknojM25v1Lupn2NUT+4FrREjrvt8OxQgGQ/IaLnL YjXixvn/DY6YaVtwN7oPXcG9/dLTR3+oMrdAbVcwjoIGAAYet+WOIznUeSVicPRoZCEy hDtQW7dG+CLrCEgtwJeJBKntuDi5URV8+C4BBWH4M+VJZTmcwIGygwIS7n4LUwBggywJ JlMRoe0dnm79fMRQvfjemHtJzGcifRYVyoplBJTPvrsHT0nxeGH9g8eCrg1yJ72YBf06 X2EA== X-Gm-Message-State: AOAM53220buzhpGRXx2PN17SFB3d+NFjN0/mSqfz6SbGK9WSlK8wNFGA kdw0VnsUpKz6ZUOpIxv8+EbcGbBfYSo= X-Received: by 2002:ac8:7096:: with SMTP id y22mr9529892qto.94.1622905516797; Sat, 05 Jun 2021 08:05:16 -0700 (PDT) Received: from localhost.localdomain ([191.83.217.13]) by smtp.gmail.com with ESMTPSA id e128sm6061899qkd.127.2021.06.05.08.05.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Jun 2021 08:05:16 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 5 Jun 2021 12:04:51 -0300 Message-Id: <20210605150451.2391-1-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210605150149.2334-3-jamrial@gmail.com> References: <20210605150149.2334-3-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3 v2] avformat: move AVStream.{first, cur}_dts to AVStreamInternal 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: ApGYE22F2dn3 They are private fields, no reason to have them exposed in a public header. Signed-off-by: James Almer --- libavformat/avformat.h | 11 ---- libavformat/concatdec.c | 4 +- libavformat/fifo.c | 2 +- libavformat/hdsenc.c | 6 +-- libavformat/internal.h | 11 ++++ libavformat/mux.c | 18 +++---- libavformat/mxfdec.c | 2 +- libavformat/pcm.c | 2 +- libavformat/rdt.c | 4 +- libavformat/sbgdec.c | 6 +-- libavformat/smoothstreamingenc.c | 6 +-- libavformat/tedcaptionsdec.c | 2 +- libavformat/utils.c | 86 ++++++++++++++++---------------- libavformat/vqf.c | 2 +- libavformat/wavdec.c | 4 +- 15 files changed, 83 insertions(+), 83 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index a28ac372da..094683f12a 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -992,17 +992,6 @@ typedef struct AVStream { int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */ - // Timestamp generation support: - /** - * Timestamp corresponding to the last dts sync point. - * - * Initialized when AVCodecParserContext.dts_sync_point >= 0 and - * a DTS is received from the underlying container. Otherwise set to - * AV_NOPTS_VALUE by default. - */ - int64_t first_dts; - int64_t cur_dts; - /** * An opaque field for libavformat internal usage. * Must not be accessed in any way by callers. diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index 65fbe0a854..6d77398f48 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -638,8 +638,8 @@ static int concat_read_packet(AVFormatContext *avf, AVPacket *pkt) } } - if (cat->cur_file->duration == AV_NOPTS_VALUE && st->cur_dts != AV_NOPTS_VALUE) { - int64_t next_dts = av_rescale_q(st->cur_dts, st->time_base, AV_TIME_BASE_Q); + if (cat->cur_file->duration == AV_NOPTS_VALUE && st->internal->cur_dts != AV_NOPTS_VALUE) { + int64_t next_dts = av_rescale_q(st->internal->cur_dts, st->time_base, AV_TIME_BASE_Q); if (cat->cur_file->next_dts == AV_NOPTS_VALUE || next_dts > cat->cur_file->next_dts) { cat->cur_file->next_dts = next_dts; } diff --git a/libavformat/fifo.c b/libavformat/fifo.c index 50656f78b7..a9b59b6589 100644 --- a/libavformat/fifo.c +++ b/libavformat/fifo.c @@ -139,7 +139,7 @@ static int fifo_thread_write_header(FifoThreadContext *ctx) } for (i = 0;i < avf2->nb_streams; i++) - avf2->streams[i]->cur_dts = 0; + avf2->streams[i]->internal->cur_dts = 0; ret = avformat_write_header(avf2, &format_options); if (!ret) diff --git a/libavformat/hdsenc.c b/libavformat/hdsenc.c index 202855392e..1793fb69d5 100644 --- a/libavformat/hdsenc.c +++ b/libavformat/hdsenc.c @@ -504,11 +504,11 @@ static int hds_write_packet(AVFormatContext *s, AVPacket *pkt) int64_t end_dts = os->fragment_index * (int64_t)c->min_frag_duration; int ret; - if (st->first_dts == AV_NOPTS_VALUE) - st->first_dts = pkt->dts; + if (st->internal->first_dts == AV_NOPTS_VALUE) + st->internal->first_dts = pkt->dts; if ((!os->has_video || st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) && - av_compare_ts(pkt->dts - st->first_dts, st->time_base, + av_compare_ts(pkt->dts - st->internal->first_dts, st->time_base, end_dts, AV_TIME_BASE_Q) >= 0 && pkt->flags & AV_PKT_FLAG_KEY && os->packets_written) { diff --git a/libavformat/internal.h b/libavformat/internal.h index 9882454d59..fee70e8e3d 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -389,6 +389,17 @@ struct AVStreamInternal { * 0 means unknown */ int stream_identifier; + + // Timestamp generation support: + /** + * Timestamp corresponding to the last dts sync point. + * + * Initialized when AVCodecParserContext.dts_sync_point >= 0 and + * a DTS is received from the underlying container. Otherwise set to + * AV_NOPTS_VALUE by default. + */ + int64_t first_dts; + int64_t cur_dts; }; void avpriv_stream_set_need_parsing(AVStream *st, enum AVStreamParseType type); diff --git a/libavformat/mux.c b/libavformat/mux.c index eab58aa225..d719e16283 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -525,7 +525,7 @@ static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket * if (s->debug & FF_FDEBUG_TS) av_log(s, AV_LOG_DEBUG, "compute_muxer_pkt_fields: pts:%s dts:%s cur_dts:%s b:%d size:%d st:%d\n", - av_ts2str(pkt->pts), av_ts2str(pkt->dts), av_ts2str(st->cur_dts), delay, pkt->size, pkt->stream_index); + av_ts2str(pkt->pts), av_ts2str(pkt->dts), av_ts2str(st->internal->cur_dts), delay, pkt->size, pkt->stream_index); if (pkt->pts == AV_NOPTS_VALUE && pkt->dts != AV_NOPTS_VALUE && delay == 0) pkt->pts = pkt->dts; @@ -553,14 +553,14 @@ static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket * pkt->dts = st->internal->pts_buffer[0]; } - if (st->cur_dts && st->cur_dts != AV_NOPTS_VALUE && + if (st->internal->cur_dts && st->internal->cur_dts != AV_NOPTS_VALUE && ((!(s->oformat->flags & AVFMT_TS_NONSTRICT) && st->codecpar->codec_type != AVMEDIA_TYPE_SUBTITLE && st->codecpar->codec_type != AVMEDIA_TYPE_DATA && - st->cur_dts >= pkt->dts) || st->cur_dts > pkt->dts)) { + st->internal->cur_dts >= pkt->dts) || st->internal->cur_dts > pkt->dts)) { av_log(s, AV_LOG_ERROR, "Application provided invalid, non monotonically increasing dts to muxer in stream %d: %s >= %s\n", - st->index, av_ts2str(st->cur_dts), av_ts2str(pkt->dts)); + st->index, av_ts2str(st->internal->cur_dts), av_ts2str(pkt->dts)); return AVERROR(EINVAL); } if (pkt->dts != AV_NOPTS_VALUE && pkt->pts != AV_NOPTS_VALUE && pkt->pts < pkt->dts) { @@ -575,7 +575,7 @@ static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket * av_log(s, AV_LOG_DEBUG, "av_write_frame: pts2:%s dts2:%s\n", av_ts2str(pkt->pts), av_ts2str(pkt->dts)); - st->cur_dts = pkt->dts; + st->internal->cur_dts = pkt->dts; st->internal->priv_pts->val = pkt->dts; /* update pts */ @@ -763,13 +763,13 @@ static int prepare_input_packet(AVFormatContext *s, AVStream *st, AVPacket *pkt) /* check that the dts are increasing (or at least non-decreasing, * if the format allows it */ - if (st->cur_dts != AV_NOPTS_VALUE && - ((!(s->oformat->flags & AVFMT_TS_NONSTRICT) && st->cur_dts >= pkt->dts) || - st->cur_dts > pkt->dts)) { + if (st->internal->cur_dts != AV_NOPTS_VALUE && + ((!(s->oformat->flags & AVFMT_TS_NONSTRICT) && st->internal->cur_dts >= pkt->dts) || + st->internal->cur_dts > pkt->dts)) { av_log(s, AV_LOG_ERROR, "Application provided invalid, non monotonically increasing " "dts to muxer in stream %d: %" PRId64 " >= %" PRId64 "\n", - st->index, st->cur_dts, pkt->dts); + st->index, st->internal->cur_dts, pkt->dts); return AVERROR(EINVAL); } diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index e489e59e5d..979bdedb6c 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -1766,7 +1766,7 @@ static int mxf_compute_ptses_fake_index(MXFContext *mxf, MXFIndexTable *index_ta * 6: 5 5 * * We do this by bucket sorting x by x+TemporalOffset[x] into mxf->ptses, - * then settings mxf->first_dts = -max(TemporalOffset[x]). + * then settings mxf->internal->first_dts = -max(TemporalOffset[x]). * The latter makes DTS <= PTS. */ for (i = x = 0; i < index_table->nb_segments; i++) { diff --git a/libavformat/pcm.c b/libavformat/pcm.c index 1effc0b6f8..0e5443a826 100644 --- a/libavformat/pcm.c +++ b/libavformat/pcm.c @@ -79,7 +79,7 @@ int ff_pcm_read_seek(AVFormatContext *s, pos *= block_align; /* recompute exact position */ - st->cur_dts = av_rescale(pos, st->time_base.den, byte_rate * (int64_t)st->time_base.num); + st->internal->cur_dts = av_rescale(pos, st->time_base.den, byte_rate * (int64_t)st->time_base.num); if ((ret = avio_seek(s->pb, pos + s->internal->data_offset, SEEK_SET)) < 0) return ret; return 0; diff --git a/libavformat/rdt.c b/libavformat/rdt.c index e5824f6a48..da55503ea6 100644 --- a/libavformat/rdt.c +++ b/libavformat/rdt.c @@ -415,7 +415,7 @@ rdt_parse_sdp_line (AVFormatContext *s, int st_index, if (av_strstart(p, "OpaqueData:buffer;", &p)) { rdt->mlti_data = rdt_parse_b64buf(&rdt->mlti_data_size, p); } else if (av_strstart(p, "StartTime:integer;", &p)) - stream->first_dts = atoi(p); + stream->internal->first_dts = atoi(p); else if (av_strstart(p, "ASMRuleBook:string;", &p)) { int n, first = -1; @@ -465,7 +465,7 @@ add_dstream(AVFormatContext *s, AVStream *orig_st) return NULL; st->id = orig_st->id; st->codecpar->codec_type = orig_st->codecpar->codec_type; - st->first_dts = orig_st->first_dts; + st->internal->first_dts = orig_st->internal->first_dts; return st; } diff --git a/libavformat/sbgdec.c b/libavformat/sbgdec.c index 7b9ada569e..dafdc4a1cc 100644 --- a/libavformat/sbgdec.c +++ b/libavformat/sbgdec.c @@ -1444,7 +1444,7 @@ static av_cold int sbg_read_header(AVFormatContext *avf) st->duration = script.end_ts == AV_NOPTS_VALUE ? AV_NOPTS_VALUE : av_rescale(script.end_ts - script.start_ts, sbg->sample_rate, AV_TIME_BASE); - st->cur_dts = st->start_time; + st->internal->cur_dts = st->start_time; r = encode_intervals(&script, st->codecpar, &inter); if (r < 0) goto fail; @@ -1465,7 +1465,7 @@ static int sbg_read_packet(AVFormatContext *avf, AVPacket *packet) int64_t ts, end_ts; int ret; - ts = avf->streams[0]->cur_dts; + ts = avf->streams[0]->internal->cur_dts; end_ts = ts + avf->streams[0]->codecpar->frame_size; if (avf->streams[0]->duration != AV_NOPTS_VALUE) end_ts = FFMIN(avf->streams[0]->start_time + avf->streams[0]->duration, @@ -1488,7 +1488,7 @@ static int sbg_read_seek2(AVFormatContext *avf, int stream_index, return AVERROR(EINVAL); if (stream_index < 0) ts = av_rescale_q(ts, AV_TIME_BASE_Q, avf->streams[0]->time_base); - avf->streams[0]->cur_dts = ts; + avf->streams[0]->internal->cur_dts = ts; return 0; } diff --git a/libavformat/smoothstreamingenc.c b/libavformat/smoothstreamingenc.c index a18fbd07d9..65ef942367 100644 --- a/libavformat/smoothstreamingenc.c +++ b/libavformat/smoothstreamingenc.c @@ -586,11 +586,11 @@ static int ism_write_packet(AVFormatContext *s, AVPacket *pkt) int64_t end_dts = (c->nb_fragments + 1) * (int64_t) c->min_frag_duration; int ret; - if (st->first_dts == AV_NOPTS_VALUE) - st->first_dts = pkt->dts; + if (st->internal->first_dts == AV_NOPTS_VALUE) + st->internal->first_dts = pkt->dts; if ((!c->has_video || st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) && - av_compare_ts(pkt->dts - st->first_dts, st->time_base, + av_compare_ts(pkt->dts - st->internal->first_dts, st->time_base, end_dts, AV_TIME_BASE_Q) >= 0 && pkt->flags & AV_PKT_FLAG_KEY && os->packets_written) { diff --git a/libavformat/tedcaptionsdec.c b/libavformat/tedcaptionsdec.c index 6e87ef66e9..8bebaba5c0 100644 --- a/libavformat/tedcaptionsdec.c +++ b/libavformat/tedcaptionsdec.c @@ -302,7 +302,7 @@ static av_cold int tedcaptions_read_header(AVFormatContext *avf) st->internal->probe_packets = 0; st->start_time = 0; st->duration = last->pts + last->duration; - st->cur_dts = 0; + st->internal->cur_dts = 0; return 0; } diff --git a/libavformat/utils.c b/libavformat/utils.c index 13c0ade5ba..5582d108d0 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -842,12 +842,12 @@ FF_ENABLE_DEPRECATION_WARNINGS if (update_wrap_reference(s, st, pkt->stream_index, pkt) && st->internal->pts_wrap_behavior == AV_PTS_WRAP_SUB_OFFSET) { // correct first time stamps to negative values - if (!is_relative(st->first_dts)) - st->first_dts = wrap_timestamp(st, st->first_dts); + if (!is_relative(st->internal->first_dts)) + st->internal->first_dts = wrap_timestamp(st, st->internal->first_dts); if (!is_relative(st->start_time)) st->start_time = wrap_timestamp(st, st->start_time); - if (!is_relative(st->cur_dts)) - st->cur_dts = wrap_timestamp(st, st->cur_dts); + if (!is_relative(st->internal->cur_dts)) + st->internal->cur_dts = wrap_timestamp(st, st->internal->cur_dts); } pkt->dts = wrap_timestamp(st, pkt->dts); @@ -1071,17 +1071,17 @@ static void update_initial_timestamps(AVFormatContext *s, int stream_index, uint64_t shift; - if (st->first_dts != AV_NOPTS_VALUE || + if (st->internal->first_dts != AV_NOPTS_VALUE || dts == AV_NOPTS_VALUE || - st->cur_dts == AV_NOPTS_VALUE || - st->cur_dts < INT_MIN + RELATIVE_TS_BASE || - dts < INT_MIN + (st->cur_dts - RELATIVE_TS_BASE) || + st->internal->cur_dts == AV_NOPTS_VALUE || + st->internal->cur_dts < INT_MIN + RELATIVE_TS_BASE || + dts < INT_MIN + (st->internal->cur_dts - RELATIVE_TS_BASE) || is_relative(dts)) return; - st->first_dts = dts - (st->cur_dts - RELATIVE_TS_BASE); - st->cur_dts = dts; - shift = (uint64_t)st->first_dts - RELATIVE_TS_BASE; + st->internal->first_dts = dts - (st->internal->cur_dts - RELATIVE_TS_BASE); + st->internal->cur_dts = dts; + shift = (uint64_t)st->internal->first_dts - RELATIVE_TS_BASE; if (is_relative(pts)) pts += shift; @@ -1121,11 +1121,11 @@ static void update_initial_durations(AVFormatContext *s, AVStream *st, PacketList *pktl = s->internal->packet_buffer ? s->internal->packet_buffer : s->internal->parse_queue; int64_t cur_dts = RELATIVE_TS_BASE; - if (st->first_dts != AV_NOPTS_VALUE) { + if (st->internal->first_dts != AV_NOPTS_VALUE) { if (st->internal->update_initial_durations_done) return; st->internal->update_initial_durations_done = 1; - cur_dts = st->first_dts; + cur_dts = st->internal->first_dts; for (; pktl; pktl = get_next_pkt(s, st, pktl)) { if (pktl->pkt.stream_index == stream_index) { if (pktl->pkt.pts != pktl->pkt.dts || @@ -1135,18 +1135,18 @@ static void update_initial_durations(AVFormatContext *s, AVStream *st, cur_dts -= duration; } } - if (pktl && pktl->pkt.dts != st->first_dts) { + if (pktl && pktl->pkt.dts != st->internal->first_dts) { av_log(s, AV_LOG_DEBUG, "first_dts %s not matching first dts %s (pts %s, duration %"PRId64") in the queue\n", - av_ts2str(st->first_dts), av_ts2str(pktl->pkt.dts), av_ts2str(pktl->pkt.pts), pktl->pkt.duration); + av_ts2str(st->internal->first_dts), av_ts2str(pktl->pkt.dts), av_ts2str(pktl->pkt.pts), pktl->pkt.duration); return; } if (!pktl) { - av_log(s, AV_LOG_DEBUG, "first_dts %s but no packet with dts in the queue\n", av_ts2str(st->first_dts)); + av_log(s, AV_LOG_DEBUG, "first_dts %s but no packet with dts in the queue\n", av_ts2str(st->internal->first_dts)); return; } pktl = s->internal->packet_buffer ? s->internal->packet_buffer : s->internal->parse_queue; - st->first_dts = cur_dts; - } else if (st->cur_dts != RELATIVE_TS_BASE) + st->internal->first_dts = cur_dts; + } else if (st->internal->cur_dts != RELATIVE_TS_BASE) return; for (; pktl; pktl = get_next_pkt(s, st, pktl)) { @@ -1155,7 +1155,7 @@ static void update_initial_durations(AVFormatContext *s, AVStream *st, if ((pktl->pkt.pts == pktl->pkt.dts || pktl->pkt.pts == AV_NOPTS_VALUE) && (pktl->pkt.dts == AV_NOPTS_VALUE || - pktl->pkt.dts == st->first_dts || + pktl->pkt.dts == st->internal->first_dts || pktl->pkt.dts == RELATIVE_TS_BASE) && !pktl->pkt.duration) { pktl->pkt.dts = cur_dts; @@ -1167,7 +1167,7 @@ static void update_initial_durations(AVFormatContext *s, AVStream *st, cur_dts = pktl->pkt.dts + pktl->pkt.duration; } if (!pktl) - st->cur_dts = cur_dts; + st->internal->cur_dts = cur_dts; } static void compute_pkt_fields(AVFormatContext *s, AVStream *st, @@ -1226,7 +1226,7 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, if (pkt->pts != AV_NOPTS_VALUE && pkt->dts != AV_NOPTS_VALUE && st->pts_wrap_bits < 63 && pkt->dts > INT64_MIN + (1LL << st->pts_wrap_bits) && pkt->dts - (1LL << (st->pts_wrap_bits - 1)) > pkt->pts) { - if (is_relative(st->cur_dts) || pkt->dts - (1LL<<(st->pts_wrap_bits - 1)) > st->cur_dts) { + if (is_relative(st->internal->cur_dts) || pkt->dts - (1LL<<(st->pts_wrap_bits - 1)) > st->internal->cur_dts) { pkt->dts -= 1LL << st->pts_wrap_bits; } else pkt->pts += 1LL << st->pts_wrap_bits; @@ -1279,7 +1279,7 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, if (s->debug & FF_FDEBUG_TS) av_log(s, AV_LOG_DEBUG, "IN delayed:%d pts:%s, dts:%s cur_dts:%s st:%d pc:%p duration:%"PRId64" delay:%d onein_oneout:%d\n", - presentation_delayed, av_ts2str(pkt->pts), av_ts2str(pkt->dts), av_ts2str(st->cur_dts), + presentation_delayed, av_ts2str(pkt->pts), av_ts2str(pkt->dts), av_ts2str(st->internal->cur_dts), pkt->stream_index, pc, pkt->duration, delay, onein_oneout); /* Interpolate PTS and DTS if they are not present. We skip H264 @@ -1293,18 +1293,18 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, pkt->dts = st->internal->last_IP_pts; update_initial_timestamps(s, pkt->stream_index, pkt->dts, pkt->pts, pkt); if (pkt->dts == AV_NOPTS_VALUE) - pkt->dts = st->cur_dts; + pkt->dts = st->internal->cur_dts; /* This is tricky: the dts must be incremented by the duration * of the frame we are displaying, i.e. the last I- or P-frame. */ if (st->internal->last_IP_duration == 0 && (uint64_t)pkt->duration <= INT32_MAX) st->internal->last_IP_duration = pkt->duration; if (pkt->dts != AV_NOPTS_VALUE) - st->cur_dts = av_sat_add64(pkt->dts, st->internal->last_IP_duration); + st->internal->cur_dts = av_sat_add64(pkt->dts, st->internal->last_IP_duration); if (pkt->dts != AV_NOPTS_VALUE && pkt->pts == AV_NOPTS_VALUE && st->internal->last_IP_duration > 0 && - ((uint64_t)st->cur_dts - (uint64_t)next_dts + 1) <= 2 && + ((uint64_t)st->internal->cur_dts - (uint64_t)next_dts + 1) <= 2 && next_dts != next_pts && next_pts != AV_NOPTS_VALUE) pkt->pts = next_dts; @@ -1324,10 +1324,10 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, update_initial_timestamps(s, pkt->stream_index, pkt->pts, pkt->pts, pkt); if (pkt->pts == AV_NOPTS_VALUE) - pkt->pts = st->cur_dts; + pkt->pts = st->internal->cur_dts; pkt->dts = pkt->pts; if (pkt->pts != AV_NOPTS_VALUE && duration.num >= 0) - st->cur_dts = av_add_stable(st->time_base, pkt->pts, duration, 1); + st->internal->cur_dts = av_add_stable(st->time_base, pkt->pts, duration, 1); } } @@ -1343,12 +1343,12 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, if (!onein_oneout) // This should happen on the first packet update_initial_timestamps(s, pkt->stream_index, pkt->dts, pkt->pts, pkt); - if (pkt->dts > st->cur_dts) - st->cur_dts = pkt->dts; + if (pkt->dts > st->internal->cur_dts) + st->internal->cur_dts = pkt->dts; if (s->debug & FF_FDEBUG_TS) av_log(s, AV_LOG_DEBUG, "OUTdelayed:%d/%d pts:%s, dts:%s cur_dts:%s st:%d (%d)\n", - presentation_delayed, delay, av_ts2str(pkt->pts), av_ts2str(pkt->dts), av_ts2str(st->cur_dts), st->index, st->id); + presentation_delayed, delay, av_ts2str(pkt->pts), av_ts2str(pkt->dts), av_ts2str(st->internal->cur_dts), st->index, st->id); /* update flags */ if (st->codecpar->codec_type == AVMEDIA_TYPE_DATA || ff_is_intra_only(st->codecpar->codec_id)) @@ -1830,11 +1830,11 @@ void ff_read_frame_flush(AVFormatContext *s) } st->internal->last_IP_pts = AV_NOPTS_VALUE; st->internal->last_dts_for_order_check = AV_NOPTS_VALUE; - if (st->first_dts == AV_NOPTS_VALUE) - st->cur_dts = RELATIVE_TS_BASE; + if (st->internal->first_dts == AV_NOPTS_VALUE) + st->internal->cur_dts = RELATIVE_TS_BASE; else /* We set the current DTS to an unspecified origin. */ - st->cur_dts = AV_NOPTS_VALUE; + st->internal->cur_dts = AV_NOPTS_VALUE; st->internal->probe_packets = s->max_probe_packets; @@ -1855,7 +1855,7 @@ void avpriv_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timesta for (i = 0; i < s->nb_streams; i++) { AVStream *st = s->streams[i]; - st->cur_dts = + st->internal->cur_dts = av_rescale(timestamp, st->time_base.den * (int64_t) ref_st->time_base.num, st->time_base.num * (int64_t) ref_st->time_base.den); @@ -2736,7 +2736,7 @@ static void estimate_timings_from_pts(AVFormatContext *ic, int64_t old_offset) for (i = 0; i < ic->nb_streams; i++) { st = ic->streams[i]; if (st->start_time == AV_NOPTS_VALUE && - st->first_dts == AV_NOPTS_VALUE && + st->internal->first_dts == AV_NOPTS_VALUE && st->codecpar->codec_type != AVMEDIA_TYPE_UNKNOWN) av_log(ic, AV_LOG_WARNING, "start time for stream %d is not set in estimate_timings_from_pts\n", i); @@ -2777,7 +2777,7 @@ static void estimate_timings_from_pts(AVFormatContext *ic, int64_t old_offset) st = ic->streams[pkt->stream_index]; if (pkt->pts != AV_NOPTS_VALUE && (st->start_time != AV_NOPTS_VALUE || - st->first_dts != AV_NOPTS_VALUE)) { + st->internal->first_dts != AV_NOPTS_VALUE)) { if (pkt->duration == 0) { ff_compute_frame_duration(ic, &num, &den, st, st->internal->parser, pkt); if (den && num) { @@ -2792,7 +2792,7 @@ static void estimate_timings_from_pts(AVFormatContext *ic, int64_t old_offset) if (st->start_time != AV_NOPTS_VALUE) duration -= st->start_time; else - duration -= st->first_dts; + duration -= st->internal->first_dts; if (duration > 0) { if (st->duration == AV_NOPTS_VALUE || st->internal->info->last_duration<= 0 || (st->duration < duration && FFABS(duration - st->internal->info->last_duration) < 60LL*st->time_base.den / st->time_base.num)) @@ -2829,7 +2829,7 @@ static void estimate_timings_from_pts(AVFormatContext *ic, int64_t old_offset) switch (st->codecpar->codec_type) { case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_AUDIO: - if (st->start_time != AV_NOPTS_VALUE || st->first_dts != AV_NOPTS_VALUE) { + if (st->start_time != AV_NOPTS_VALUE || st->internal->first_dts != AV_NOPTS_VALUE) { av_log(ic, AV_LOG_WARNING, "stream %d : no PTS found at end of file, duration not set\n", i); } else av_log(ic, AV_LOG_WARNING, "stream %d : no TS found at start of file, duration not set\n", i); @@ -2844,7 +2844,7 @@ skip_duration_calc: int j; st = ic->streams[i]; - st->cur_dts = st->first_dts; + st->internal->cur_dts = st->internal->first_dts; st->internal->last_IP_pts = AV_NOPTS_VALUE; st->internal->last_dts_for_order_check = AV_NOPTS_VALUE; for (j = 0; j < MAX_REORDER_DELAY + 1; j++) @@ -3699,7 +3699,7 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) st->internal->extract_extradata.bsf) && extract_extradata_check(st)) break; - if (st->first_dts == AV_NOPTS_VALUE && + if (st->internal->first_dts == AV_NOPTS_VALUE && !(ic->iformat->flags & AVFMT_NOTIMESTAMPS) && st->internal->codec_info_nb_frames < ((st->disposition & AV_DISPOSITION_ATTACHED_PIC) ? 1 : ic->max_ts_probe) && (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO || @@ -4414,15 +4414,15 @@ AVStream *avformat_new_stream(AVFormatContext *s, const AVCodec *c) * but durations get some timestamps, formats with some unknown * timestamps have their first few packets buffered and the * timestamps corrected before they are returned to the user */ - st->cur_dts = RELATIVE_TS_BASE; + st->internal->cur_dts = RELATIVE_TS_BASE; } else { - st->cur_dts = AV_NOPTS_VALUE; + st->internal->cur_dts = AV_NOPTS_VALUE; } st->index = s->nb_streams; st->start_time = AV_NOPTS_VALUE; st->duration = AV_NOPTS_VALUE; - st->first_dts = AV_NOPTS_VALUE; + st->internal->first_dts = AV_NOPTS_VALUE; st->internal->probe_packets = s->max_probe_packets; st->internal->pts_wrap_reference = AV_NOPTS_VALUE; st->internal->pts_wrap_behavior = AV_PTS_WRAP_IGNORE; diff --git a/libavformat/vqf.c b/libavformat/vqf.c index 431ba1a0c9..08dba858b4 100644 --- a/libavformat/vqf.c +++ b/libavformat/vqf.c @@ -277,7 +277,7 @@ static int vqf_read_seek(AVFormatContext *s, AV_ROUND_DOWN : AV_ROUND_UP); pos *= c->frame_bit_len; - st->cur_dts = av_rescale(pos, st->time_base.den, + st->internal->cur_dts = av_rescale(pos, st->time_base.den, st->codecpar->bit_rate * (int64_t)st->time_base.num); if ((ret = avio_seek(s->pb, ((pos-7) >> 3) + s->internal->data_offset, SEEK_SET)) < 0) diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c index 6bce9ba688..d2fb81ca7f 100644 --- a/libavformat/wavdec.c +++ b/libavformat/wavdec.c @@ -702,8 +702,8 @@ static int wav_read_packet(AVFormatContext *s, AVPacket *pkt) int64_t audio_dts, video_dts; AVStream *vst = wav->vst; smv_retry: - audio_dts = (int32_t)st->cur_dts; - video_dts = (int32_t)vst->cur_dts; + audio_dts = (int32_t)st->internal->cur_dts; + video_dts = (int32_t)vst->internal->cur_dts; if (audio_dts != AV_NOPTS_VALUE && video_dts != AV_NOPTS_VALUE) { /*We always return a video frame first to get the pixel format first*/