#include "simple_video_view.h"
#include "film_viewer.h"
#include "wx_util.h"
+#include "closed_captions_dialog.h"
#include "lib/image.h"
#include "lib/dcpomatic_log.h"
#include "lib/butler.h"
using std::max;
using std::string;
using boost::optional;
+using boost::shared_ptr;
using namespace dcpomatic;
SimpleVideoView::SimpleVideoView (FilmViewer* viewer, wxWindow* parent)
}
LOG_DEBUG_PLAYER("%1 -> %2; delay %3", next.seconds(), _viewer->time().seconds(), max((next.seconds() - _viewer->time().seconds()) * 1000, 1.0));
- _timer.Start (max ((next.seconds() - _viewer->time().seconds()) * 1000, 1.0), wxTIMER_ONE_SHOT);
+ _timer.Start (_viewer->time_until_next_frame(), wxTIMER_ONE_SHOT);
- if (_viewer->_butler) {
- _viewer->_butler->rethrow ();
+ if (_viewer->butler()) {
+ _viewer->butler()->rethrow ();
}
}
bool
SimpleVideoView::get (bool lazy)
{
- DCPOMATIC_ASSERT (_viewer->_butler);
- _viewer->_gets++;
-
- do {
- Butler::Error e;
- _viewer->_player_video = _viewer->_butler->get_video (!lazy, &e);
- if (!_viewer->_player_video.first && e == Butler::AGAIN) {
- if (lazy) {
- /* No video available; return saying we failed */
- return false;
- } else {
- /* Player was suspended; come back later */
- signal_manager->when_idle (boost::bind(&SimpleVideoView::get, this, false));
- return false;
- }
+ bool r = get_next_frame (lazy);
+ if (!r) {
+ if (lazy) {
+ /* No video available; return saying we failed */
+ return false;
+ } else {
+ /* Player was suspended; come back later */
+ signal_manager->when_idle (boost::bind(&SimpleVideoView::get, this, false));
+ return false;
}
- } while (
- _viewer->_player_video.first &&
- _viewer->film()->three_d() &&
- _viewer->_eyes != _viewer->_player_video.first->eyes() &&
- _viewer->_player_video.first->eyes() != EYES_BOTH
- );
-
- try {
- _viewer->_butler->rethrow ();
- } catch (DecodeError& e) {
- error_dialog (get(), e.what());
}
- _viewer->display_player_video ();
+ display_player_video ();
_viewer->PositionChanged ();
return true;
}
+
+void
+SimpleVideoView::display_player_video ()
+{
+ if (!_player_video.first) {
+ set_image (shared_ptr<Image>());
+ _viewer->refresh_view ();
+ return;
+ }
+
+ if (_viewer->playing() && (_viewer->time() - _player_video.second) > _viewer->one_video_frame()) {
+ /* Too late; just drop this frame before we try to get its image (which will be the time-consuming
+ part if this frame is J2K).
+ */
+ _viewer->_video_position = _player_video.second;
+ ++_viewer->_dropped;
+ return;
+ }
+
+ /* In an ideal world, what we would do here is:
+ *
+ * 1. convert to XYZ exactly as we do in the DCP creation path.
+ * 2. convert back to RGB for the preview display, compensating
+ * for the monitor etc. etc.
+ *
+ * but this is inefficient if the source is RGB. Since we don't
+ * (currently) care too much about the precise accuracy of the preview's
+ * colour mapping (and we care more about its speed) we try to short-
+ * circuit this "ideal" situation in some cases.
+ *
+ * The content's specified colour conversion indicates the colourspace
+ * which the content is in (according to the user).
+ *
+ * PlayerVideo::image (bound to PlayerVideo::force) will take the source
+ * image and convert it (from whatever the user has said it is) to RGB.
+ */
+
+ _viewer->_state_timer.set ("get image");
+
+ set_image (
+ _player_video.first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true)
+ );
+
+ _viewer->_state_timer.set ("ImageChanged");
+ _viewer->ImageChanged (_player_video.first);
+ _viewer->_state_timer.unset ();
+
+ _viewer->_video_position = _player_video.second;
+ _viewer->_inter_position = _player_video.first->inter_position ();
+ _viewer->_inter_size = _player_video.first->inter_size ();
+
+ _viewer->refresh_view ();
+
+ _viewer->_closed_captions_dialog->update (_viewer->time());
+}