#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)
#ifdef DCPOMATIC_VARIANT_SWAROOP
DCPTime const period = DCPTime::from_seconds(Config::instance()->player_watermark_period() * 60);
- int64_t n = _viewer->video_position().get() / period.get();
+ int64_t n = _viewer->position().get() / period.get();
DCPTime from(n * period.get());
DCPTime to = from + DCPTime::from_seconds(Config::instance()->player_watermark_duration() / 1000.0);
- if (from <= _viewer->video_position() && _viewer->video_position() <= to) {
+ if (from <= _viewer->position() && _viewer->position() <= to) {
if (!_in_watermark) {
_in_watermark = true;
_watermark_x = rand() % panel_size.GetWidth();
}
if (_viewer->outline_content()) {
- Position<int> inter_position = _viewer->inter_position ();
- dcp::Size inter_size = _viewer->inter_size ();
wxPen p (wxColour (255, 0, 0), 2);
dc.SetPen (p);
dc.SetBrush (*wxTRANSPARENT_BRUSH);
- dc.DrawRectangle (inter_position.x, inter_position.y + (panel_size.GetHeight() - out_size.height) / 2, inter_size.width, inter_size.height);
+ dc.DrawRectangle (_inter_position.x, _inter_position.y + (panel_size.GetHeight() - out_size.height) / 2, _inter_size.width, _inter_size.height);
}
_viewer->state_timer().unset();
}
void
SimpleVideoView::timer ()
{
- if (!_viewer->_film || !_viewer->_playing) {
+ if (!_viewer->playing()) {
return;
}
- _viewer->get (false);
- DCPTime const next = _viewer->_video_position + _viewer->one_video_frame();
+ display_next_frame (false);
+ DCPTime const next = _viewer->position() + _viewer->one_video_frame();
- if (next >= _viewer->_film->length()) {
+ if (next >= length()) {
_viewer->stop ();
_viewer->Finished ();
return;
}
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 (time_until_next_frame(), wxTIMER_ONE_SHOT);
- if (_viewer->_butler) {
- _viewer->_butler->rethrow ();
+ if (_viewer->butler()) {
+ _viewer->butler()->rethrow ();
}
}
+
+void
+SimpleVideoView::start ()
+{
+ VideoView::start ();
+ timer ();
+}
+
+/** Try to get a frame from the butler and display it.
+ * @param non_blocking true to return false quickly if no video is available quickly (i.e. we are waiting for the butler).
+ * false to ask the butler to block until it has video (unless it is suspended).
+ * @return true on success, false if we did nothing because it would have taken too long.
+ */
+bool
+SimpleVideoView::display_next_frame (bool non_blocking)
+{
+ bool r = get_next_frame (non_blocking);
+ if (!r) {
+ if (non_blocking) {
+ /* No video available; return saying we failed */
+ return false;
+ } else {
+ /* Player was suspended; come back later */
+ signal_manager->when_idle (boost::bind(&SimpleVideoView::display_next_frame, this, false));
+ return false;
+ }
+ }
+
+ display_player_video ();
+
+ try {
+ _viewer->butler()->rethrow ();
+ } catch (DecodeError& e) {
+ error_dialog (get(), e.what());
+ }
+
+ 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) > 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).
+ */
+ add_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 ();
+
+ _inter_position = player_video().first->inter_position ();
+ _inter_size = player_video().first->inter_size ();
+
+ _viewer->refresh_view ();
+
+ _viewer->closed_captions_dialog()->update (_viewer->time());
+}
projects / dcpomatic.git / blobdiff