X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=e6b8bf8dd06cd37b6d4e67fd41a3f3cec2c3381d;hb=ad49361b303d1ceff7048fa0e89ba609ca9ce376;hp=3ba7ee7ce8dfa20ffa05fd7ed6809365e6cc6f29;hpb=373f010a7f04add1f49169cbaa60cb7ae5f508d4;p=dcpomatic.git

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 3ba7ee7ce..e6b8bf8dd 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -35,9 +35,8 @@
 #include "lib/filter.h"
 #include "lib/player.h"
 #include "lib/video_content.h"
-#include "lib/ffmpeg_content.h"
-#include "lib/still_image_content.h"
 #include "lib/video_decoder.h"
+#include "lib/timer.h"
 #include "film_viewer.h"
 #include "wx_util.h"
 
@@ -120,8 +119,7 @@ FilmViewer::set_film (shared_ptr<Film> f)
 	_film = f;
 
 	_frame.reset ();
-	_queue.clear ();
-
+	
 	_slider->SetValue (0);
 	set_position_text (0);
 	
@@ -131,11 +129,12 @@ FilmViewer::set_film (shared_ptr<Film> f)
 
 	_player = f->make_player ();
 	_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));
 
 	calculate_sizes ();
-	fetch_current_frame_again ();
+	fetch_next_frame ();
 }
 
 void
@@ -145,17 +144,17 @@ FilmViewer::fetch_current_frame_again ()
 		return;
 	}
 
-	/* Player::video_position is the time after the last frame that we received.
-	   We want to see it again, so seek back one frame.
+	/* We could do this with a seek and a fetch_next_frame, but this is
+	   a shortcut to make it quicker.
 	*/
 
-	Time p = _player->video_position() - _film->video_frames_to_time (1);
-	if (p < 0) {
-		p = 0;
+	_got_frame = false;
+	if (!_player->repeat_last_video ()) {
+		fetch_next_frame ();
 	}
-
-	_player->seek (p, true);
-	fetch_next_frame ();
+	
+	_panel->Refresh ();
+	_panel->Update ();
 }
 
 void
@@ -167,7 +166,7 @@ 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;
@@ -188,9 +187,7 @@ FilmViewer::paint_panel ()
 		return;
 	}
 
-	shared_ptr<Image> packed_frame (new Image (_frame, false));
-
-	wxImage frame (_out_size.width, _out_size.height, packed_frame->data()[0], true);
+	wxImage frame (_out_size.width, _out_size.height, _frame->data()[0], true);
 	wxBitmap frame_bitmap (frame);
 	dc.DrawBitmap (frame_bitmap, 0, 0);
 
@@ -239,7 +236,7 @@ FilmViewer::calculate_sizes ()
 
 	Ratio const * container = _film->container ();
 	
-	float const panel_ratio = static_cast<float> (_panel_size.width) / _panel_size.height;
+	float const panel_ratio = _panel_size.ratio ();
 	float const film_ratio = container ? container->ratio () : 1.78;
 			
 	if (panel_ratio < film_ratio) {
@@ -280,26 +277,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;
 	}
-	
-	if (_got_frame) {
-		/* This is an additional frame emitted by a single pass.  Store it. */
-		_queue.push_front (make_pair (image, t));
-		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");
@@ -335,17 +330,16 @@ FilmViewer::fetch_next_frame ()
 
 	_got_frame = false;
 	
-	if (!_queue.empty ()) {
-		process_video (_queue.back().first, EYES_BOTH, _queue.back().second);
-		_queue.pop_back ();
-	} else {
-		try {
-			while (!_got_frame && !_player->pass ()) {}
-		} catch (DecodeError& e) {
-			_play_button->SetValue (false);
-			check_play_state ();
-			error_dialog (this, wxString::Format (_("Could not decode video for view (%s)"), std_to_wx(e.what()).data()));
-		}
+	try {
+		while (!_got_frame && !_player->pass ()) {}
+	} catch (DecodeError& e) {
+		_play_button->SetValue (false);
+		check_play_state ();
+		error_dialog (this, wxString::Format (_("Could not decode video for view (%s)"), std_to_wx(e.what()).data()));
+	} 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.
+		*/
 	}
 
 	_panel->Refresh ();
@@ -383,7 +377,7 @@ 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);
+	DCPTime p = _player->video_position() - _film->video_frames_to_time (2);
 	if (p < 0) {
 		p = 0;
 	}