From 7db445d114a77aa588b342c6ab4ff6b2d39619a9 Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Wed, 4 Dec 2019 09:31:03 +0200
Subject: [PATCH] Small comment
---
applications/merger/src/main.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/applications/merger/src/main.cpp b/applications/merger/src/main.cpp
index e0abb65ef..06d73202f 100644
--- a/applications/merger/src/main.cpp
+++ b/applications/merger/src/main.cpp
@@ -69,6 +69,10 @@ int main(int argc, char **argv) {
for (size_t j=1; j<rs.size(); ++j) {
ftl::codecs::Reader *r = rs[j];
+
+ // FIXME: Need to truncate other stream if the following returns
+ // no frames, meaning the timeshift causes this stream to run out
+ // before the main stream.
rs[j]->read(spkt.timestamp+timeoff, [&out,&idmap,&lastid,j,r,stream_mask2,timeoff](const ftl::codecs::StreamPacket &spkt, const ftl::codecs::Packet &pkt) {
if (((0x1 << spkt.streamID) & stream_mask2) == 0) return;
if (int(spkt.channel) < 32 && spkt.timestamp < r->getStartTime()+timeoff) return;
--
GitLab