From: Carl Hetherington <cth@carlh.net>
Date: Sat, 2 Feb 2013 17:49:53 +0000 (+0000)
Subject: Post-process viewer images.
X-Git-Tag: v2.0.48~1337^2~714^2
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=6664ce3a91a51593821fa23755a05e08868dc788;p=dcpomatic.git

Post-process viewer images.
---

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 0b3fb0fd2..e103df776 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -34,6 +34,7 @@
 #include "lib/scaler.h"
 #include "lib/exceptions.h"
 #include "lib/examine_content_job.h"
+#include "lib/filter.h"
 #include "film_viewer.h"
 #include "wx_util.h"
 #include "video_decoder.h"
@@ -116,6 +117,7 @@ FilmViewer::film_changed (Film::Property p)
 	case Film::SUBTITLE_OFFSET:
 	case Film::SUBTITLE_SCALE:
 	case Film::SCALER:
+	case Film::FILTERS:
 		update_from_raw ();
 		break;
 	case Film::SUBTITLE_STREAM:
@@ -267,8 +269,15 @@ FilmViewer::raw_to_display ()
 		old_size = _display_frame->size();
 	}
 
+	boost::shared_ptr<Image> input = _raw_frame;
+
+	pair<string, string> const s = Filter::ffmpeg_strings (_film->filters());
+	if (!s.second.empty ()) {
+		input = input->post_process (s.second, true);
+	}
+	
 	/* Get a compacted image as we have to feed it to wxWidgets */
-	_display_frame = _raw_frame->scale_and_convert_to_rgb (_film_size, 0, _film->scaler(), false);
+	_display_frame = input->scale_and_convert_to_rgb (_film_size, 0, _film->scaler(), false);
 
 	if (old_size != _display_frame->size()) {
 		_clear_required = true;