MyFavMirrors
/
moonfire-nvr
mirror of https://github.com/scottlamb/moonfire-nvr.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix recording display splitting. 

I didn't properly update the new duration calculation when switching from
ascending to descending order.

Also, on the Pi, 1-hour recordings are noticeably faster to load.
This commit is contained in:
Scott Lamb 2016-01-24 20:19:45 -08:00
parent 699ffe7777
commit 77f3a57416
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/web.cc
View File

@ -138,7 +138,7 @@ void WebInterface::HandleCameraDetail(evhttp_request *req, void *arg) {
// aggregated .mp4 files of up to kForceSplitDuration90k each, provided // aggregated .mp4 files of up to kForceSplitDuration90k each, provided
// there is no gap or change in video parameters between recordings. // there is no gap or change in video parameters between recordings.
static const int64_t kForceSplitDuration90k = static const int64_t kForceSplitDuration90k =
4 * 60 * 60 * kTimeUnitsPerSecond; 60 * 60 * kTimeUnitsPerSecond;
ListCameraRecordingsRow aggregated; ListCameraRecordingsRow aggregated;
auto maybe_finish_html_row = [&]() { auto maybe_finish_html_row = [&]() {
if (aggregated.start_time_90k == -1) { if (aggregated.start_time_90k == -1) {
@ -165,7 +165,7 @@ void WebInterface::HandleCameraDetail(evhttp_request *req, void *arg) {
.c_str()); .c_str());
}; };
auto handle_sql_row = [&](const ListCameraRecordingsRow &row) { auto handle_sql_row = [&](const ListCameraRecordingsRow &row) {
auto new_duration_90k = row.end_time_90k - aggregated.start_time_90k; auto new_duration_90k = aggregated.end_time_90k - row.start_time_90k;
if (row.video_sample_entry_sha1 == aggregated.video_sample_entry_sha1 && if (row.video_sample_entry_sha1 == aggregated.video_sample_entry_sha1 &&
row.end_time_90k == aggregated.start_time_90k && row.end_time_90k == aggregated.start_time_90k &&
new_duration_90k < kForceSplitDuration90k) { new_duration_90k < kForceSplitDuration90k) {