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.h | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 src/lib/delay.h (limited to 'src/lib/delay.h') diff --git a/src/lib/delay.h b/src/lib/delay.h new file mode 100644 index 000000000..fa08b0558 --- /dev/null +++ b/src/lib/delay.h @@ -0,0 +1,43 @@ +/* + 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 . + +*/ + +#ifndef DCPOMATIC_DELAY_H +#define DCPOMATIC_DELAY_H + +#include "types.h" +#include "video_adjuster.h" +#include "content_video.h" +#include + +class Piece; + +/** A class which `delays' received video by 2 frames; i.e. when it receives + * a video frame it emits the last-but-one it received. + */ +class Delay : public VideoAdjuster +{ +public: + void video (boost::weak_ptr, ContentVideo video); + +private: + boost::optional _last; +}; + +#endif -- cgit v1.2.3