X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=311ec734c45734aff0a5dab1295a8fc5e3178a9c;hb=ae15eeca8588c6928d7671894db98c2e289fa601;hp=7ecba1903799d28ae658a7eee917bbce6d624983;hpb=3b48d5494c3cae7743d283203f5c8021860ab81f;p=dcpomatic.git

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 7ecba1903..311ec734c 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -21,16 +21,11 @@
  *  @brief A wx widget to view a preview of a Film.
  */
 
-#include <iostream>
-#include <iomanip>
-#include <wx/tglbtn.h>
-#include <dcp/exceptions.h>
 #include "lib/film.h"
 #include "lib/ratio.h"
 #include "lib/util.h"
 #include "lib/job_manager.h"
 #include "lib/image.h"
-#include "lib/scaler.h"
 #include "lib/exceptions.h"
 #include "lib/examine_content_job.h"
 #include "lib/filter.h"
@@ -39,8 +34,13 @@
 #include "lib/video_content.h"
 #include "lib/video_decoder.h"
 #include "lib/timer.h"
+#include "lib/log.h"
 #include "film_viewer.h"
 #include "wx_util.h"
+#include <dcp/exceptions.h>
+#include <wx/tglbtn.h>
+#include <iostream>
+#include <iomanip>
 
 using std::string;
 using std::pair;
@@ -50,6 +50,7 @@ using std::cout;
 using std::list;
 using std::bad_alloc;
 using std::make_pair;
+using std::exception;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::weak_ptr;
@@ -146,7 +147,6 @@ FilmViewer::set_film (shared_ptr<Film> f)
 	
 	_film_connection = _film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1));
 
-	_player->set_approximate_size ();
 	_player_connection = _player->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1));
 
 	calculate_sizes ();
@@ -169,11 +169,23 @@ FilmViewer::get (DCPTime p, bool accurate)
 		return;
 	}
 
-	list<shared_ptr<PlayerVideo> > pvf = _player->get_video (p, accurate);
+	list<shared_ptr<PlayerVideo> > pvf;
+	try {
+		pvf = _player->get_video (p, accurate);
+	} catch (exception& e) {
+		error_dialog (this, wxString::Format (_("Could not get video for view (%s)"), std_to_wx(e.what()).data()));
+	}
+	
 	if (!pvf.empty ()) {
 		try {
-			_frame = pvf.front()->image (true);
-			_frame = _frame->scale (_frame->size(), Scaler::from_id ("fastbilinear"), PIX_FMT_RGB24, false);
+			_frame = pvf.front()->image (PIX_FMT_RGB24, true, boost::bind (&Log::dcp_log, _film->log().get(), _1, _2));
+
+			dcp::YUVToRGB yuv_to_rgb = dcp::YUV_TO_RGB_REC601;
+			if (pvf.front()->colour_conversion()) {
+				yuv_to_rgb = pvf.front()->colour_conversion().get().yuv_to_rgb();
+			}
+			
+			_frame = _frame->scale (_frame->size(), yuv_to_rgb, PIX_FMT_RGB24, false);
 			_position = pvf.front()->time ();
 			_inter_position = pvf.front()->inter_position ();
 			_inter_size = pvf.front()->inter_size ();
@@ -307,13 +319,6 @@ 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 size down to the next lowest 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);
 }