MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2024-12-26 23:25:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: only double length of first recording

Browse Source
This commit is contained in:
Scott Lamb 2016-12-30 06:39:09 -08:00
parent bca92fbf8d
commit 14461fcad9
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/streamer.rs
View File

@ -147,14 +147,15 @@ impl<'a, C, S> Streamer<'a, C, S> where C: 'a + Clocks, S: 'a + stream::Stream {
let mut s = match state { let mut s = match state {
Some(s) => s, Some(s) => s,
None => { None => {
// Set rotate time to not the next rotate offset, but the one after.
// The first recording interval is longer than usual rather than shorter
// than usual so that there's plenty of frame times to use when calculating the
// start time.
let sec = frame_realtime.sec; let sec = frame_realtime.sec;
let r = sec - (sec % self.rotate_interval_sec) + self.rotate_offset_sec; let r = sec - (sec % self.rotate_interval_sec) + self.rotate_offset_sec;
let r = r + if r <= sec { 2*self.rotate_interval_sec } let r = r + if r <= sec { self.rotate_interval_sec } else { 0 };
else { self.rotate_interval_sec };
// On the first recording, set rotate time to not the next rotate offset, but
// the one after, so that it's longer than usual rather than shorter than
// usual. This ensures there's plenty of frame times to use when calculating
// the start time.
let r = r + if prev.is_none() { self.rotate_interval_sec } else { 0 };
let w = self.dir.create_writer(&self.syncer_channel, prev, self.camera_id, let w = self.dir.create_writer(&self.syncer_channel, prev, self.camera_id,
video_sample_entry_id)?; video_sample_entry_id)?;