From a0eff2446835a2a29d751a4810fe182c486a2eb6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 20 Feb 2018 23:34:59 +0000 Subject: Add a 2-frame `delay' on content arriving at the player to give subtitle content the chance to catch up. Fixes problems observed when overlaying a DCP subtitle onto an existing DCP and then seeking into the first subtitle. After the seek the decoder positions were: DCP: 0. subtitle: first subtitle time. This causes the DCP decoder to be pass()ed first and so the subtitle for the video frame has not arrived yet. I hope this does not cause unpredicted side effects... --- src/lib/delay.cc | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 src/lib/delay.cc (limited to 'src/lib/delay.cc') diff --git a/src/lib/delay.cc b/src/lib/delay.cc new file mode 100644 index 000000000..6f98b3ba0 --- /dev/null +++ b/src/lib/delay.cc @@ -0,0 +1,41 @@ +/* + Copyright (C) 2018 Carl Hetherington + + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + DCP-o-matic is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with DCP-o-matic. If not, see . + +*/ + +#include "delay.h" +#include "content_video.h" +#include "dcpomatic_assert.h" +#include +#include + +using std::make_pair; +using boost::weak_ptr; +using boost::shared_ptr; +using boost::optional; + +void +Delay::video (weak_ptr weak_piece, ContentVideo video) +{ + _store.push_back (make_pair (weak_piece, video)); + /* Delay by 2 frames */ + while (_store.size() > 2) { + Video (_store.front().first, _store.front().second); + _store.pop_front (); + } +} -- cgit v1.2.3