[FFmpeg-cvslog] fftools/ffmpeg_demux: move InputStream.wrap_correction_done to private data
Anton Khirnov
git at videolan.org
Mon May 15 15:16:31 EEST 2023
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sun May 7 16:19:38 2023 +0200| [7df3253c5a769239de16a878828ba94b15a15f8b] | committer: Anton Khirnov
fftools/ffmpeg_demux: move InputStream.wrap_correction_done to private data
It is no longer used outside of ffmpeg_demux.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7df3253c5a769239de16a878828ba94b15a15f8b
---
fftools/ffmpeg.h | 2 --
fftools/ffmpeg_demux.c | 9 +++++----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h
index b8c0e7db84..559381531e 100644
--- a/fftools/ffmpeg.h
+++ b/fftools/ffmpeg.h
@@ -373,8 +373,6 @@ typedef struct InputStream {
AVRational last_frame_tb;
int last_frame_sample_rate;
- int wrap_correction_done;
-
int64_t filter_in_rescale_delta_last;
// when forcing constant input framerate through -r,
diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c
index 7cf32242d9..4a04b3e574 100644
--- a/fftools/ffmpeg_demux.c
+++ b/fftools/ffmpeg_demux.c
@@ -60,6 +60,7 @@ typedef struct DemuxStream {
double ts_scale;
+ int wrap_correction_done;
int saw_first_ts;
///< dts of the first packet read for this stream (in AV_TIME_BASE units)
int64_t first_dts;
@@ -383,21 +384,21 @@ static int ts_fixup(Demuxer *d, AVPacket *pkt)
SHOW_TS_DEBUG("demuxer");
- if (!ist->wrap_correction_done && start_time != AV_NOPTS_VALUE &&
+ if (!ds->wrap_correction_done && start_time != AV_NOPTS_VALUE &&
ist->st->pts_wrap_bits < 64) {
int64_t stime, stime2;
stime = av_rescale_q(start_time, AV_TIME_BASE_Q, pkt->time_base);
stime2= stime + (1ULL<<ist->st->pts_wrap_bits);
- ist->wrap_correction_done = 1;
+ ds->wrap_correction_done = 1;
if(stime2 > stime && pkt->dts != AV_NOPTS_VALUE && pkt->dts > stime + (1LL<<(ist->st->pts_wrap_bits-1))) {
pkt->dts -= 1ULL<<ist->st->pts_wrap_bits;
- ist->wrap_correction_done = 0;
+ ds->wrap_correction_done = 0;
}
if(stime2 > stime && pkt->pts != AV_NOPTS_VALUE && pkt->pts > stime + (1LL<<(ist->st->pts_wrap_bits-1))) {
pkt->pts -= 1ULL<<ist->st->pts_wrap_bits;
- ist->wrap_correction_done = 0;
+ ds->wrap_correction_done = 0;
}
}
More information about the ffmpeg-cvslog
mailing list