Round image line sizes up to 32. Seems to help with LHS image corruption with both...
[dcpomatic.git] / src / wx / film_viewer.cc
index ee5c470f6d28a1eb76c613eaa38dd53101fdceee..bf082adc2e534824eb6d769cc32fa5c43cb2be85 100644 (file)
@@ -30,7 +30,9 @@
 #include "lib/job_manager.h"
 #include "lib/film_state.h"
 #include "lib/options.h"
+#include "lib/subtitle.h"
 #include "film_viewer.h"
+#include "wx_util.h"
 
 using namespace std;
 using namespace boost;
@@ -41,106 +43,181 @@ public:
        ThumbPanel (wxPanel* parent, Film* film)
                : wxPanel (parent)
                , _film (film)
-               , _image (0)
-               , _bitmap (0)
-               , _left_crop (0)
-               , _right_crop (0)
-               , _top_crop (0)
-               , _bottom_crop (0)
-       {
-       }
+               , _frame_rebuild_needed (false)
+               , _composition_needed (false)
+       {}
 
+       /** Handle a paint event */
        void paint_event (wxPaintEvent& ev)
        {
+               if (!_film || _film->num_thumbs() == 0) {
+                       wxPaintDC dc (this);
+                       return;
+               }
+
+               if (_frame_rebuild_needed) {
+                       _image.reset (new wxImage (std_to_wx (_film->thumb_file (_index))));
+
+                       _subtitles.clear ();
+                       list<pair<Position, string> > s = _film->thumb_subtitles (_index);
+                       for (list<pair<Position, string> >::iterator i = s.begin(); i != s.end(); ++i) {
+                               _subtitles.push_back (SubtitleView (i->first, std_to_wx (i->second)));
+                       }
+
+                       _frame_rebuild_needed = false;
+
+                       compose ();
+                       _composition_needed = false;
+               }
+
+               if (_composition_needed) {
+                       compose ();
+                       _composition_needed = false;
+               }
+
                wxPaintDC dc (this);
                if (_bitmap) {
                        dc.DrawBitmap (*_bitmap, 0, 0, false);
                }
+
+               if (_film->with_subtitles ()) {
+                       for (list<SubtitleView>::iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
+                               dc.DrawBitmap (*i->bitmap, i->transformed_area.x, i->transformed_area.y, true);
+                       }
+               }
        }
 
+       /** Handle a size event */
        void size_event (wxSizeEvent &)
        {
                if (!_image) {
                        return;
                }
 
-               setup ();
+               recompose ();
+       }
+
+       /** @param n Thumbnail index */
+       void set (int n)
+       {
+               _index = n;
+               _frame_rebuild_needed = true;
+               Refresh ();
+       }
+
+       void set_film (Film* f)
+       {
+               _film = f;
+               if (!_film) {
+                       clear ();
+                       _frame_rebuild_needed = true;
+                       Refresh ();
+               } else {
+                       _frame_rebuild_needed = true;
+                       Refresh ();
+               }
+       }
+
+       /** Clear our thumbnail image */
+       void clear ()
+       {
+               _bitmap.reset ();
+               _image.reset ();
+               _subtitles.clear ();
        }
 
