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

add some comments

This commit is contained in:
Isaac Connor 2016-04-04 21:58:16 -04:00
parent a60a0959fc
commit be13e56c3c
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/zm_remote_camera_rtsp.cpp
View File

@ -486,6 +486,7 @@ int RemoteCameraRtsp::CaptureAndRecord( Image &image, bool recording, char* even
} }
#if HAVE_LIBSWSCALE #if HAVE_LIBSWSCALE
// Why are we re-scaling after writing out the packet?
if(mConvertContext == NULL) { if(mConvertContext == NULL) {
mConvertContext = sws_getContext( mCodecContext->width, mCodecContext->height, mCodecContext->pix_fmt, width, height, imagePixFormat, SWS_BICUBIC, NULL, NULL, NULL ); mConvertContext = sws_getContext( mCodecContext->width, mCodecContext->height, mCodecContext->pix_fmt, width, height, imagePixFormat, SWS_BICUBIC, NULL, NULL, NULL );

3
src/zm_rtp_source.cpp
View File

@ -325,6 +325,9 @@ bool RtpSource::handlePacket( const unsigned char *packet, size_t packetLen )
mFrameReady.updateValueSignal( true ); mFrameReady.updateValueSignal( true );
if ( !mFrameProcessed.getValueImmediate() ) if ( !mFrameProcessed.getValueImmediate() )
{ {
// What is the point of this for loop? Is it just me, or will it call getUpdatedValue once or twice? Could it not be better written as
// if ( ! mFrameProcessed.getUpdatedValue( 1 ) && mFrameProcessed.getUpdatedValue( 1 ) ) return false;
for ( int count = 0; !mFrameProcessed.getUpdatedValue( 1 ); count++ ) for ( int count = 0; !mFrameProcessed.getUpdatedValue( 1 ); count++ )
if( count > 1 ) if( count > 1 )
return( false ); return( false );