Try to tidy up frame indexing; use DCP length obtained from the transcode to make...

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

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 16266f9d5df0bf8e352a112ad639a4ff8f79d35e..e5da41d5e80f30c9959a43854f235d29b8d4682a 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -44,32 +44,35 @@ 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)
        , _panel (new wxPanel (this))
        , _slider (new wxSlider (this, wxID_ANY, 0, 0, 4096))
        , _play_button (new wxToggleButton (this, wxID_ANY, wxT ("Play")))
+       , _got_frame (false)
        , _out_width (0)
        , _out_height (0)
        , _panel_width (0)
        , _panel_height (0)
+       , _clear_required (false)
 {
        _panel->SetDoubleBuffered (true);
 #if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 9       
        _panel->SetBackgroundStyle (wxBG_STYLE_PAINT);
 #endif 
        
-       wxBoxSizer* v_sizer = new wxBoxSizer (wxVERTICAL);
-       SetSizer (v_sizer);
+       _v_sizer = new wxBoxSizer (wxVERTICAL);
+       SetSizer (_v_sizer);
 
-       v_sizer->Add (_panel, 1, wxEXPAND);
+       _v_sizer->Add (_panel, 1, wxEXPAND);
 
        wxBoxSizer* h_sizer = new wxBoxSizer (wxHORIZONTAL);
        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);
 
        _panel->Connect (wxID_ANY, wxEVT_PAINT, wxPaintEventHandler (FilmViewer::paint_panel), 0, this);
        _panel->Connect (wxID_ANY, wxEVT_SIZE, wxSizeEventHandler (FilmViewer::panel_sized), 0, this);
@@ -79,7 +82,7 @@ FilmViewer::FilmViewer (shared_ptr<Film> f, wxWindow* p)
        _play_button->Connect (wxID_ANY, wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler (FilmViewer::play_clicked), 0, this);
        _timer.Connect (wxID_ANY, wxEVT_TIMER, wxTimerEventHandler (FilmViewer::timer), 0, this);
 
-       set_film (_film);
+       set_film (f);
 
        JobManager::instance()->ActiveJobsChanged.connect (
                bind (&FilmViewer::active_jobs_changed, this, _1)
@@ -96,12 +99,12 @@ 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;
+               DecodeOptions o;
+               o.decode_audio = false;
+               o.decode_subtitles = true;
+               o.video_sync = false;
                _decoders = decoder_factory (_film, o, 0);
-               _decoders.video->Video.connect (bind (&FilmViewer::process_video, this, _1, _2));
+               _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());
                calculate_sizes ();
@@ -109,6 +112,7 @@ FilmViewer::film_changed (Film::Property p)
                _panel->Refresh ();
                _slider->Show (_film->content_type() == VIDEO);
                _play_button->Show (_film->content_type() == VIDEO);
+               _v_sizer->Layout ();
                break;
        }
        case Film::WITH_SUBTITLES:
@@ -162,7 +166,7 @@ FilmViewer::decoder_changed ()
 }
 
 void
-FilmViewer::timer (wxTimerEvent& ev)
+FilmViewer::timer (wxTimerEvent &)
 {
        if (!_film) {
                return;
@@ -183,10 +187,15 @@ FilmViewer::timer (wxTimerEvent& ev)
 
 
 void
-FilmViewer::paint_panel (wxPaintEvent& ev)
+FilmViewer::paint_panel (wxPaintEvent &)
 {
        wxPaintDC dc (_panel);
 
+       if (_clear_required) {
+               dc.Clear ();
+               _clear_required = false;
+       }
+
        if (!_display_frame || !_film || !_out_width || !_out_height) {
                dc.Clear ();
                return;
@@ -249,9 +258,18 @@ FilmViewer::raw_to_display ()
                return;
        }
 
+       Size old_size;
+       if (_display_frame) {
+               old_size = _display_frame->size();
+       }
+
        /* Get a compacted image as we have to feed it to wxWidgets */
        _display_frame = _raw_frame->scale_and_convert_to_rgb (Size (_out_width, _out_height), 0, _film->scaler(), false);
 
+       if (old_size != _display_frame->size()) {
+               _clear_required = true;
+       }
+
        if (_raw_sub) {
                Rect tx = subtitle_transformed_area (
                        float (_out_width) / _film->size().width,
@@ -307,12 +325,14 @@ FilmViewer::check_play_state ()
 }
 
 void
-FilmViewer::process_video (shared_ptr<Image> image, shared_ptr<Subtitle> sub)
+FilmViewer::process_video (shared_ptr<Image> image, bool, shared_ptr<Subtitle> sub)
 {
        _raw_frame = image;
        _raw_sub = sub;
 
        raw_to_display ();
+
+       _got_frame = true;
 }
 
 void
@@ -322,8 +342,8 @@ FilmViewer::get_frame ()
        _raw_frame.reset ();
        
        try {
-               shared_ptr<Image> last = _display_frame;
-               while (last == _display_frame) {
+               _got_frame = false;
+               while (!_got_frame) {
                        if (_decoders.video->pass ()) {
                                /* We didn't get a frame before the decoder gave up,
                                   so clear our display frame.