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

Keep track of stream last_pts. So we can at least try to sync streams

pull/3187/head
Isaac Connor 2021-03-03 12:45:05 -05:00
parent 3149ba276f
commit eaaf04420a
3 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/zm_camera.cpp
View File

@ -55,6 +55,8 @@ Camera::Camera(
mAudioStream(nullptr), mAudioStream(nullptr),
mFormatContext(nullptr), mFormatContext(nullptr),
mSecondFormatContext(nullptr), mSecondFormatContext(nullptr),
mLastVideoPTS(0),
mLastAudioPTS(0),
bytes(0) bytes(0)
{ {
linesize = width * colours; linesize = width * colours;

2
src/zm_camera.h
View File

@ -58,6 +58,8 @@ protected:
AVStream *mAudioStream; AVStream *mAudioStream;
AVFormatContext *mFormatContext; // One for video, one for audio AVFormatContext *mFormatContext; // One for video, one for audio
AVFormatContext *mSecondFormatContext; // One for video, one for audio AVFormatContext *mSecondFormatContext; // One for video, one for audio
int64_t mLastVideoPTS;
int64_t mLastAudioPTS;
unsigned int bytes; unsigned int bytes;
public: public:

28
src/zm_ffmpeg_camera.cpp
View File

@ -193,14 +193,24 @@ int FfmpegCamera::Capture(ZMPacket &zm_packet) {
int ret; int ret;
AVStream *stream; AVStream *stream;
if ((mFormatContextPtr != mFormatContext) or !mSecondFormatContext) { if ( mSecondFormatContext and
mFormatContextPtr = mFormatContext; (
stream = mVideoStream; av_rescale_q(mLastAudioPTS, mAudioStream->time_base, AV_TIME_BASE_Q)
Debug(1, "Using video input"); <
} else { av_rescale_q(mLastVideoPTS, mVideoStream->time_base, AV_TIME_BASE_Q)
) ) {
// if audio stream is behind video stream, then read from audio, otherwise video
mFormatContextPtr = mSecondFormatContext; mFormatContextPtr = mSecondFormatContext;
stream = mAudioStream; stream = mAudioStream;
Debug(1, "Using audio input"); Debug(1, "Using audio input");
} else {
mFormatContextPtr = mFormatContext;
stream = mVideoStream;
Debug(1, "Using video input beacuse %" PRId64 " >= %" PRId64,
av_rescale_q(mLastAudioPTS, mAudioStream->time_base, AV_TIME_BASE_Q),
av_rescale_q(mLastVideoPTS, mVideoStream->time_base, AV_TIME_BASE_Q)
);
} }
if ( (ret = av_read_frame(mFormatContextPtr, &packet)) < 0 ) { if ( (ret = av_read_frame(mFormatContextPtr, &packet)) < 0 ) {
@ -229,7 +239,15 @@ int FfmpegCamera::Capture(ZMPacket &zm_packet) {
zm_packet.set_packet(&packet); zm_packet.set_packet(&packet);
zm_packet.stream = stream; zm_packet.stream = stream;
zm_packet.pts = av_rescale_q(packet.pts, stream->time_base, AV_TIME_BASE_Q); zm_packet.pts = av_rescale_q(packet.pts, stream->time_base, AV_TIME_BASE_Q);
if ( packet.pts != AV_NOPTS_VALUE ) {
if ( stream == mVideoStream ) {
mLastVideoPTS = packet.pts;
} else {
mLastAudioPTS = packet.pts;
}
}
zm_av_packet_unref(&packet); zm_av_packet_unref(&packet);
return 1; return 1;
} // FfmpegCamera::Capture } // FfmpegCamera::Capture