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

Fix bulid without liveMedia

This commit is contained in:
Isaac Connor 2021-01-26 18:29:02 -05:00
parent 42abe5c917
commit 27011ab49b
6 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/zm_rtsp_server_adts_source.cpp
View File

@ -1,3 +1,4 @@
#if HAVE_RTSP_SERVER
/* --------------------------------------------------------------------------- /* ---------------------------------------------------------------------------
** **
** ADTS_DeviceSource.cpp ** ADTS_DeviceSource.cpp
@ -44,3 +45,4 @@ ADTS_ZoneMinderDeviceSource::ADTS_ZoneMinderDeviceSource(
<< "\r\n"; << "\r\n";
m_auxLine.assign(os.str()); m_auxLine.assign(os.str());
} }
#endif

4
src/zm_rtsp_server_device_source.cpp
View File

@ -8,6 +8,7 @@
** **
** -------------------------------------------------------------------------*/ ** -------------------------------------------------------------------------*/
#if HAVE_RTSP_SERVER
#include <utility> #include <utility>
#include "zm_rtsp_server_device_source.h" #include "zm_rtsp_server_device_source.h"
@ -167,7 +168,7 @@ int ZoneMinderDeviceSource::getNextFrame() {
pthread_mutex_lock(&m_mutex); pthread_mutex_lock(&m_mutex);
if ( m_captureQueue.size() ) { if ( m_captureQueue.size() ) {
NAL_Frame * f = m_captureQueue.front(); NAL_Frame * f = m_captureQueue.front();
while ( (f->m_timestamp.tv_sec - tv.tv_sec) > 10 ) { while ( m_captureQueue.size() and ((f->m_timestamp.tv_sec - tv.tv_sec) > 10) ) {
m_captureQueue.pop_front(); m_captureQueue.pop_front();
delete f; delete f;
f = m_captureQueue.front(); f = m_captureQueue.front();
@ -205,3 +206,4 @@ unsigned char* ZoneMinderDeviceSource::extractFrame(unsigned char* frame, size_
size = 0; size = 0;
return frame; return frame;
} }
#endif

2
src/zm_rtsp_server_h264_device_source.cpp
View File

@ -1,3 +1,4 @@
#if HAVE_RTSP_SERVER
/* --------------------------------------------------------------------------- /* ---------------------------------------------------------------------------
** **
** H264_DeviceSource.cpp ** H264_DeviceSource.cpp
@ -222,3 +223,4 @@ unsigned char* H26X_ZoneMinderDeviceSource::extractFrame(unsigned char* frame,
return outFrame; return outFrame;
} }
#endif

2
src/zm_rtsp_server_server_media_subsession.cpp
View File

@ -1,3 +1,4 @@
#if HAVE_RTSP_SERVER
/* --------------------------------------------------------------------------- /* ---------------------------------------------------------------------------
** **
** ServerMediaSubsession.cpp ** ServerMediaSubsession.cpp
@ -104,3 +105,4 @@ char const* BaseServerMediaSubsession::getAuxLine(
} }
return auxLine; return auxLine;
} }
#endif

2
src/zm_rtsp_server_thread.cpp
View File

@ -1,3 +1,4 @@
#if HAVE_RTSP_SERVER
#include "zm_rtsp_server_thread.h" #include "zm_rtsp_server_thread.h"
#include "zm_rtsp_server_device_source.h" #include "zm_rtsp_server_device_source.h"
#include "zm_rtsp_server_h264_device_source.h" #include "zm_rtsp_server_h264_device_source.h"
@ -6,7 +7,6 @@
#include <StreamReplicator.hh> #include <StreamReplicator.hh>
#include "zm.h" #include "zm.h"
#if HAVE_RTSP_SERVER
RTSPServerThread::RTSPServerThread(Monitor *p_monitor) : RTSPServerThread::RTSPServerThread(Monitor *p_monitor) :
monitor(p_monitor), monitor(p_monitor),

2
src/zm_rtsp_server_unicast_server_media_subsession.cpp
View File

@ -1,3 +1,4 @@
#if HAVE_RTSP_SERVER
/* --------------------------------------------------------------------------- /* ---------------------------------------------------------------------------
** This software is in the public domain, furnished "as is", without technical ** This software is in the public domain, furnished "as is", without technical
** support, and with no warranty, express or implied, as to its usefulness for ** support, and with no warranty, express or implied, as to its usefulness for
@ -45,3 +46,4 @@ char const* UnicastServerMediaSubsession::getAuxSDPLine(
) { ) {
return this->getAuxLine(dynamic_cast<ZoneMinderDeviceSource*>(m_replicator->inputSource()), rtpSink->rtpPayloadType()); return this->getAuxLine(dynamic_cast<ZoneMinderDeviceSource*>(m_replicator->inputSource()), rtpSink->rtpPayloadType());
} }
#endif