-       void setup ()
+       void recompose ()
+       {
+               _composition_needed = true;
+               Refresh ();
+       }
+
+       DECLARE_EVENT_TABLE ();
+
+private:
+
+       void compose ()
        {
                if (!_film || !_image) {
                        return;
                }
-               
+
+               /* Size of the view */
                int vw, vh;
                GetSize (&vw, &vh);
 
-               float const target = _film->format() ? _film->format()->ratio_as_float () : 1.78;
-
-               _cropped_image = _image->GetSubImage (
-                       wxRect (_left_crop, _top_crop, _image->GetWidth() - (_left_crop + _right_crop), _image->GetHeight() - (_top_crop + _bottom_crop))
+               /* Cropped rectangle */
+               Rectangle cropped_area (
+                       _film->crop().left,
+                       _film->crop().top,
+                       _image->GetWidth() - (_film->crop().left + _film->crop().right),
+                       _image->GetHeight() - (_film->crop().top + _film->crop().bottom)
                        );
 
+               /* Target ratio */
+               float const target = _film->format() ? _film->format()->ratio_as_float (_film) : 1.78;
+
+               _transformed_image = _image->GetSubImage (wxRect (cropped_area.x, cropped_area.y, cropped_area.w, cropped_area.h));
+
+               float x_scale = 1;
+               float y_scale = 1;
+
                if ((float (vw) / vh) > target) {
                        /* view is longer (horizontally) than the ratio; fit height */
-                       _cropped_image.Rescale (vh * target, vh, wxIMAGE_QUALITY_HIGH);
+                       _transformed_image.Rescale (vh * target, vh, wxIMAGE_QUALITY_HIGH);
+                       x_scale = vh * target / cropped_area.w;
+                       y_scale = float (vh) / cropped_area.h;
                } else {
                        /* view is shorter (horizontally) than the ratio; fit width */
-                       _cropped_image.Rescale (vw, vw / target, wxIMAGE_QUALITY_HIGH);
+                       _transformed_image.Rescale (vw, vw / target, wxIMAGE_QUALITY_HIGH);
+                       x_scale = float (vw) / cropped_area.w;
+                       y_scale = (vw / target) / cropped_area.h;
                }
 
-               delete _bitmap;
-               _bitmap = new wxBitmap (_cropped_image);
+               _bitmap.reset (new wxBitmap (_transformed_image));
 
-               Refresh ();
-       }
+               for (list<SubtitleView>::iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
 
-       void load (string f)
-       {
-               delete _image;
-               _image = new wxImage (wxString (f.c_str(), wxConvUTF8));
-               setup ();
-       }
+                       i->transformed_area = transformed_subtitle_area (
+                               x_scale, y_scale, i->base_area, _film->subtitle_offset(), _film->subtitle_scale()
+                               );
 
-       void set_crop (int l, int r, int t, int b)
-       {
-               _left_crop = l;
-               _right_crop = r;
-               _top_crop = t;
-               _bottom_crop = b;
-               setup ();
-       }
-
-       void set_film (Film* f)
-       {
-               _film = f;
-               if (!_film) {
-                       clear ();
-               } else {
-                       setup ();
+                       i->transformed_image = i->base_image;
+                       i->transformed_image.Rescale (i->transformed_area.w, i->transformed_area.h, wxIMAGE_QUALITY_HIGH);
+                       i->transformed_area.x -= _film->crop().left;
+                       i->transformed_area.y -= _film->crop().top;
+                       i->bitmap.reset (new wxBitmap (i->transformed_image));
                }
        }
 
-       void clear ()
+       Film* _film;
+       shared_ptr<wxImage> _image;
+       wxImage _transformed_image;
+       /** currently-displayed thumbnail index */
+       int _index;
+       shared_ptr<wxBitmap> _bitmap;
+       bool _frame_rebuild_needed;
+       bool _composition_needed;
+
+       struct SubtitleView
        {
-               delete _bitmap;
-               _bitmap = 0;
-               delete _image;
-               _image = 0;
-       }
+               SubtitleView (Position p, wxString const & i)
+                       : base_image (i)
+               {
+                       base_area.x = p.x;
+                       base_area.y = p.y;
+                       base_area.w = base_image.GetWidth ();
+                       base_area.h = base_image.GetHeight ();
+               }
 
-       DECLARE_EVENT_TABLE ();
+               Rectangle base_area;
+               Rectangle transformed_area;
+               wxImage base_image;
+               wxImage transformed_image;
+               shared_ptr<wxBitmap> bitmap;
+       };
 
-private:
-       Film* _film;
-       wxImage* _image;
-       wxImage _cropped_image;
-       wxBitmap* _bitmap;
-       int _left_crop;
-       int _right_crop;
-       int _top_crop;
-       int _bottom_crop;
+       list<SubtitleView> _subtitles;
 };
 
 BEGIN_EVENT_TABLE (ThumbPanel, wxPanel)
@@ -150,7 +227,7 @@ END_EVENT_TABLE ()
 
 FilmViewer::FilmViewer (Film* f, wxWindow* p)
        : wxPanel (p)
