From 1bb4bd728a445de0728c897211bf079c714d4f41 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 15 Jul 2013 16:36:49 +0100 Subject: [PATCH] Add some player tests. Fix seek with content at non-DCP frame rate. A few other small fixes. --- src/lib/player.cc | 24 +++++++-- src/lib/player.h | 5 ++ src/lib/playlist.cc | 40 ++++++++------ src/lib/playlist.h | 1 + test/play_test.cc | 123 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 174 insertions(+), 19 deletions(-) create mode 100644 test/play_test.cc diff --git a/src/lib/player.cc b/src/lib/player.cc index c8c206424..6ee8c5029 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -138,7 +138,7 @@ Player::pass () continue; } - if (dynamic_pointer_cast ((*i)->decoder)) { + if (_video && dynamic_pointer_cast ((*i)->decoder)) { if ((*i)->video_position < earliest_t) { earliest_t = (*i)->video_position; earliest = *i; @@ -146,7 +146,7 @@ Player::pass () } } - if (dynamic_pointer_cast ((*i)->decoder)) { + if (_audio && dynamic_pointer_cast ((*i)->decoder)) { if ((*i)->audio_position < earliest_t) { earliest_t = (*i)->audio_position; earliest = *i; @@ -238,6 +238,10 @@ Player::process_video (weak_ptr weak_piece, shared_ptr image work_image = im; } +#ifdef DCPOMATIC_DEBUG + _last_video = piece->content; +#endif + Video (work_image, same, time); time += TIME_HZ / _film->dcp_video_frame_rate(); @@ -348,7 +352,10 @@ Player::flush () } -/** @return true on error */ +/** Seek so that the next pass() will yield (approximately) the requested frame. + * Pass accurate = true to try harder to get close to the request. + * @return true on error + */ void Player::seek (Time t, bool accurate) { @@ -374,11 +381,16 @@ Player::seek (Time t, bool accurate) (*i)->video_position = (*i)->audio_position = vc->start() + s; FrameRateConversion frc (vc->video_frame_rate(), _film->dcp_video_frame_rate()); - VideoContent::Frame f = s * vc->video_frame_rate() / (frc.factor() * TIME_HZ); + /* Here we are converting from time (in the DCP) to a frame number in the content. + Hence we need to use the DCP's frame rate and the double/skip correction, not + the source's rate. + */ + VideoContent::Frame f = s * _film->dcp_video_frame_rate() / (frc.factor() * TIME_HZ); dynamic_pointer_cast((*i)->decoder)->seek (f, accurate); } _video_position = _audio_position = t; + /* XXX: don't seek audio because we don't need to... */ } @@ -501,6 +513,10 @@ Player::resampler (shared_ptr c) void Player::emit_black () { +#ifdef DCPOMATIC_DEBUG + _last_video.reset (); +#endif + /* XXX: use same here */ Video (_black_frame, false, _video_position); _video_position += _film->video_frames_to_time (1); diff --git a/src/lib/player.h b/src/lib/player.h index b3eadd7c0..92a358043 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -75,6 +75,7 @@ public: boost::signals2::signal Changed; private: + friend class PlayerWrapper; void process_video (boost::weak_ptr, boost::shared_ptr, bool, VideoContent::Frame); void process_audio (boost::weak_ptr, boost::shared_ptr, AudioContent::Frame); @@ -126,6 +127,10 @@ private: Time from; Time to; } _out_subtitle; + +#ifdef DCPOMATIC_DEBUG + boost::shared_ptr _last_video; +#endif }; #endif diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index 703a14663..0d6462f6c 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -72,25 +72,35 @@ Playlist::~Playlist () void Playlist::content_changed (weak_ptr c, int p) { - if (p == ContentProperty::LENGTH && _sequence_video && !_sequencing_video) { - _sequencing_video = true; - - ContentList cl = _content; - sort (cl.begin(), cl.end(), ContentSorter ()); - Time last = 0; - for (ContentList::iterator i = cl.begin(); i != cl.end(); ++i) { - if (!dynamic_pointer_cast (*i)) { - continue; - } + if (p == ContentProperty::LENGTH) { + maybe_sequence_video (); + } - (*i)->set_start (last); - last = (*i)->end (); - } + ContentChanged (c, p); +} - _sequencing_video = false; +void +Playlist::maybe_sequence_video () +{ + if (!_sequence_video || _sequencing_video) { + return; } - ContentChanged (c, p); + _sequencing_video = true; + + ContentList cl = _content; + sort (cl.begin(), cl.end(), ContentSorter ()); + Time last = 0; + for (ContentList::iterator i = cl.begin(); i != cl.end(); ++i) { + if (!dynamic_pointer_cast (*i)) { + continue; + } + + (*i)->set_start (last); + last = (*i)->end (); + } + + _sequencing_video = false; } string diff --git a/src/lib/playlist.h b/src/lib/playlist.h index cf0f09b31..805df4d70 100644 --- a/src/lib/playlist.h +++ b/src/lib/playlist.h @@ -86,6 +86,7 @@ public: Time video_end () const; void set_sequence_video (bool); + void maybe_sequence_video (); mutable boost::signals2::signal Changed; mutable boost::signals2::signal, int)> ContentChanged; diff --git a/test/play_test.cc b/test/play_test.cc new file mode 100644 index 000000000..12f80a282 --- /dev/null +++ b/test/play_test.cc @@ -0,0 +1,123 @@ +/* + Copyright (C) 2013 Carl Hetherington + + This program 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. + + This program 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 this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#include "player.h" + +/* This test needs stuff in Player that is only included in debug mode */ +#ifdef DCPOMATIC_DEBUG + +using boost::optional; + +struct Video +{ + boost::shared_ptr content; + boost::shared_ptr image; + Time time; +}; + +class PlayerWrapper +{ +public: + PlayerWrapper (shared_ptr p) + : _player (p) + { + _player->Video.connect (bind (&PlayerWrapper::process_video, this, _1, _2, _3)); + } + + void process_video (shared_ptr i, bool, Time t) + { + Video v; + v.content = _player->_last_video; + v.image = i; + v.time = t; + _queue.push_front (v); + } + + optional