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

Added detection for thread death. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2907 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2009-06-03 08:10:28 +00:00
parent c95ff6b6ba
commit 5842ec5bfc
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/zm_remote_camera_rtsp.cpp
View File

@ -110,7 +110,7 @@ int RemoteCameraRtsp::Disconnect()
int RemoteCameraRtsp::PrimeCapture()
{
Debug( 2, "Waiting for sources" );
for ( int i = 0; i < 50 && !rtspThread->hasSources(); i++ )
for ( int i = 0; i < 100 && !rtspThread->hasSources(); i++ )
{
usleep( 100000 );
}
@ -151,6 +151,8 @@ int RemoteCameraRtsp::PrimeCapture()
int RemoteCameraRtsp::PreCapture()
{
if ( !rtspThread->isRunning() )
return( -1 );
if ( !rtspThread->hasSources() )
{
Error( "Cannot precapture, no RTP sources" );
@ -164,8 +166,10 @@ int RemoteCameraRtsp::Capture( Image &image )
while ( true )
{
buffer.clear();
if ( rtspThread->stopped() )
if ( !rtspThread->isRunning() )
break;
//if ( rtspThread->stopped() )
//break;
if ( rtspThread->getFrame( buffer ) )
{
Debug( 3, "Read frame %d bytes", buffer.size() );