X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_panel.cc;h=a0775023c147d29c9cfe9f9da8550771ed074ad3;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=fad824727074574ad0ef9f71f23c94f6237de415;hpb=e6f28e7cda23c1ba3c49cc1bf2dc1491c2f87160;p=dcpomatic.git diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc index fad824727..a0775023c 100644 --- a/src/wx/video_panel.cc +++ b/src/wx/video_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,25 +17,29 @@ */ -#include #include "lib/filter.h" #include "lib/ffmpeg_content.h" #include "lib/colour_conversion.h" #include "lib/config.h" #include "lib/util.h" #include "lib/ratio.h" +#include "lib/frame_rate_change.h" #include "filter_dialog.h" #include "video_panel.h" #include "wx_util.h" -#include "film_editor.h" #include "content_colour_conversion_dialog.h" #include "content_widget.h" +#include "content_panel.h" +#include +#include +#include using std::vector; using std::string; using std::pair; using std::cout; using std::list; +using std::set; using boost::shared_ptr; using boost::dynamic_pointer_cast; using boost::bind; @@ -45,8 +49,8 @@ static VideoContentScale index_to_scale (int n) { vector scales = VideoContentScale::all (); - assert (n >= 0); - assert (n < int (scales.size ())); + DCPOMATIC_ASSERT (n >= 0); + DCPOMATIC_ASSERT (n < int (scales.size ())); return scales[n]; } @@ -60,11 +64,11 @@ scale_to_index (VideoContentScale scale) } } - assert (false); + DCPOMATIC_ASSERT (false); } -VideoPanel::VideoPanel (FilmEditor* e) - : FilmEditorPanel (e, _("Video")) +VideoPanel::VideoPanel (ContentPanel* p) + : ContentSubPanel (p, _("Video")) { wxGridBagSizer* grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); _sizer->Add (grid, 0, wxALL, 8); @@ -81,10 +85,15 @@ VideoPanel::VideoPanel (FilmEditor* e) &caster, &caster ); - _frame_type->add (grid, wxGBPosition (r, 1)); + _frame_type->add (grid, wxGBPosition (r, 1), wxGBSpan (1, 2)); ++r; - - add_label_to_grid_bag_sizer (grid, this, _("Left crop"), true, wxGBPosition (r, 0)); + + add_label_to_grid_bag_sizer (grid, this, _("Crop"), true, wxGBPosition (r, 0)); + + int cr = 0; + wxGridBagSizer* crop = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + + add_label_to_grid_bag_sizer (crop, this, _("Left"), true, wxGBPosition (cr, 0)); _left_crop = new ContentSpinCtrl ( this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), @@ -92,10 +101,9 @@ VideoPanel::VideoPanel (FilmEditor* e) boost::mem_fn (&VideoContent::left_crop), boost::mem_fn (&VideoContent::set_left_crop) ); - _left_crop->add (grid, wxGBPosition (r, 1)); - ++r; + _left_crop->add (crop, wxGBPosition (cr, 1)); - add_label_to_grid_bag_sizer (grid, this, _("Right crop"), true, wxGBPosition (r, 0)); + add_label_to_grid_bag_sizer (crop, this, _("Right"), true, wxGBPosition (cr, 2)); _right_crop = new ContentSpinCtrl ( this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), @@ -103,10 +111,11 @@ VideoPanel::VideoPanel (FilmEditor* e) boost::mem_fn (&VideoContent::right_crop), boost::mem_fn (&VideoContent::set_right_crop) ); - _right_crop->add (grid, wxGBPosition (r, 1)); - ++r; - - add_label_to_grid_bag_sizer (grid, this, _("Top crop"), true, wxGBPosition (r, 0)); + _right_crop->add (crop, wxGBPosition (cr, 3)); + + ++cr; + + add_label_to_grid_bag_sizer (crop, this, _("Top"), true, wxGBPosition (cr, 0)); _top_crop = new ContentSpinCtrl ( this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), @@ -114,10 +123,9 @@ VideoPanel::VideoPanel (FilmEditor* e) boost::mem_fn (&VideoContent::top_crop), boost::mem_fn (&VideoContent::set_top_crop) ); - _top_crop->add (grid, wxGBPosition (r,1 )); - ++r; - - add_label_to_grid_bag_sizer (grid, this, _("Bottom crop"), true, wxGBPosition (r, 0)); + _top_crop->add (crop, wxGBPosition (cr, 1)); + + add_label_to_grid_bag_sizer (crop, this, _("Bottom"), true, wxGBPosition (cr, 2)); _bottom_crop = new ContentSpinCtrl ( this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), @@ -125,7 +133,19 @@ VideoPanel::VideoPanel (FilmEditor* e) boost::mem_fn (&VideoContent::bottom_crop), boost::mem_fn (&VideoContent::set_bottom_crop) ); - _bottom_crop->add (grid, wxGBPosition (r, 1)); + _bottom_crop->add (crop, wxGBPosition (cr, 3)); + + grid->Add (crop, wxGBPosition (r, 1), wxGBSpan (2, 3)); + r += 2; + + add_label_to_grid_bag_sizer (grid, this, _("Fade in"), true, wxGBPosition (r, 0)); + _fade_in = new Timecode (this); + grid->Add (_fade_in, wxGBPosition (r, 1), wxGBSpan (1, 3)); + ++r; + + add_label_to_grid_bag_sizer (grid, this, _("Fade out"), true, wxGBPosition (r, 0)); + _fade_out = new Timecode (this); + grid->Add (_fade_out, wxGBPosition (r, 1), wxGBSpan (1, 3)); ++r; add_label_to_grid_bag_sizer (grid, this, _("Scale to"), true, wxGBPosition (r, 0)); @@ -138,44 +158,47 @@ VideoPanel::VideoPanel (FilmEditor* e) &index_to_scale, &scale_to_index ); - _scale->add (grid, wxGBPosition (r, 1)); + _scale->add (grid, wxGBPosition (r, 1), wxGBSpan (1, 2)); ++r; + wxClientDC dc (this); + wxSize size = dc.GetTextExtent (wxT ("A quite long name")); + size.SetHeight (-1); + + add_label_to_grid_bag_sizer (grid, this, _("Filters"), true, wxGBPosition (r, 0)); { - add_label_to_grid_bag_sizer (grid, this, _("Filters"), true, wxGBPosition (r, 0)); wxSizer* s = new wxBoxSizer (wxHORIZONTAL); - wxClientDC dc (this); - wxSize size = dc.GetTextExtent (wxT ("A quite long name")); - size.SetHeight (-1); - _filters = new wxStaticText (this, wxID_ANY, _("None"), wxDefaultPosition, size); s->Add (_filters, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6); _filters_button = new wxButton (this, wxID_ANY, _("Edit...")); s->Add (_filters_button, 0, wxALIGN_CENTER_VERTICAL); + grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); } ++r; - + + add_label_to_grid_bag_sizer (grid, this, _("Colour conversion"), true, wxGBPosition (r, 0)); { - add_label_to_grid_bag_sizer (grid, this, _("Colour conversion"), true, wxGBPosition (r, 0)); wxSizer* s = new wxBoxSizer (wxHORIZONTAL); - wxClientDC dc (this); - wxSize size = dc.GetTextExtent (wxT ("A quite long name")); - size.SetHeight (-1); - - _colour_conversion = new wxStaticText (this, wxID_ANY, wxT (""), wxDefaultPosition, size); - + _colour_conversion = new wxChoice (this, wxID_ANY, wxDefaultPosition, size); + _colour_conversion->Append (_("None")); + BOOST_FOREACH (PresetColourConversion const & i, PresetColourConversion::all()) { + _colour_conversion->Append (std_to_wx (i.name)); + } + _colour_conversion->Append (_("Custom")); s->Add (_colour_conversion, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6); - _colour_conversion_button = new wxButton (this, wxID_ANY, _("Edit...")); - s->Add (_colour_conversion_button, 0, wxALIGN_CENTER_VERTICAL); + + _edit_colour_conversion_button = new wxButton (this, wxID_ANY, _("Edit...")); + s->Add (_edit_colour_conversion_button, 0, wxALIGN_CENTER_VERTICAL); + grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); } ++r; _description = new wxStaticText (this, wxID_ANY, wxT ("\n \n \n \n \n"), wxDefaultPosition, wxDefaultSize); - grid->Add (_description, wxGBPosition (r, 0), wxGBSpan (1, 2), wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 6); + grid->Add (_description, wxGBPosition (r, 0), wxGBSpan (1, 4), wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 6); wxFont font = _description->GetFont(); font.SetStyle(wxFONTSTYLE_ITALIC); font.SetPointSize(font.GetPointSize() - 1); @@ -197,9 +220,15 @@ VideoPanel::VideoPanel (FilmEditor* e) _frame_type->wrapped()->Append (_("3D left/right")); _frame_type->wrapped()->Append (_("3D top/bottom")); _frame_type->wrapped()->Append (_("3D alternate")); + _frame_type->wrapped()->Append (_("3D left only")); + _frame_type->wrapped()->Append (_("3D right only")); + + _fade_in->Changed.connect (boost::bind (&VideoPanel::fade_in_changed, this)); + _fade_out->Changed.connect (boost::bind (&VideoPanel::fade_out_changed, this)); - _filters_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&VideoPanel::edit_filters_clicked, this)); - _colour_conversion_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&VideoPanel::edit_colour_conversion_clicked, this)); + _filters_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&VideoPanel::edit_filters_clicked, this)); + _colour_conversion->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&VideoPanel::colour_conversion_changed, this)); + _edit_colour_conversion_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&VideoPanel::edit_colour_conversion_clicked, this)); } void @@ -219,14 +248,14 @@ VideoPanel::film_changed (Film::Property property) void VideoPanel::film_content_changed (int property) { - VideoContentList vc = _editor->selected_video_content (); + VideoContentList vc = _parent->selected_video (); shared_ptr vcs; shared_ptr fcs; if (!vc.empty ()) { vcs = vc.front (); fcs = dynamic_pointer_cast (vcs); } - + if (property == VideoContentProperty::VIDEO_FRAME_TYPE) { setup_description (); } else if (property == VideoContentProperty::VIDEO_CROP) { @@ -236,18 +265,57 @@ VideoPanel::film_content_changed (int property) } else if (property == VideoContentProperty::VIDEO_FRAME_RATE) { setup_description (); } else if (property == VideoContentProperty::COLOUR_CONVERSION) { - optional preset = vcs ? vcs->colour_conversion().preset () : optional (); - vector cc = Config::instance()->colour_conversions (); - _colour_conversion->SetLabel (preset ? std_to_wx (cc[preset.get()].name) : _("Custom")); + if (!vcs) { + checked_set (_colour_conversion, 0); + _edit_colour_conversion_button->Enable (false); + } else if (vcs->colour_conversion ()) { + optional preset = vcs->colour_conversion().get().preset (); + vector cc = PresetColourConversion::all (); + if (preset) { + checked_set (_colour_conversion, preset.get() + 1); + _edit_colour_conversion_button->Enable (false); + } else { + checked_set (_colour_conversion, cc.size() + 1); + _edit_colour_conversion_button->Enable (true); + } + } else { + checked_set (_colour_conversion, 0); + _edit_colour_conversion_button->Enable (false); + } } else if (property == FFmpegContentProperty::FILTERS) { if (fcs) { - string const p = Filter::ffmpeg_string (fcs->filters ()); + string p = Filter::ffmpeg_string (fcs->filters ()); if (p.empty ()) { - _filters->SetLabel (_("None")); + checked_set (_filters, _("None")); } else { - _filters->SetLabel (std_to_wx (p)); + if (p.length() > 25) { + p = p.substr (0, 25) + "..."; + } + checked_set (_filters, p); } } + } else if (property == VideoContentProperty::VIDEO_FADE_IN) { + set check; + for (VideoContentList::const_iterator i = vc.begin (); i != vc.end(); ++i) { + check.insert ((*i)->fade_in ()); + } + + if (check.size() == 1) { + _fade_in->set (ContentTime::from_frames (vc.front()->fade_in (), vc.front()->video_frame_rate ()), vc.front()->video_frame_rate ()); + } else { + _fade_in->clear (); + } + } else if (property == VideoContentProperty::VIDEO_FADE_OUT) { + set check; + for (VideoContentList::const_iterator i = vc.begin (); i != vc.end(); ++i) { + check.insert ((*i)->fade_out ()); + } + + if (check.size() == 1) { + _fade_out->set (ContentTime::from_frames (vc.front()->fade_out (), vc.front()->video_frame_rate ()), vc.front()->video_frame_rate ()); + } else { + _fade_out->clear (); + } } } @@ -255,7 +323,7 @@ VideoPanel::film_content_changed (int property) void VideoPanel::edit_filters_clicked () { - FFmpegContentList c = _editor->selected_ffmpeg_content (); + FFmpegContentList c = _parent->selected_ffmpeg (); if (c.size() != 1) { return; } @@ -269,90 +337,57 @@ VideoPanel::edit_filters_clicked () void VideoPanel::setup_description () { - VideoContentList vc = _editor->selected_video_content (); + VideoContentList vc = _parent->selected_video (); if (vc.empty ()) { - _description->SetLabel (""); + checked_set (_description, wxT ("")); return; } else if (vc.size() > 1) { - _description->SetLabel (_("Multiple content selected")); + checked_set (_description, _("Multiple content selected")); return; } - shared_ptr vcs = vc.front (); - - wxString d; + string d = vc.front()->processing_description (); + size_t lines = count (d.begin(), d.end(), '\n'); - int lines = 0; - - if (vcs->video_size().width && vcs->video_size().height) { - d << wxString::Format ( - _("Content video is %dx%d (%.2f:1)\n"), - vcs->video_size_after_3d_split().width, - vcs->video_size_after_3d_split().height, - vcs->video_size_after_3d_split().ratio () - ); - ++lines; - } - - Crop const crop = vcs->crop (); - if ((crop.left || crop.right || crop.top || crop.bottom) && vcs->video_size() != dcp::Size (0, 0)) { - dcp::Size cropped = vcs->video_size_after_crop (); - d << wxString::Format ( - _("Cropped to %dx%d (%.2f:1)\n"), - cropped.width, cropped.height, - cropped.ratio () - ); - ++lines; + for (int i = lines; i < 6; ++i) { + d += "\n "; } - dcp::Size const container_size = _editor->film()->frame_size (); - dcp::Size const scaled = vcs->scale().size (vcs, container_size, container_size); + checked_set (_description, d); + _sizer->Layout (); +} - if (scaled != vcs->video_size_after_crop ()) { - d << wxString::Format ( - _("Scaled to %dx%d (%.2f:1)\n"), - scaled.width, scaled.height, - scaled.ratio () - ); - ++lines; - } - - if (scaled != container_size) { - d << wxString::Format ( - _("Padded with black to %dx%d (%.2f:1)\n"), - container_size.width, container_size.height, - container_size.ratio () - ); - ++lines; +void +VideoPanel::colour_conversion_changed () +{ + VideoContentList vc = _parent->selected_video (); + if (vc.size() != 1) { + return; } - d << wxString::Format (_("Content frame rate %.4f\n"), vcs->video_frame_rate ()); - ++lines; - FrameRateChange frc (vcs->video_frame_rate(), _editor->film()->video_frame_rate ()); - d << std_to_wx (frc.description) << "\n"; - ++lines; + int const s = _colour_conversion->GetSelection (); + vector all = PresetColourConversion::all (); - for (int i = lines; i < 6; ++i) { - d << wxT ("\n "); + if (s == 0) { + vc.front()->unset_colour_conversion (); + } else if (s == int (all.size() + 1)) { + edit_colour_conversion_clicked (); + } else { + vc.front()->set_colour_conversion (all[s - 1].conversion); } - - _description->SetLabel (d); - _sizer->Layout (); } void VideoPanel::edit_colour_conversion_clicked () { - VideoContentList vc = _editor->selected_video_content (); + VideoContentList vc = _parent->selected_video (); if (vc.size() != 1) { return; } - ColourConversion conversion = vc.front()->colour_conversion (); ContentColourConversionDialog* d = new ContentColourConversionDialog (this); - d->set (conversion); + d->set (vc.front()->colour_conversion().get_value_or (PresetColourConversion::all().front ().conversion)); d->ShowModal (); - vc.front()->set_colour_conversion (d->get ()); d->Destroy (); } @@ -360,22 +395,46 @@ VideoPanel::edit_colour_conversion_clicked () void VideoPanel::content_selection_changed () { - VideoContentList sel = _editor->selected_video_content (); - bool const single = sel.size() == 1; + VideoContentList video_sel = _parent->selected_video (); + FFmpegContentList ffmpeg_sel = _parent->selected_ffmpeg (); - _left_crop->set_content (sel); - _right_crop->set_content (sel); - _top_crop->set_content (sel); - _bottom_crop->set_content (sel); - _frame_type->set_content (sel); - _scale->set_content (sel); + bool const single = video_sel.size() == 1; - /* Things that are only allowed with single selections */ - _filters_button->Enable (single); - _colour_conversion_button->Enable (single); + _frame_type->set_content (video_sel); + _left_crop->set_content (video_sel); + _right_crop->set_content (video_sel); + _top_crop->set_content (video_sel); + _bottom_crop->set_content (video_sel); + _fade_in->Enable (!video_sel.empty ()); + _fade_out->Enable (!video_sel.empty ()); + _scale->set_content (video_sel); + + _filters_button->Enable (single && !ffmpeg_sel.empty ()); film_content_changed (VideoContentProperty::VIDEO_CROP); film_content_changed (VideoContentProperty::VIDEO_FRAME_RATE); film_content_changed (VideoContentProperty::COLOUR_CONVERSION); + film_content_changed (VideoContentProperty::VIDEO_FADE_IN); + film_content_changed (VideoContentProperty::VIDEO_FADE_OUT); film_content_changed (FFmpegContentProperty::FILTERS); } + +void +VideoPanel::fade_in_changed () +{ + VideoContentList vc = _parent->selected_video (); + for (VideoContentList::const_iterator i = vc.begin(); i != vc.end(); ++i) { + int const vfr = _parent->film()->video_frame_rate (); + (*i)->set_fade_in (_fade_in->get (vfr).frames (vfr)); + } +} + +void +VideoPanel::fade_out_changed () +{ + VideoContentList vc = _parent->selected_video (); + for (VideoContentList::const_iterator i = vc.begin(); i != vc.end(); ++i) { + int const vfr = _parent->film()->video_frame_rate (); + (*i)->set_fade_out (_fade_out->get (vfr).frames (vfr)); + } +}