MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2025-04-30 23:21:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

improve build_index performance by 5-10%

Browse Source 
I just switched a couple inner loop ?s back to try!(...) to work around
https://github.com/rust-lang/rust/issues/37939
This commit is contained in:
Scott Lamb 2017-02-26 20:21:46 -08:00
parent acb6f8d809
commit 15609ddb8e
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/recording.rs
View File

@ -442,8 +442,7 @@ impl Segment {
/// Iterates through each frame in the segment. /// Iterates through each frame in the segment.
/// Must be called without the database lock held; retrieves video index from the cache. /// Must be called without the database lock held; retrieves video index from the cache.
pub fn foreach<F>(&self, db: &db::Database, mut f: F) -> Result<(), Error> pub fn foreach<F>(&self, db: &db::Database, mut f: F) -> Result<(), Error>
where F: FnMut(&SampleIndexIterator) -> Result<(), Error> where F: FnMut(&SampleIndexIterator) -> Result<(), Error> {
{
trace!("foreach on recording {}/{}: {} frames, actual_time_90k: {:?}", trace!("foreach on recording {}/{}: {} frames, actual_time_90k: {:?}",
self.camera_id, self.recording_id, self.frames, self.actual_time_90k()); self.camera_id, self.recording_id, self.frames, self.actual_time_90k());
let playback = db.lock().get_recording_playback(self.camera_id, self.recording_id)?; let playback = db.lock().get_recording_playback(self.camera_id, self.recording_id)?;
@ -475,8 +474,12 @@ impl Segment {
self.camera_id, self.recording_id, self.key_frames))); self.camera_id, self.recording_id, self.key_frames)));
} }
} }
f(&it)?;
have_frame = it.next(data)?; // Note: this inner loop uses try! rather than ? for performance. Don't change these
// lines without reading https://github.com/rust-lang/rust/issues/37939 and running
// mp4::bench::build_index.
try!(f(&it));
have_frame = try!(it.next(data));
} }
if key_frame < self.key_frames { if key_frame < self.key_frames {
return Err(Error::new(format!("recording {}/{}: expected {} key frames, found only {}", return Err(Error::new(format!("recording {}/{}: expected {} key frames, found only {}",