X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_panel.cc;h=7f7674c4e408a663a2fb7389304471f7d9d6b08f;hb=5d7ba3c7717288b13cb8b286474382580f3bdba9;hp=dc77bdc97cbf36d6306ef4aff2bd75ddfeb9148e;hpb=8796ee8654dfbf98290bfaaca1388e50ab962b40;p=dcpomatic.git diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc index dc77bdc97..7f7674c4e 100644 --- a/src/wx/video_panel.cc +++ b/src/wx/video_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2016 Carl Hetherington + Copyright (C) 2012-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -24,6 +24,9 @@ #include "content_colour_conversion_dialog.h" #include "content_widget.h" #include "content_panel.h" +#include "static_text.h" +#include "check_box.h" +#include "dcpomatic_button.h" #include "lib/filter.h" #include "lib/ffmpeg_content.h" #include "lib/colour_conversion.h" @@ -48,6 +51,7 @@ using boost::shared_ptr; using boost::dynamic_pointer_cast; using boost::bind; using boost::optional; +using namespace dcpomatic; static VideoContentScale index_to_scale (int n) @@ -74,16 +78,15 @@ scale_to_index (VideoContentScale scale) VideoPanel::VideoPanel (ContentPanel* p) : ContentSubPanel (p, _("Video")) { - _reference = new wxCheckBox (this, wxID_ANY, _("Use this DCP's video as OV and make VF")); - _reference_note = new wxStaticText (this, wxID_ANY, _("")); + _reference = new CheckBox (this, _("Use this DCP's video as OV and make VF")); + _reference_note = new StaticText (this, wxT("")); _reference_note->Wrap (200); wxFont font = _reference_note->GetFont(); font.SetStyle(wxFONTSTYLE_ITALIC); font.SetPointSize(font.GetPointSize() - 1); _reference_note->SetFont(font); - _grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); - _sizer->Add (_grid, 0, wxALL, 8); + _use = new wxCheckBox (this, wxID_ANY, _("Use")); _type_label = create_label (this, _("Type"), true); _frame_type = new ContentChoice ( @@ -97,9 +100,7 @@ VideoPanel::VideoPanel (ContentPanel* p) &caster ); - _crop_label = create_label (this, _("Crop"), true); - - _left_crop_label = create_label (this, _("Left"), true); + _left_crop_label = create_label (this, _("Left crop"), true); _left_crop = new ContentSpinCtrl ( this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), @@ -109,7 +110,7 @@ VideoPanel::VideoPanel (ContentPanel* p) boost::mem_fn (&VideoContent::set_left_crop) ); - _right_crop_label = create_label (this, _("Right"), true); + _right_crop_label = create_label (this, _("Right crop"), true); _right_crop = new ContentSpinCtrl ( this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), @@ -119,7 +120,7 @@ VideoPanel::VideoPanel (ContentPanel* p) boost::mem_fn (&VideoContent::set_right_crop) ); - _top_crop_label = create_label (this, _("Top"), true); + _top_crop_label = create_label (this, _("Top crop"), true); _top_crop = new ContentSpinCtrl ( this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), @@ -129,7 +130,7 @@ VideoPanel::VideoPanel (ContentPanel* p) boost::mem_fn (&VideoContent::set_top_crop) ); - _bottom_crop_label = create_label (this, _("Bottom"), true); + _bottom_crop_label = create_label (this, _("Bottom crop"), true); _bottom_crop = new ContentSpinCtrl ( this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), @@ -162,8 +163,8 @@ VideoPanel::VideoPanel (ContentPanel* p) size.SetHeight (-1); _filters_label = create_label (this, _("Filters"), true); - _filters = new wxStaticText (this, wxID_ANY, _("None"), wxDefaultPosition, size); - _filters_button = new wxButton (this, wxID_ANY, _("Edit...")); + _filters = new StaticText (this, _("None"), wxDefaultPosition, size); + _filters_button = new Button (this, _("Edit...")); _colour_conversion_label = create_label (this, _("Colour conversion"), true); _colour_conversion = new wxChoice (this, wxID_ANY, wxDefaultPosition, size); @@ -174,15 +175,20 @@ VideoPanel::VideoPanel (ContentPanel* p) /// TRANSLATORS: translate the word "Custom" here; do not include the "Colour|" prefix _colour_conversion->Append (S_("Colour|Custom")); - _edit_colour_conversion_button = new wxButton (this, wxID_ANY, _("Edit...")); + _edit_colour_conversion_button = new Button (this, _("Edit...")); + + _range_label = create_label (this, _("Range"), true); + _range = new wxChoice (this, wxID_ANY); + _range->Append (_("Full (JPEG, 0-255)")); + _range->Append (_("Video (MPEG, 16-235)")); - _description = new wxStaticText (this, wxID_ANY, wxT ("\n \n \n \n \n"), wxDefaultPosition, wxDefaultSize); + _description = new StaticText (this, wxT ("\n \n \n \n \n"), wxDefaultPosition, wxDefaultSize); _description->SetFont(font); - _left_crop->wrapped()->SetRange (0, 1024); - _top_crop->wrapped()->SetRange (0, 1024); - _right_crop->wrapped()->SetRange (0, 1024); - _bottom_crop->wrapped()->SetRange (0, 1024); + _left_crop->wrapped()->SetRange (0, 4096); + _top_crop->wrapped()->SetRange (0, 4096); + _right_crop->wrapped()->SetRange (0, 4096); + _bottom_crop->wrapped()->SetRange (0, 4096); _scale->wrapped()->Clear (); BOOST_FOREACH (VideoContentScale const & i, VideoContentScale::all ()) { @@ -202,38 +208,27 @@ VideoPanel::VideoPanel (ContentPanel* p) _fade_in->Changed.connect (boost::bind (&VideoPanel::fade_in_changed, this)); _fade_out->Changed.connect (boost::bind (&VideoPanel::fade_out_changed, this)); + _use->Bind (wxEVT_CHECKBOX, boost::bind (&VideoPanel::use_clicked, this)); _reference->Bind (wxEVT_CHECKBOX, boost::bind (&VideoPanel::reference_clicked, this)); _filters_button->Bind (wxEVT_BUTTON, boost::bind (&VideoPanel::edit_filters_clicked, this)); _colour_conversion->Bind (wxEVT_CHOICE, boost::bind (&VideoPanel::colour_conversion_changed, this)); + _range->Bind (wxEVT_CHOICE, boost::bind (&VideoPanel::range_changed, this)); _edit_colour_conversion_button->Bind (wxEVT_BUTTON, boost::bind (&VideoPanel::edit_colour_conversion_clicked, this)); - Config::instance()->Changed.connect (boost::bind (&VideoPanel::config_changed, this, _1)); - add_to_grid (); } -void -VideoPanel::config_changed (Config::Property p) -{ - if (p == Config::INTERFACE_COMPLEXITY) { - _grid->Clear (); - add_to_grid (); - _sizer->Layout (); - _grid->Layout (); - } -} - void VideoPanel::add_to_grid () { - Config::Interface const interface = Config::instance()->interface_complexity(); + bool const full = Config::instance()->interface_complexity() == Config::INTERFACE_FULL; int r = 0; - _reference->Show (interface == Config::INTERFACE_FULL); - _reference_note->Show (interface == Config::INTERFACE_FULL); + _reference->Show (full); + _reference_note->Show (full && !_reference_note->GetLabel().IsEmpty()); - if (interface == Config::INTERFACE_FULL) { + if (full) { wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL); reference_sizer->Add (_reference, 0); reference_sizer->Add (_reference_note, 0); @@ -241,16 +236,14 @@ VideoPanel::add_to_grid () ++r; } + _use->Show (full); + _grid->Add (_use, wxGBPosition(r, 0), wxGBSpan(1, 2)); + ++r; + add_label_to_sizer (_grid, _type_label, true, wxGBPosition(r, 0)); _frame_type->add (_grid, wxGBPosition(r, 1), wxGBSpan(1, 2)); ++r; - int flags = wxTOP; -#ifdef __WXOSX__ - flags |= wxALIGN_RIGHT; -#endif - _grid->Add (_crop_label, wxGBPosition(r, 0), wxDefaultSpan, flags, DCPOMATIC_SIZER_Y_GAP / 2); - int cr = 0; wxGridBagSizer* crop = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); add_label_to_sizer (crop, _left_crop_label, true, wxGBPosition (cr, 0)); @@ -262,31 +255,29 @@ VideoPanel::add_to_grid () _top_crop->add (crop, wxGBPosition (cr, 1)); add_label_to_sizer (crop, _bottom_crop_label, true, wxGBPosition (cr, 2)); _bottom_crop->add (crop, wxGBPosition (cr, 3)); - _grid->Add (crop, wxGBPosition (r, 1), wxGBSpan (2, 3)); + _grid->Add (crop, wxGBPosition (r, 0), wxGBSpan (2, 4)); r += 2; - _fade_in_label->Show (interface == Config::INTERFACE_FULL); - _fade_in->Show (interface == Config::INTERFACE_FULL); - _fade_out_label->Show (interface == Config::INTERFACE_FULL); - _fade_out->Show (interface == Config::INTERFACE_FULL); - _scale_to_label->Show (interface == Config::INTERFACE_FULL); - _scale->show (interface == Config::INTERFACE_FULL); - _filters_label->Show (interface == Config::INTERFACE_FULL); - _filters->Show (interface == Config::INTERFACE_FULL); - _filters_button->Show (interface == Config::INTERFACE_FULL); - _colour_conversion_label->Show (interface == Config::INTERFACE_FULL); - _colour_conversion->Show (interface == Config::INTERFACE_FULL); - _edit_colour_conversion_button->Show (interface == Config::INTERFACE_FULL); - - if (interface == Config::INTERFACE_FULL) { - add_label_to_sizer (_grid, _fade_in_label, true, wxGBPosition (r, 0)); - _grid->Add (_fade_in, wxGBPosition (r, 1), wxGBSpan (1, 3)); - ++r; + _scale_to_label->Show (full); + _scale->show (full); + _filters_label->Show (full); + _filters->Show (full); + _filters_button->Show (full); + _colour_conversion_label->Show (full); + _colour_conversion->Show (full); + _edit_colour_conversion_button->Show (full); + _range_label->Show (full); + _range->Show (full); + + add_label_to_sizer (_grid, _fade_in_label, true, wxGBPosition (r, 0)); + _grid->Add (_fade_in, wxGBPosition (r, 1), wxGBSpan (1, 3)); + ++r; - add_label_to_sizer (_grid, _fade_out_label, true, wxGBPosition (r, 0)); - _grid->Add (_fade_out, wxGBPosition (r, 1), wxGBSpan (1, 3)); - ++r; + add_label_to_sizer (_grid, _fade_out_label, true, wxGBPosition (r, 0)); + _grid->Add (_fade_out, wxGBPosition (r, 1), wxGBSpan (1, 3)); + ++r; + if (full) { add_label_to_sizer (_grid, _scale_to_label, true, wxGBPosition (r, 0)); _scale->add (_grid, wxGBPosition (r, 1), wxGBSpan (1, 2)); ++r; @@ -308,12 +299,36 @@ VideoPanel::add_to_grid () _grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); } ++r; + + add_label_to_sizer (_grid, _range_label, true, wxGBPosition(r, 0)); + _grid->Add (_range, wxGBPosition(r, 1), wxGBSpan(1, 2), wxALIGN_CENTER_VERTICAL); + ++r; } _grid->Add (_description, wxGBPosition (r, 0), wxGBSpan (1, 4), wxEXPAND | wxALIGN_CENTER_VERTICAL, 6); ++r; } +void +VideoPanel::range_changed () +{ + ContentList vc = _parent->selected_video (); + if (vc.size() != 1) { + return; + } + + switch (_range->GetSelection()) { + case 0: + vc.front()->video->set_range (VIDEO_RANGE_FULL); + break; + case 1: + vc.front()->video->set_range (VIDEO_RANGE_VIDEO); + break; + default: + DCPOMATIC_ASSERT (false); + } +} + void VideoPanel::film_changed (Film::Property property) @@ -321,11 +336,9 @@ VideoPanel::film_changed (Film::Property property) switch (property) { case Film::VIDEO_FRAME_RATE: case Film::CONTAINER: - setup_description (); - setup_sensitivity (); - break; case Film::RESOLUTION: setup_description (); + setup_sensitivity (); break; case Film::REEL_TYPE: case Film::INTEROP: @@ -379,6 +392,19 @@ VideoPanel::film_content_changed (int property) checked_set (_filters, p); } } + } else if (property == VideoContentProperty::USE) { + set check; + BOOST_FOREACH (shared_ptr i, vc) { + check.insert (i->video->use()); + } + + if (check.size() == 1) { + checked_set (_use, vc.front()->video->use()); + } else { + checked_set (_use, false); + } + + setup_sensitivity (); } else if (property == VideoContentProperty::FADE_IN) { set check; BOOST_FOREACH (shared_ptr i, vc) { @@ -387,8 +413,8 @@ VideoPanel::film_content_changed (int property) if (check.size() == 1) { _fade_in->set ( - ContentTime::from_frames (vc.front()->video->fade_in (), vc.front()->active_video_frame_rate ()), - vc.front()->active_video_frame_rate () + ContentTime::from_frames (vc.front()->video->fade_in(), vc.front()->active_video_frame_rate(_parent->film())), + vc.front()->active_video_frame_rate(_parent->film()) ); } else { _fade_in->clear (); @@ -401,8 +427,8 @@ VideoPanel::film_content_changed (int property) if (check.size() == 1) { _fade_out->set ( - ContentTime::from_frames (vc.front()->video->fade_out (), vc.front()->active_video_frame_rate ()), - vc.front()->active_video_frame_rate () + ContentTime::from_frames (vc.front()->video->fade_out(), vc.front()->active_video_frame_rate(_parent->film())), + vc.front()->active_video_frame_rate(_parent->film()) ); } else { _fade_out->clear (); @@ -415,6 +441,14 @@ VideoPanel::film_content_changed (int property) checked_set (_reference, false); } + setup_sensitivity (); + } else if (property == VideoContentProperty::RANGE) { + if (vcs) { + checked_set (_range, vcs->video->range() == VIDEO_RANGE_FULL ? 0 : 1); + } else { + checked_set (_range, 0); + } + setup_sensitivity (); } } @@ -446,7 +480,7 @@ VideoPanel::setup_description () return; } - string d = vc.front()->video->processing_description (); + string d = vc.front()->video->processing_description (_parent->film()); size_t lines = count (d.begin(), d.end(), '\n'); for (int i = lines; i < 6; ++i) { @@ -513,6 +547,8 @@ VideoPanel::content_selection_changed () film_content_changed (VideoContentProperty::COLOUR_CONVERSION); film_content_changed (VideoContentProperty::FADE_IN); film_content_changed (VideoContentProperty::FADE_OUT); + film_content_changed (VideoContentProperty::RANGE); + film_content_changed (VideoContentProperty::USE); film_content_changed (FFmpegContentProperty::FILTERS); film_content_changed (DCPContentProperty::REFERENCE_VIDEO); @@ -530,10 +566,20 @@ VideoPanel::setup_sensitivity () } string why_not; - bool const can_reference = dcp && dcp->can_reference_video (why_not); - setup_refer_button (_reference, _reference_note, dcp, can_reference, why_not); + bool const can_reference = dcp && dcp->can_reference_video (_parent->film(), why_not); + wxString cannot; + if (why_not.empty()) { + cannot = _("Cannot reference this DCP's video."); + } else { + cannot = _("Cannot reference this DCP's video: ") + std_to_wx(why_not); + } + setup_refer_button (_reference, _reference_note, dcp, can_reference, cannot); + + bool const enable = !_reference->GetValue() && _use->GetValue(); - if (_reference->GetValue ()) { + _use->Enable (!_reference->GetValue()); + + if (!enable) { _frame_type->wrapped()->Enable (false); _left_crop->wrapped()->Enable (false); _right_crop->wrapped()->Enable (false); @@ -546,6 +592,7 @@ VideoPanel::setup_sensitivity () _filters->Enable (false); _filters_button->Enable (false); _colour_conversion->Enable (false); + _range->Enable (false); } else { ContentList video_sel = _parent->selected_video (); FFmpegContentList ffmpeg_sel = _parent->selected_ffmpeg (); @@ -563,6 +610,7 @@ VideoPanel::setup_sensitivity () _filters->Enable (true); _filters_button->Enable (single && !ffmpeg_sel.empty ()); _colour_conversion->Enable (single && !video_sel.empty ()); + _range->Enable (single && !video_sel.empty()); } ContentList vc = _parent->selected_video (); @@ -582,8 +630,8 @@ void VideoPanel::fade_in_changed () { BOOST_FOREACH (shared_ptr i, _parent->selected_video ()) { - int const vfr = _parent->film()->video_frame_rate (); - i->video->set_fade_in (_fade_in->get (vfr).frames_round (vfr)); + double const vfr = i->active_video_frame_rate (_parent->film()); + i->video->set_fade_in (_fade_in->get(vfr).frames_round(vfr)); } } @@ -591,8 +639,16 @@ void VideoPanel::fade_out_changed () { BOOST_FOREACH (shared_ptr i, _parent->selected_video ()) { - int const vfr = _parent->film()->video_frame_rate (); - i->video->set_fade_out (_fade_out->get (vfr).frames_round (vfr)); + double const vfr = i->active_video_frame_rate (_parent->film()); + i->video->set_fade_out (_fade_out->get(vfr).frames_round(vfr)); + } +} + +void +VideoPanel::use_clicked () +{ + BOOST_FOREACH (shared_ptr i, _parent->selected_video()) { + i->video->set_use (_use->GetValue()); } }