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

Bug 250 - Fixed negative timeouts becoming very long timeouts. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1792 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2006-01-12 17:07:26 +00:00
parent 7bf25c99c3
commit b70c064bf9
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/zm_event.cpp
View File

@ -471,7 +471,11 @@ void Event::StreamEvent( int event_id, int frame_id, int scale, int rate, int ma
if ( (frame_mod == 1) || (((id-1)%frame_mod) == 0) ) if ( (frame_mod == 1) || (((id-1)%frame_mod) == 0) )
{ {
double this_delta = last_db_delta+(((id-last_db_id)*(db_delta-last_db_delta))/(db_id-last_db_id)); double this_delta = last_db_delta+(((id-last_db_id)*(db_delta-last_db_delta))/(db_id-last_db_id));
delta_us = (unsigned int)((this_delta-last_delta) * 1000000); if (this_delta > last_delta)
delta_us = (unsigned int)((this_delta-last_delta) * 1000000);
else
delta_us = 0;
if ( rate != ZM_RATE_SCALE ) if ( rate != ZM_RATE_SCALE )
delta_us = (delta_us*ZM_RATE_SCALE)/rate; delta_us = (delta_us*ZM_RATE_SCALE)/rate;
Debug( 2, ( "I:%d, DI:%d, LDBI:%d, DD:%lf, LD:%lf, LDBD:%lf, TD:%lf, DU:%d", id, db_id, last_db_id, db_delta, last_delta, last_db_delta, this_delta, delta_us )); Debug( 2, ( "I:%d, DI:%d, LDBI:%d, DD:%lf, LD:%lf, LDBD:%lf, TD:%lf, DU:%d", id, db_id, last_db_id, db_delta, last_delta, last_db_delta, this_delta, delta_us ));