X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=79b3d982f64b399d78a57c737a5a6d45d9d26b46;hb=db468a15e50c8491d4b8462ad0676be905f49065;hp=891d1671b875265a859a2e760da423ebc0efa447;hpb=2587f29e54bac098296dbef6557b9bf9bcdc2406;p=dcpomatic.git diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 891d1671b..79b3d982f 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -28,12 +28,13 @@ #include "lib/format.h" #include "lib/util.h" #include "lib/job_manager.h" -#include "lib/options.h" #include "lib/subtitle.h" #include "lib/image.h" #include "lib/scaler.h" #include "lib/exceptions.h" #include "lib/examine_content_job.h" +#include "lib/filter.h" +#include "lib/playlist.h" #include "film_viewer.h" #include "wx_util.h" #include "video_decoder.h" @@ -44,40 +45,42 @@ using std::max; using std::cout; using std::list; using boost::shared_ptr; +using libdcp::Size; FilmViewer::FilmViewer (shared_ptr 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"))) - , _out_width (0) - , _out_height (0) - , _panel_width (0) - , _panel_height (0) + , _play_button (new wxToggleButton (this, wxID_ANY, _("Play"))) + , _display_frame_x (0) + , _got_frame (false) + , _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 | wxALL, 6); - _panel->Bind (wxEVT_PAINT, &FilmViewer::paint_panel, this); - _panel->Bind (wxEVT_SIZE, &FilmViewer::panel_sized, this); - _slider->Bind (wxEVT_SCROLL_THUMBTRACK, &FilmViewer::slider_moved, this); - _slider->Bind (wxEVT_SCROLL_PAGEUP, &FilmViewer::slider_moved, this); - _slider->Bind (wxEVT_SCROLL_PAGEDOWN, &FilmViewer::slider_moved, this); - _play_button->Bind (wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, &FilmViewer::play_clicked, this); - _timer.Bind (wxEVT_TIMER, &FilmViewer::timer, this); + _panel->Connect (wxID_ANY, wxEVT_PAINT, wxPaintEventHandler (FilmViewer::paint_panel), 0, this); + _panel->Connect (wxID_ANY, wxEVT_SIZE, wxSizeEventHandler (FilmViewer::panel_sized), 0, this); + _slider->Connect (wxID_ANY, wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler (FilmViewer::slider_moved), 0, this); + _slider->Connect (wxID_ANY, wxEVT_SCROLL_PAGEUP, wxScrollEventHandler (FilmViewer::slider_moved), 0, this); + _slider->Connect (wxID_ANY, wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler (FilmViewer::slider_moved), 0, this); + _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) @@ -94,29 +97,30 @@ FilmViewer::film_changed (Film::Property p) break; case Film::CONTENT: { - shared_ptr o (new DecodeOptions); - 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->OutputChanged.connect (boost::bind (&FilmViewer::decoder_changed, this)); - _decoders.video->set_subtitle_stream (_film->subtitle_stream()); + _player = _film->player (); + _player->disable_audio (); + _player->disable_subtitles (); + _player->disable_video_sync (); + + _player->Video.connect (bind (&FilmViewer::process_video, this, _1, _2, _3)); +// _player->OutputChanged.connect (boost::bind (&FilmViewer::decoder_changed, this)); calculate_sizes (); get_frame (); _panel->Refresh (); - _slider->Show (_film->content_type() == VIDEO); - _play_button->Show (_film->content_type() == VIDEO); + _v_sizer->Layout (); break; } case Film::WITH_SUBTITLES: 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; @@ -139,7 +143,6 @@ FilmViewer::set_film (shared_ptr 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); @@ -150,13 +153,19 @@ FilmViewer::set_film (shared_ptr f) void FilmViewer::decoder_changed () { - seek_and_update (_decoders.video->last_source_frame ()); + if (!_player || _player->seek_to_last ()) { + return; + } + + get_frame (); + _panel->Refresh (); + _panel->Update (); } void -FilmViewer::timer (wxTimerEvent& ev) +FilmViewer::timer (wxTimerEvent &) { - if (!_film) { + if (!_player) { return; } @@ -165,8 +174,8 @@ FilmViewer::timer (wxTimerEvent& ev) get_frame (); - if (_film->length()) { - int const new_slider_position = 4096 * _decoders.video->last_source_frame() / _film->length().get(); + if (_film->video_length()) { + int const new_slider_position = 4096 * _player->last_video_time() / (_film->video_length() / _film->video_frame_rate()); if (new_slider_position != _slider->GetValue()) { _slider->SetValue (new_slider_position); } @@ -175,18 +184,30 @@ FilmViewer::timer (wxTimerEvent& ev) void -FilmViewer::paint_panel (wxPaintEvent& ev) +FilmViewer::paint_panel (wxPaintEvent &) { wxPaintDC dc (_panel); - if (!_display_frame || !_film) { + if (_clear_required) { + dc.Clear (); + _clear_required = false; + } + + if (!_display_frame || !_film || !_out_size.width || !_out_size.height) { dc.Clear (); return; } - wxImage frame (_out_width, _out_height, _display_frame->data()[0], true); + if (_display_frame_x) { + 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, _film_size.height); + } + + wxImage frame (_film_size.width, _film_size.height, _display_frame->data()[0], true); wxBitmap frame_bitmap (frame); - dc.DrawBitmap (frame_bitmap, 0, 0); + dc.DrawBitmap (frame_bitmap, _display_frame_x, 0); if (_film->with_subtitles() && _display_sub) { wxImage sub (_display_sub->size().width, _display_sub->size().height, _display_sub->data()[0], _display_sub->alpha(), true); @@ -197,25 +218,16 @@ FilmViewer::paint_panel (wxPaintEvent& ev) void -FilmViewer::slider_moved (wxCommandEvent& ev) +FilmViewer::slider_moved (wxScrollEvent &) { - if (!_film) { + if (!_film || !_player) { return; } - if (_film->length()) { - seek_and_update (_slider->GetValue() * _film->length().get() / 4096); - } -} - -void -FilmViewer::seek_and_update (SourceFrame f) -{ - if (_decoders.video->seek (f)) { - cout << "could not s&u to " << f << "\n"; + if (_player->seek (_slider->GetValue() * _film->video_length() / (4096 * _film->video_frame_rate()))) { return; } - + get_frame (); _panel->Refresh (); _panel->Update (); @@ -224,8 +236,8 @@ FilmViewer::seek_and_update (SourceFrame f) void FilmViewer::panel_sized (wxSizeEvent& ev) { - _panel_width = ev.GetSize().GetWidth(); - _panel_height = ev.GetSize().GetHeight(); + _panel_size.width = ev.GetSize().GetWidth(); + _panel_size.height = ev.GetSize().GetHeight(); calculate_sizes (); update_from_raw (); } @@ -246,44 +258,89 @@ FilmViewer::update_from_raw () void FilmViewer::raw_to_display () { - if (!_raw_frame || !_out_width || !_out_height || !_film) { + if (!_raw_frame || _out_size.width < 64 || _out_size.height < 64 || !_film) { return; } + libdcp::Size old_size; + if (_display_frame) { + old_size = _display_frame->size(); + } + + boost::shared_ptr input = _raw_frame; + + pair 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 (Size (_out_width, _out_height), 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 0 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 (_out_width) / _film->size().width, - float (_out_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() ); _display_sub.reset (new RGBPlusAlphaImage (_raw_sub->image()->scale (tx.size(), _film->scaler(), false))); _display_sub_position = tx.position(); + _display_sub_position.x += _display_frame_x; } else { _display_sub.reset (); } +#endif } void FilmViewer::calculate_sizes () { - if (!_film) { + if (!_film || !_player) { return; } + + Format const * format = _film->format (); - float const panel_ratio = static_cast (_panel_width) / _panel_height; - float const film_ratio = _film->format() ? _film->format()->ratio_as_float(_film) : 1.78; + float const panel_ratio = static_cast (_panel_size.width) / _panel_size.height; + float const film_ratio = format ? format->container_ratio_as_float () : 1.78; + if (panel_ratio < film_ratio) { /* panel is less widscreen than the film; clamp width */ - _out_width = _panel_width; - _out_height = _out_width / film_ratio; + _out_size.width = _panel_size.width; + _out_size.height = _out_size.width / film_ratio; } else { - /* panel is more widescreen than the film; clamp heignt */ - _out_height = _panel_height; - _out_width = _out_height * film_ratio; + /* panel is more widescreen than the film; clamp height */ + _out_size.height = _panel_size.height; + _out_size.width = _out_size.height * film_ratio; + } + + /* Work out how much padding there is in terms of our display; this will be the x position + of our _display_frame. + */ + _display_frame_x = 0; + if (format) { + _display_frame_x = static_cast (format->dcp_padding (_film)) * _out_size.width / format->dcp_size().width; + } + + _film_size = _out_size; + _film_size.width -= _display_frame_x * 2; + + /* Catch silly values */ + if (_out_size.width < 64) { + _out_size.width = 64; } } @@ -301,19 +358,21 @@ FilmViewer::check_play_state () } if (_play_button->GetValue()) { - _timer.Start (1000 / _film->frames_per_second()); +// _timer.Start (1000 / _film->source_frame_rate()); } else { _timer.Stop (); } } void -FilmViewer::process_video (shared_ptr image, shared_ptr sub) +FilmViewer::process_video (shared_ptr image, bool, shared_ptr sub) { _raw_frame = image; _raw_sub = sub; raw_to_display (); + + _got_frame = true; } void @@ -321,11 +380,16 @@ FilmViewer::get_frame () { /* Clear our raw frame in case we don't get a new one */ _raw_frame.reset (); + + if (!_player) { + _display_frame.reset (); + return; + } try { - shared_ptr last = _display_frame; - while (last == _display_frame) { - if (_decoders.video->pass ()) { + _got_frame = false; + while (!_got_frame) { + if (_player->pass ()) { /* We didn't get a frame before the decoder gave up, so clear our display frame. */ @@ -334,7 +398,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)"), std_to_wx(e.what()).data())); } }