X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=f426a7c6e9f86c77764b6274586abcb2760655d1;hb=08d62727f7f1c813cbc7041027fe4a52518623da;hp=b4935dcf4a4a696acfba35066a355bcc993304ca;hpb=98060a4e6f02b418f30b4b736e5880a357454c40;p=dcpomatic.git

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index b4935dcf4..f426a7c6e 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -36,6 +36,7 @@
 #include "lib/player.h"
 #include "lib/video_content.h"
 #include "lib/video_decoder.h"
+#include "lib/timer.h"
 #include "film_viewer.h"
 #include "wx_util.h"
 
@@ -45,11 +46,12 @@ using std::min;
 using std::max;
 using std::cout;
 using std::list;
+using std::bad_alloc;
 using std::make_pair;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::weak_ptr;
-using libdcp::Size;
+using dcp::Size;
 
 FilmViewer::FilmViewer (shared_ptr<Film> f, wxWindow* p)
 	: wxPanel (p)
@@ -120,14 +122,22 @@ FilmViewer::set_film (shared_ptr<Film> f)
 	_frame.reset ();
 	
 	_slider->SetValue (0);
-	set_position_text (0);
+	set_position_text (DCPTime ());
 	
 	if (!_film) {
 		return;
 	}
 
-	_player = f->make_player ();
+	try {
+		_player = f->make_player ();
+	} catch (bad_alloc) {
+		error_dialog (this, _("There is not enough free memory to do that."));
+		_film.reset ();
+		return;
+	}
+	
 	_player->disable_audio ();
+	_player->set_approximate_size ();
 	_player->Video.connect (boost::bind (&FilmViewer::process_video, this, _1, _2, _5));
 	_player->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1));
 
@@ -164,10 +174,10 @@ FilmViewer::timer ()
 	
 	fetch_next_frame ();
 
-	Time const len = _film->length ();
+	DCPTime const len = _film->length ();
 
-	if (len) {
-		int const new_slider_position = 4096 * _player->video_position() / len;
+	if (len.get ()) {
+		int const new_slider_position = 4096 * _player->video_position().get() / len.get();
 		if (new_slider_position != _slider->GetValue()) {
 			_slider->SetValue (new_slider_position);
 		}
@@ -211,8 +221,14 @@ void
 FilmViewer::slider_moved ()
 {
 	if (_film && _player) {
-		_player->seek (_slider->GetValue() * _film->length() / 4096, false);
-		fetch_next_frame ();
+		try {
+			_player->seek (DCPTime (_film->length().get() * _slider->GetValue() / 4096), false);
+			fetch_next_frame ();
+		} catch (OpenFileError& e) {
+			/* There was a problem opening a content file; we'll let this slide as it
+			   probably means a missing content file, which we're already taking care of.
+			*/
+		}
 	}
 }
 
@@ -251,6 +267,13 @@ FilmViewer::calculate_sizes ()
 	_out_size.width = max (64, _out_size.width);
 	_out_size.height = max (64, _out_size.height);
 
+	/* The player will round its image down to the nearest 4 pixels
+	   to speed up its scale, so do similar here to avoid black borders
+	   around things.  This is a bit of a hack.
+	*/
+	_out_size.width &= ~3;
+	_out_size.height &= ~3;
+
 	_player->set_video_container_size (_out_size);
 }
 
@@ -275,20 +298,24 @@ FilmViewer::check_play_state ()
 }
 
 void
-FilmViewer::process_video (shared_ptr<const Image> image, Eyes eyes, Time t)
+FilmViewer::process_video (shared_ptr<PlayerImage> image, Eyes eyes, DCPTime t)
 {
 	if (eyes == EYES_RIGHT) {
 		return;
 	}
-	
-	_frame = image;
+
+	/* Going via BGRA here makes the scaler faster then using RGB24 directly (about
+	   twice on x86 Linux).
+	*/
+	shared_ptr<Image> im = image->image (PIX_FMT_BGRA, true);
+	_frame = im->scale (im->size(), Scaler::from_id ("fastbilinear"), PIX_FMT_RGB24, false);
 	_got_frame = true;
 
 	set_position_text (t);
 }
 
 void
-FilmViewer::set_position_text (Time t)
+FilmViewer::set_position_text (DCPTime t)
 {
 	if (!_film) {
 		_frame_number->SetLabel ("0");
@@ -298,9 +325,9 @@ FilmViewer::set_position_text (Time t)
 		
 	double const fps = _film->video_frame_rate ();
 	/* Count frame number from 1 ... not sure if this is the best idea */
-	_frame_number->SetLabel (wxString::Format (wxT("%d"), int (rint (t * fps / TIME_HZ)) + 1));
+	_frame_number->SetLabel (wxString::Format (wxT("%d"), int (rint (t.seconds() * fps)) + 1));
 	
-	double w = static_cast<double>(t) / TIME_HZ;
+	double w = t.seconds ();
 	int const h = (w / 3600);
 	w -= h * 3600;
 	int const m = (w / 60);
@@ -371,13 +398,19 @@ FilmViewer::back_clicked ()
 	   We want to see the one before it, so we need to go back 2.
 	*/
 
-	Time p = _player->video_position() - _film->video_frames_to_time (2);
-	if (p < 0) {
-		p = 0;
+	DCPTime p = _player->video_position() - DCPTime::from_frames (2, _film->video_frame_rate ());
+	if (p < DCPTime ()) {
+		p = DCPTime ();
 	}
 	
-	_player->seek (p, true);
-	fetch_next_frame ();
+	try {
+		_player->seek (p, true);
+		fetch_next_frame ();
+	} catch (OpenFileError& e) {
+		/* There was a problem opening a content file; we'll let this slide as it
+		   probably means a missing content file, which we're already taking care of.
+		*/
+	}
 }
 
 void