ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Attempt to better handle 32bit wrap around in the pts in the input stream.

pull/3651/head
Isaac Connor 2022-12-23 09:02:41 -05:00
parent 8ded9fc83a
commit 48c18ca4ed
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/zm_ffmpeg_camera.cpp
View File

@ -188,6 +188,7 @@ int FfmpegCamera::Capture(std::shared_ptr<ZMPacket> &zm_packet) {
start_read_time = std::chrono::steady_clock::now();
int ret;
AVFormatContext *formatContextPtr;
int64_t lastPTS;
if ( mSecondFormatContext and
(
@ -197,12 +198,14 @@ int FfmpegCamera::Capture(std::shared_ptr<ZMPacket> &zm_packet) {
) ) {
// if audio stream is behind video stream, then read from audio, otherwise video
formatContextPtr = mSecondFormatContext;
lastPTS = mLastAudioPTS;
Debug(4, "Using audio input because audio PTS %" PRId64 " < video PTS %" PRId64,
av_rescale_q(mLastAudioPTS, mAudioStream->time_base, AV_TIME_BASE_Q),
av_rescale_q(mLastVideoPTS, mVideoStream->time_base, AV_TIME_BASE_Q)
);
} else {
formatContextPtr = mFormatContext;
lastPTS = mLastVideoPTS;
Debug(4, "Using video input because %" PRId64 " >= %" PRId64,
(mAudioStream?av_rescale_q(mLastAudioPTS, mAudioStream->time_base, AV_TIME_BASE_Q):0),
av_rescale_q(mLastVideoPTS, mVideoStream->time_base, AV_TIME_BASE_Q)
@ -224,6 +227,11 @@ int FfmpegCamera::Capture(std::shared_ptr<ZMPacket> &zm_packet) {
}
return -1;
}
if ((packet->pts < 0) and (lastPTS >=0)) {
// 32-bit wrap around?
Info("Suspected 32bit wraparound in input pts. %"PRId64, packet->pts);
return -1;
}
av_packet_guard pkt_guard{packet};