summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-07-12 23:21:25 +0100
committerCarl Hetherington <cth@carlh.net>2017-07-12 23:21:25 +0100
commit99cebd529d5126fc5dfb7e8ff4b5050a8e18a6f3 (patch)
treefc725f4bb346831f095728113eeba5d96ff5e3dc /src/lib
parent71ab83292da50b080befd98b01804a120b94f65e (diff)
Don't emit black to fill up to a frame that we're not going to emit.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/player.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 3ed0e4f45..5e888f110 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -620,6 +620,14 @@ Player::video (weak_ptr<Piece> wp, ContentVideo video)
DCPTime const time = content_video_to_dcp (piece, video.frame);
DCPTimePeriod const period (time, time + one_video_frame());
+ /* Discard if it's outside the content's period or if it's before the last accurate seek */
+ if (
+ time < piece->content->position() ||
+ time >= piece->content->end() ||
+ (_last_video_time && time < *_last_video_time)) {
+ return;
+ }
+
/* Fill gaps that we discover now that we have some video which needs to be emitted */
if (_last_video_time) {
@@ -635,14 +643,6 @@ Player::video (weak_ptr<Piece> wp, ContentVideo video)
}
}
- /* Discard if it's outside the content's period or if it's before the last accurate seek */
- if (
- time < piece->content->position() ||
- time >= piece->content->end() ||
- (_last_video_time && time < *_last_video_time)) {
- return;
- }
-
_last_video[wp].reset (
new PlayerVideo (
video.image,