Moved timestamp encoding to before JPEGising
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@861 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
parent
233de2fd6b
commit
2452b48239
|
@ -1066,12 +1066,12 @@ void Monitor::StreamImages( unsigned long idle, unsigned long refresh, time_t tt
|
|||
|
||||
if ( scale == 1 )
|
||||
{
|
||||
snap_image->EncodeJpeg( img_buffer, &img_buffer_size );
|
||||
|
||||
if ( !timestamp_on_capture )
|
||||
{
|
||||
TimestampImage( snap_image, snap->timestamp->tv_sec );
|
||||
}
|
||||
|
||||
snap_image->EncodeJpeg( img_buffer, &img_buffer_size );
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -1079,12 +1079,12 @@ void Monitor::StreamImages( unsigned long idle, unsigned long refresh, time_t tt
|
|||
|
||||
scaled_image.Scale( scale );
|
||||
|
||||
scaled_image.EncodeJpeg( img_buffer, &img_buffer_size );
|
||||
|
||||
if ( !timestamp_on_capture )
|
||||
{
|
||||
TimestampImage( &scaled_image, snap->timestamp->tv_sec );
|
||||
}
|
||||
|
||||
scaled_image.EncodeJpeg( img_buffer, &img_buffer_size );
|
||||
}
|
||||
|
||||
fprintf( fd, "Content-type: image/jpg\n\n" );
|
||||
|
|
Loading…
Reference in New Issue