Try again.

[dcpomatic.git] / src / wx / film_viewer.cc

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 16b3ccd9a7ac7c1219697cb6d59227acbdb4105c..e1e3b009d5b6449a0a2015195ed89433581bba28 100644 (file)
--- 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"
@@ -44,6 +45,7 @@ using std::max;
 using std::cout;
 using std::list;
 using boost::shared_ptr;
+using libdcp::Size;
 
 FilmViewer::FilmViewer (shared_ptr<Film> f, wxWindow* p)
        : wxPanel (p)
@@ -55,9 +57,6 @@ FilmViewer::FilmViewer (shared_ptr<Film> f, wxWindow* p)
        , _clear_required (false)
 {
        _panel->SetDoubleBuffered (true);
-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 9       
-       _panel->SetBackgroundStyle (wxBG_STYLE_PAINT);
-#endif 
        
        _v_sizer = new wxBoxSizer (wxVERTICAL);
        SetSizer (_v_sizer);
@@ -68,7 +67,7 @@ FilmViewer::FilmViewer (shared_ptr<Film> f, wxWindow* p)
        h_sizer->Add (_play_button, 0, wxEXPAND);
        h_sizer->Add (_slider, 1, wxEXPAND);
 
-       _v_sizer->Add (h_sizer, 0, wxEXPAND);
+       _v_sizer->Add (h_sizer, 0, wxEXPAND | wxALL, 6);
 
        _panel->Connect (wxID_ANY, wxEVT_PAINT, wxPaintEventHandler (FilmViewer::paint_panel), 0, this);
        _panel->Connect (wxID_ANY, wxEVT_SIZE, wxSizeEventHandler (FilmViewer::panel_sized), 0, this);
@@ -95,11 +94,14 @@ FilmViewer::film_changed (Film::Property p)
                break;
        case Film::CONTENT:
        {
-               shared_ptr<DecodeOptions> o (new DecodeOptions);
-               o->decode_audio = false;
-               o->decode_subtitles = true;
-               o->video_sync = false;
-               _decoders = decoder_factory (_film, o, 0);
+               DecodeOptions o;
+               o.decode_audio = false;
+               o.decode_subtitles = true;
+               o.video_sync = false;
+               _decoders = decoder_factory (_film, o);
+               if (_decoders.video == 0) {
+                       break;
+               }
                _decoders.video->Video.connect (bind (&FilmViewer::process_video, this, _1, _2, _3));
                _decoders.video->OutputChanged.connect (boost::bind (&FilmViewer::decoder_changed, this));
                _decoders.video->set_subtitle_stream (_film->subtitle_stream());
@@ -115,10 +117,13 @@ 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:
-               _decoders.video->set_subtitle_stream (_film->subtitle_stream ());
+               if (_decoders.video) {
+                       _decoders.video->set_subtitle_stream (_film->subtitle_stream ());
+               }
                break;
        default:
                break;
@@ -141,7 +146,6 @@ FilmViewer::set_film (shared_ptr<Film> f)
        _film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1));
 
        film_changed (Film::CONTENT);
-       film_changed (Film::CROP);
        film_changed (Film::FORMAT);
        film_changed (Film::WITH_SUBTITLES);
        film_changed (Film::SUBTITLE_OFFSET);
@@ -152,7 +156,7 @@ FilmViewer::set_film (shared_ptr<Film> f)
 void
 FilmViewer::decoder_changed ()
 {
-       if (_decoders.video->seek_to_last ()) {
+       if (_decoders.video == 0 || _decoders.video->seek_to_last ()) {
                return;
        }
 
@@ -164,7 +168,7 @@ FilmViewer::decoder_changed ()
 void
 FilmViewer::timer (wxTimerEvent &)
 {
-       if (!_film) {
+       if (!_film || !_decoders.video) {
                return;
        }
        
@@ -201,7 +205,7 @@ FilmViewer::paint_panel (wxPaintEvent &)
                dc.SetPen(*wxBLACK_PEN);
                dc.SetBrush(*wxBLACK_BRUSH);
                dc.DrawRectangle (0, 0, _display_frame_x, _film_size.height);
-               dc.DrawRectangle (_display_frame_x + _film_size.width, 0, _display_frame_x * 2 + _film_size.width, _film_size.height);
+               dc.DrawRectangle (_display_frame_x + _film_size.width, 0, _display_frame_x, _film_size.height);
        }
 
        wxImage frame (_film_size.width, _film_size.height, _display_frame->data()[0], true);
@@ -219,7 +223,7 @@ FilmViewer::paint_panel (wxPaintEvent &)
 void
 FilmViewer::slider_moved (wxScrollEvent &)
 {
-       if (!_film || !_film->length()) {
+       if (!_film || !_film->length() || !_decoders.video) {
                return;
        }
        
@@ -266,17 +270,31 @@ 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;
        }
 
        if (_raw_sub) {
+
+               /* Our output is already cropped by the decoder, so we need to account for that
+                  when working out the scale that we are applying.
+               */
+
+               Size const cropped_size = _film->cropped_size (_film->size ());
+
                Rect tx = subtitle_transformed_area (
-                       float (_film_size.width) / _film->size().width,
-                       float (_film_size.height) / _film->size().height,
+                       float (_film_size.width) / cropped_size.width,
+                       float (_film_size.height) / cropped_size.height,
                        _raw_sub->area(), _film->subtitle_offset(), _film->subtitle_scale()
                        );
                
@@ -363,6 +381,11 @@ FilmViewer::get_frame ()
 {
        /* Clear our raw frame in case we don't get a new one */
        _raw_frame.reset ();
+
+       if (_decoders.video == 0) {
+               _display_frame.reset ();
+               return;
+       }
        
        try {
                _got_frame = false;
@@ -376,7 +399,9 @@ FilmViewer::get_frame ()
                        }
                }
        } catch (DecodeError& e) {
-               error_dialog (this, String::compose ("Could not decode video for view (%1)", e.what()));
+               _play_button->SetValue (false);
+               check_play_state ();
+               error_dialog (this, wxString::Format (_("Could not decode video for view (%s)"), e.what()));
        }
 }