X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_waveform_plot.cc;h=c6fa883fa871c227b321dea92819d126998cd922;hb=7851658223286410d5afb1e32bc44b4012ec5f55;hp=ad0498057b8a0c5296a598316b41aa1e58610358;hpb=f8a0bc6135a933dcf660bbc46b4b3d29d503690e;p=dcpomatic.git

diff --git a/src/wx/video_waveform_plot.cc b/src/wx/video_waveform_plot.cc
index ad0498057..c6fa883fa 100644
--- a/src/wx/video_waveform_plot.cc
+++ b/src/wx/video_waveform_plot.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -22,7 +22,9 @@
 #include "film_viewer.h"
 #include "wx_util.h"
 #include "lib/image.h"
+#include "lib/film.h"
 #include "lib/dcp_video.h"
+#include "lib/player_video.h"
 #include <dcp/locale_convert.h>
 #include <dcp/openjpeg_image.h>
 #include <wx/rawbmp.h>
@@ -42,7 +44,7 @@ int const VideoWaveformPlot::_vertical_margin = 8;
 int const VideoWaveformPlot::_pixel_values = 4096;
 int const VideoWaveformPlot::_x_axis_width = 52;
 
-VideoWaveformPlot::VideoWaveformPlot (wxWindow* parent, weak_ptr<const Film> film, FilmViewer* viewer)
+VideoWaveformPlot::VideoWaveformPlot (wxWindow* parent, weak_ptr<const Film> film, weak_ptr<FilmViewer> viewer)
 	: wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE)
 	, _film (film)
 	, _dirty (true)
@@ -54,7 +56,10 @@ VideoWaveformPlot::VideoWaveformPlot (wxWindow* parent, weak_ptr<const Film> fil
 	SetDoubleBuffered (true);
 #endif
 
-	_viewer_connection = viewer->ImageChanged.connect (boost::bind (&VideoWaveformPlot::set_image, this, _1));
+	shared_ptr<FilmViewer> fv = viewer.lock ();
+	DCPOMATIC_ASSERT (fv);
+
+	_viewer_connection = fv->ImageChanged.connect (boost::bind (&VideoWaveformPlot::set_image, this, _1));
 
 	Bind (wxEVT_PAINT, boost::bind (&VideoWaveformPlot::paint, this));
 	Bind (wxEVT_SIZE,  boost::bind (&VideoWaveformPlot::sized, this, _1));
@@ -189,7 +194,11 @@ VideoWaveformPlot::set_image (weak_ptr<PlayerVideo> image)
 	}
 
 	shared_ptr<PlayerVideo> pv = image.lock ();
-	_image = DCPVideo::convert_to_xyz (pv, boost::bind (&note));
+	DCPOMATIC_ASSERT (pv);
+	/* We must copy the PlayerVideo here as we will call ::image() on it, potentially
+	   with a different pixel_format than was used when ::prepare() was called.
+	*/
+	_image = DCPVideo::convert_to_xyz (pv->shallow_copy(), boost::bind (&note));
 	_dirty = true;
 	Refresh ();
 }