ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use 10 seconds of queue instead of a fixed packet count. Audio generates more frames than video so they get way out of sync.

This commit is contained in:
Isaac Connor 2021-01-26 14:14:05 -05:00
parent 671d58f0d0
commit 4159baac06
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/zm_rtsp_server_device_source.cpp
View File

@ -99,7 +99,7 @@ void ZoneMinderDeviceSource::deliverFrame() {
} else { } else {
fFrameSize = nal_size; fFrameSize = nal_size;
} }
Debug(2, "deliverFrame stream: %d timestamp: %d.%d size: %d queuesize: %d", Debug(2, "deliverFrame stream: %d timestamp: %ld.%06ld size: %d queuesize: %d",
m_stream->index, m_stream->index,
frame->m_timestamp.tv_sec, frame->m_timestamp.tv_usec, frame->m_timestamp.tv_sec, frame->m_timestamp.tv_usec,
fFrameSize, fFrameSize,
@ -149,7 +149,7 @@ int ZoneMinderDeviceSource::getNextFrame() {
m_packetqueue->increment_it(m_packetqueue_it, m_stream->index); m_packetqueue->increment_it(m_packetqueue_it, m_stream->index);
// Convert pts to timeval // Convert pts to timeval
int64_t pts = av_rescale_q(pkt->pts, m_stream->time_base, AV_TIME_BASE_Q); int64_t pts = av_rescale_q(pkt->dts, m_stream->time_base, AV_TIME_BASE_Q);
timeval tv = { pts/1000000, pts%1000000 }; timeval tv = { pts/1000000, pts%1000000 };
dumpPacket(m_stream, pkt, "rtspServer"); dumpPacket(m_stream, pkt, "rtspServer");
Debug(2, "pts %" PRId64 " pkt.pts %" PRId64 " tv %d.%d", pts, pkt->pts, tv.tv_sec, tv.tv_usec); Debug(2, "pts %" PRId64 " pkt.pts %" PRId64 " tv %d.%d", pts, pkt->pts, tv.tv_sec, tv.tv_usec);
@ -165,12 +165,22 @@ int ZoneMinderDeviceSource::getNextFrame() {
NAL_Frame *frame = new NAL_Frame(nal.first, nal.second, tv); NAL_Frame *frame = new NAL_Frame(nal.first, nal.second, tv);
pthread_mutex_lock(&m_mutex); pthread_mutex_lock(&m_mutex);
if ( m_captureQueue.size() ) {
NAL_Frame * f = m_captureQueue.front();
while ( (f->m_timestamp.tv_sec - tv.tv_sec) > 10 ) {
m_captureQueue.pop_front();
delete f;
f = m_captureQueue.front();
}
}
#if 0
while ( m_captureQueue.size() >= m_queueSize ) { while ( m_captureQueue.size() >= m_queueSize ) {
Debug(2, "Queue full dropping frame %d", m_captureQueue.size()); Debug(2, "Queue full dropping frame %d", m_captureQueue.size());
NAL_Frame * f = m_captureQueue.front(); NAL_Frame * f = m_captureQueue.front();
m_captureQueue.pop_front(); m_captureQueue.pop_front();
delete f; delete f;
} }
#endif
m_captureQueue.push_back(frame); m_captureQueue.push_back(frame);
pthread_mutex_unlock(&m_mutex); pthread_mutex_unlock(&m_mutex);