From 8024181e550bbec29a07565576bb5418165d7500 Mon Sep 17 00:00:00 2001 From: Erik Zandvliet Date: Mon, 22 Jun 2015 14:56:29 +0200 Subject: [PATCH 1/2] Made metadatapages larger --- src/input/input_buffer.cpp | 2 +- src/io.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/input/input_buffer.cpp b/src/input/input_buffer.cpp index 3582c369..d6d568ae 100644 --- a/src/input/input_buffer.cpp +++ b/src/input/input_buffer.cpp @@ -74,7 +74,7 @@ namespace Mist { if (!metaPages.count(0) || !metaPages[0].mapped) { char pageName[NAME_BUFFER_SIZE]; snprintf(pageName, NAME_BUFFER_SIZE, SHM_STREAM_INDEX, streamName.c_str()); - metaPages[0].init(pageName, 8 * 1024 * 1024, true); + metaPages[0].init(pageName, DEFAULT_META_PAGE_SIZE, true); metaPages[0].master = false; } myMeta.writeTo(metaPages[0].mapped); diff --git a/src/io.cpp b/src/io.cpp index 15720db3..76ffb12e 100644 --- a/src/io.cpp +++ b/src/io.cpp @@ -10,7 +10,7 @@ namespace Mist { //Open the page for the metadata char pageName[NAME_BUFFER_SIZE]; snprintf(pageName, NAME_BUFFER_SIZE, SHM_STREAM_INDEX, streamName.c_str()); - metaPages[0].init(pageName, 8 * 1024 * 1024, true); + metaPages[0].init(pageName, DEFAULT_META_PAGE_SIZE, true); //Make sure we don't delete it on accident metaPages[0].master = false; From 1b724afc83a5fbf8e0629f09c20ae85c69ed209c Mon Sep 17 00:00:00 2001 From: Erik Zandvliet Date: Tue, 23 Jun 2015 11:12:42 +0200 Subject: [PATCH 2/2] Small fix in playback speed, when resuming playback --- src/output/output.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/output/output.cpp b/src/output/output.cpp index 4ab5dd35..8debe196 100644 --- a/src/output/output.cpp +++ b/src/output/output.cpp @@ -560,8 +560,8 @@ namespace Mist { } nxt.offset += thisPacket.getDataLen(); if (realTime){ - while (nxt.time > (Util::getMS() - firstTime + maxSkipAhead)*1000/realTime) { - Util::sleep(nxt.time - (Util::getMS() - firstTime + minSkipAhead)*1000/realTime); + while (nxt.time > (((Util::getMS() - firstTime)*1000)+maxSkipAhead)/realTime) { + Util::sleep(nxt.time - (((Util::getMS() - firstTime)*1000)+minSkipAhead)/realTime); } } if (curPage[nxt.tid]){