-       , _film (f)
+       , _film (0)
 {
        _sizer = new wxBoxSizer (wxVERTICAL);
        SetSizer (_sizer);
@@ -161,7 +238,7 @@ FilmViewer::FilmViewer (Film* f, wxWindow* p)
        int const max = f ? f->num_thumbs() - 1 : 0;
        _slider = new wxSlider (this, wxID_ANY, 0, 0, max);
        _sizer->Add (_slider, 0, wxEXPAND | wxLEFT | wxRIGHT);
-       load_thumbnail (0);
+       set_thumbnail (0);
 
        _slider->Connect (wxID_ANY, wxEVT_COMMAND_SLIDER_UPDATED, wxCommandEventHandler (FilmViewer::slider_changed), 0, this);
 
@@ -169,33 +246,26 @@ FilmViewer::FilmViewer (Film* f, wxWindow* p)
 }
 
 void
-FilmViewer::load_thumbnail (int n)
+FilmViewer::set_thumbnail (int n)
 {
        if (_film == 0 || _film->num_thumbs() <= n) {
                return;
        }
 
-       _thumb_panel->load (_film->thumb_file(n));
-}
-
-void
-FilmViewer::reload_current_thumbnail ()
-{
-       load_thumbnail (_slider->GetValue ());
+       _thumb_panel->set (n);
 }
 
 void
 FilmViewer::slider_changed (wxCommandEvent &)
 {
-       reload_current_thumbnail ();
+       set_thumbnail (_slider->GetValue ());
 }
 
 void
 FilmViewer::film_changed (Film::Property p)
 {
-       if (p == Film::LEFT_CROP || p == Film::RIGHT_CROP || p == Film::TOP_CROP || p == Film::BOTTOM_CROP) {
-               _thumb_panel->set_crop (_film->left_crop(), _film->right_crop(), _film->top_crop(), _film->bottom_crop ());
-       } else if (p == Film::THUMBS) {
+       switch (p) {
+       case Film::THUMBS:
                if (_film && _film->num_thumbs() > 1) {
                        _slider->SetRange (0, _film->num_thumbs () - 1);
                } else {
@@ -204,19 +274,32 @@ FilmViewer::film_changed (Film::Property p)
                }
                
                _slider->SetValue (0);
-               reload_current_thumbnail ();
-       } else if (p == Film::FORMAT) {
-               reload_current_thumbnail ();
-       } else if (p == Film::CONTENT) {
+               set_thumbnail (0);
+               break;
+       case Film::CONTENT:
                setup_visibility ();
                _film->examine_content ();
                update_thumbs ();
+               break;
+       case Film::CROP:
+       case Film::FORMAT:
+       case Film::WITH_SUBTITLES:
+       case Film::SUBTITLE_OFFSET:
+       case Film::SUBTITLE_SCALE:
+               _thumb_panel->recompose ();
+               break;
+       default:
+               break;
        }
 }
 
 void
 FilmViewer::set_film (Film* f)
 {
+       if (_film == f) {
+               return;
+       }
+       
        _film = f;
        _thumb_panel->set_film (_film);
 
@@ -225,8 +308,9 @@ FilmViewer::set_film (Film* f)
        }
 
        _film->Changed.connect (sigc::mem_fun (*this, &FilmViewer::film_changed));
+       film_changed (Film::CROP);
        film_changed (Film::THUMBS);
-       reload_current_thumbnail ();
+       setup_visibility ();
 }
 
 void
@@ -239,13 +323,14 @@ FilmViewer::update_thumbs ()
        _film->update_thumbs_pre_gui ();
 
        shared_ptr<const FilmState> s = _film->state_copy ();
-       shared_ptr<Options> o (new Options (s->dir ("thumbs"), ".tiff", ""));
+       shared_ptr<Options> o (new Options (s->dir ("thumbs"), ".png", ""));
        o->out_size = _film->size ();
        o->apply_crop = false;
        o->decode_audio = false;
        o->decode_video_frequency = 128;
+       o->decode_subtitles = true;
        
-       shared_ptr<Job> j (new ThumbsJob (s, o, _film->log ()));
+       shared_ptr<Job> j (new ThumbsJob (s, o, _film->log(), shared_ptr<Job> ()));
        j->Finished.connect (sigc::mem_fun (_film, &Film::update_thumbs_post_gui));
        JobManager::instance()->add (j);
 }