diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-04-22 15:35:34 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-04-22 15:35:34 +0100 |
| commit | 9c9890b9ff89af710db21145c03a09993c629e3e (patch) | |
| tree | 9e96f24e230c7d75a3d0adeff4137e6d8305c710 /src/wx | |
| parent | 78c599cd7447ecfa33cc9f223d4fc6ba8b3879af (diff) | |
Actually use YUV->RGB setting when converting.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/film_viewer.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 26f135d48..a1cc5dfc4 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -180,7 +180,13 @@ FilmViewer::get (DCPTime p, bool accurate) if (!pvf.empty ()) { try { _frame = pvf.front()->image (PIX_FMT_RGB24, true, boost::bind (&Log::dcp_log, _film->log().get(), _1, _2)); - _frame = _frame->scale (_frame->size(), PIX_FMT_RGB24, false); + + 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 (); |