#include <wx/spinctrl.h>
#include "lib/ratio.h"
#include "lib/filter.h"
+#include "lib/ffmpeg_content.h"
+#include "lib/colour_conversion.h"
+#include "lib/config.h"
+#include "lib/util.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"
using std::vector;
using std::string;
using std::pair;
using std::cout;
+using std::list;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::bind;
+using boost::optional;
+
+static Ratio const *
+index_to_ratio (int n)
+{
+ assert (n >= 0);
+
+ vector<Ratio const *> ratios = Ratio::all ();
+ if (n >= int (ratios.size ())) {
+ return 0;
+ }
+
+ return ratios[n];
+}
+
+static int
+ratio_to_index (Ratio const * r)
+{
+ vector<Ratio const *> ratios = Ratio::all ();
+ size_t i = 0;
+ while (i < ratios.size() && ratios[i] != r) {
+ ++i;
+ }
+
+ return i;
+}
VideoPanel::VideoPanel (FilmEditor* e)
: FilmEditorPanel (e, _("Video"))
int r = 0;
add_label_to_grid_bag_sizer (grid, this, _("Type"), true, wxGBPosition (r, 0));
- _frame_type = new wxChoice (this, wxID_ANY);
- grid->Add (_frame_type, wxGBPosition (r, 1));
+ _frame_type = new ContentChoice<VideoContent, VideoFrameType> (
+ this,
+ new wxChoice (this, wxID_ANY),
+ VideoContentProperty::VIDEO_FRAME_TYPE,
+ boost::mem_fn (&VideoContent::video_frame_type),
+ boost::mem_fn (&VideoContent::set_video_frame_type),
+ &caster<int, VideoFrameType>,
+ &caster<VideoFrameType, int>
+ );
+ _frame_type->add (grid, wxGBPosition (r, 1));
++r;
add_label_to_grid_bag_sizer (grid, this, _("Left crop"), true, wxGBPosition (r, 0));
- _left_crop = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
- grid->Add (_left_crop, wxGBPosition (r, 1));
+ _left_crop = new ContentSpinCtrl<VideoContent> (
+ this,
+ new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
+ VideoContentProperty::VIDEO_CROP,
+ boost::mem_fn (&VideoContent::left_crop),
+ boost::mem_fn (&VideoContent::set_left_crop)
+ );
+ _left_crop->add (grid, wxGBPosition (r, 1));
++r;
add_label_to_grid_bag_sizer (grid, this, _("Right crop"), true, wxGBPosition (r, 0));
- _right_crop = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
- grid->Add (_right_crop, wxGBPosition (r, 1));
+ _right_crop = new ContentSpinCtrl<VideoContent> (
+ this,
+ new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
+ VideoContentProperty::VIDEO_CROP,
+ 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));
- _top_crop = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
- grid->Add (_top_crop, wxGBPosition (r, 1));
+ _top_crop = new ContentSpinCtrl<VideoContent> (
+ this,
+ new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
+ VideoContentProperty::VIDEO_CROP,
+ 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));
- _bottom_crop = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
- grid->Add (_bottom_crop, wxGBPosition (r, 1));
+ _bottom_crop = new ContentSpinCtrl<VideoContent> (
+ this,
+ new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
+ VideoContentProperty::VIDEO_CROP,
+ boost::mem_fn (&VideoContent::bottom_crop),
+ boost::mem_fn (&VideoContent::set_bottom_crop)
+ );
+ _bottom_crop->add (grid, wxGBPosition (r, 1));
++r;
add_label_to_grid_bag_sizer (grid, this, _("Scale to"), true, wxGBPosition (r, 0));
- _ratio = new wxChoice (this, wxID_ANY);
- grid->Add (_ratio, wxGBPosition (r, 1));
- ++r;
-
- _scaling_description = new wxStaticText (this, wxID_ANY, wxT ("\n \n \n \n"), wxDefaultPosition, wxDefaultSize);
- grid->Add (_scaling_description, wxGBPosition (r, 0), wxGBSpan (1, 2), wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 6);
- wxFont font = _scaling_description->GetFont();
- font.SetStyle(wxFONTSTYLE_ITALIC);
- font.SetPointSize(font.GetPointSize() - 1);
- _scaling_description->SetFont(font);
+ _ratio = new ContentChoice<VideoContent, Ratio const *> (
+ this,
+ new wxChoice (this, wxID_ANY),
+ VideoContentProperty::VIDEO_RATIO,
+ boost::mem_fn (&VideoContent::ratio),
+ boost::mem_fn (&VideoContent::set_ratio),
+ &index_to_ratio,
+ &ratio_to_index
+ );
+ _ratio->add (grid, wxGBPosition (r, 1));
++r;
{
add_label_to_grid_bag_sizer (grid, this, _("Filters"), true, wxGBPosition (r, 0));
wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- _filters = new wxStaticText (this, wxID_ANY, _("None"));
+
+ 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));
+ wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- _left_crop->SetRange (0, 1024);
- _top_crop->SetRange (0, 1024);
- _right_crop->SetRange (0, 1024);
- _bottom_crop->SetRange (0, 1024);
-
- vector<Ratio const *> ratios = Ratio::all ();
- _ratio->Clear ();
- for (vector<Ratio const *>::iterator i = ratios.begin(); i != ratios.end(); ++i) {
- _ratio->Append (std_to_wx ((*i)->nickname ()));
- }
-
- _frame_type->Append (_("2D"));
- _frame_type->Append (_("3D left/right"));
-
- _frame_type->Bind (wxEVT_COMMAND_CHOICE_SELECTED, bind (&VideoPanel::frame_type_changed, this));
- _left_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (VideoPanel::left_crop_changed), 0, this);
- _right_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (VideoPanel::right_crop_changed), 0, this);
- _top_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (VideoPanel::top_crop_changed), 0, this);
- _bottom_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (VideoPanel::bottom_crop_changed), 0, this);
- _ratio->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (VideoPanel::ratio_changed), 0, this);
- _filters_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (VideoPanel::edit_filters_clicked), 0, this);
-}
-
+ 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);
-/** Called when the left crop widget has been changed */
-void
-VideoPanel::left_crop_changed (wxCommandEvent &)
-{
- shared_ptr<VideoContent> c = _editor->selected_video_content ();
- if (!c) {
- return;
+ 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);
+ grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
}
+ ++r;
- c->set_left_crop (_left_crop->GetValue ());
-}
-
-/** Called when the right crop widget has been changed */
-void
-VideoPanel::right_crop_changed (wxCommandEvent &)
-{
- shared_ptr<VideoContent> c = _editor->selected_video_content ();
- if (!c) {
- return;
- }
+ _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);
+ wxFont font = _description->GetFont();
+ font.SetStyle(wxFONTSTYLE_ITALIC);
+ font.SetPointSize(font.GetPointSize() - 1);
+ _description->SetFont(font);
+ ++r;
- c->set_right_crop (_right_crop->GetValue ());
-}
+ _left_crop->wrapped()->SetRange (0, 1024);
+ _top_crop->wrapped()->SetRange (0, 1024);
+ _right_crop->wrapped()->SetRange (0, 1024);
+ _bottom_crop->wrapped()->SetRange (0, 1024);
-/** Called when the top crop widget has been changed */
-void
-VideoPanel::top_crop_changed (wxCommandEvent &)
-{
- shared_ptr<VideoContent> c = _editor->selected_video_content ();
- if (!c) {
- return;
+ vector<Ratio const *> ratios = Ratio::all ();
+ _ratio->wrapped()->Clear ();
+ for (vector<Ratio const *>::iterator i = ratios.begin(); i != ratios.end(); ++i) {
+ _ratio->wrapped()->Append (std_to_wx ((*i)->nickname ()));
}
+ _ratio->wrapped()->Append (_("No stretch"));
- c->set_top_crop (_top_crop->GetValue ());
-}
+ _frame_type->wrapped()->Append (_("2D"));
+ _frame_type->wrapped()->Append (_("3D left/right"));
+ _frame_type->wrapped()->Append (_("3D top/bottom"));
-/** Called when the bottom crop value has been changed */
-void
-VideoPanel::bottom_crop_changed (wxCommandEvent &)
-{
- shared_ptr<VideoContent> c = _editor->selected_video_content ();
- if (!c) {
- return;
- }
-
- c->set_bottom_crop (_bottom_crop->GetValue ());
+ _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));
}
void
{
switch (property) {
case Film::CONTAINER:
- setup_scaling_description ();
+ case Film::VIDEO_FRAME_RATE:
+ case Film::RESOLUTION:
+ setup_description ();
break;
default:
break;
}
void
-VideoPanel::film_content_changed (shared_ptr<Content> c, int property)
+VideoPanel::film_content_changed (int property)
{
- shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (c);
- shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (c);
-
+ VideoContentList vc = _editor->selected_video_content ();
+ shared_ptr<VideoContent> vcs;
+ shared_ptr<FFmpegContent> fcs;
+ if (!vc.empty ()) {
+ vcs = vc.front ();
+ fcs = dynamic_pointer_cast<FFmpegContent> (vcs);
+ }
+
if (property == VideoContentProperty::VIDEO_FRAME_TYPE) {
- checked_set (_frame_type, vc ? vc->video_frame_type () : VIDEO_FRAME_TYPE_2D);
+ setup_description ();
} else if (property == VideoContentProperty::VIDEO_CROP) {
- checked_set (_left_crop, vc ? vc->crop().left : 0);
- checked_set (_right_crop, vc ? vc->crop().right : 0);
- checked_set (_top_crop, vc ? vc->crop().top : 0);
- checked_set (_bottom_crop, vc ? vc->crop().bottom : 0);
- setup_scaling_description ();
+ setup_description ();
} else if (property == VideoContentProperty::VIDEO_RATIO) {
- if (vc) {
- int n = 0;
- vector<Ratio const *> ratios = Ratio::all ();
- vector<Ratio const *>::iterator i = ratios.begin ();
- while (i != ratios.end() && *i != vc->ratio()) {
- ++i;
- ++n;
- }
-
- if (i == ratios.end()) {
- checked_set (_ratio, -1);
- } else {
- checked_set (_ratio, n);
- }
- } else {
- checked_set (_ratio, -1);
- }
- setup_scaling_description ();
+ setup_description ();
+ } else if (property == VideoContentProperty::VIDEO_FRAME_RATE) {
+ setup_description ();
+ } else if (property == VideoContentProperty::COLOUR_CONVERSION) {
+ optional<size_t> preset = vcs ? vcs->colour_conversion().preset () : optional<size_t> ();
+ vector<PresetColourConversion> cc = Config::instance()->colour_conversions ();
+ _colour_conversion->SetLabel (preset ? std_to_wx (cc[preset.get()].name) : _("Custom"));
} else if (property == FFmpegContentProperty::FILTERS) {
- if (fc) {
- pair<string, string> p = Filter::ffmpeg_strings (fc->filters ());
+ if (fcs) {
+ pair<string, string> p = Filter::ffmpeg_strings (fcs->filters ());
if (p.first.empty () && p.second.empty ()) {
_filters->SetLabel (_("None"));
} else {
/** Called when the `Edit filters' button has been clicked */
void
-VideoPanel::edit_filters_clicked (wxCommandEvent &)
+VideoPanel::edit_filters_clicked ()
{
- shared_ptr<Content> c = _editor->selected_content ();
- if (!c) {
+ FFmpegContentList c = _editor->selected_ffmpeg_content ();
+ if (c.size() != 1) {
return;
}
- shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (c);
- if (!fc) {
- return;
- }
-
- FilterDialog* d = new FilterDialog (this, fc->filters());
- d->ActiveChanged.connect (bind (&FFmpegContent::set_filters, fc, _1));
+ FilterDialog* d = new FilterDialog (this, c.front()->filters());
+ d->ActiveChanged.connect (bind (&FFmpegContent::set_filters, c.front(), _1));
d->ShowModal ();
d->Destroy ();
}
void
-VideoPanel::setup_scaling_description ()
+VideoPanel::setup_description ()
{
- shared_ptr<VideoContent> vc = _editor->selected_video_content ();
- if (!vc) {
- _scaling_description->SetLabel ("");
+ VideoContentList vc = _editor->selected_video_content ();
+ if (vc.empty ()) {
+ _description->SetLabel ("");
+ return;
+ } else if (vc.size() > 1) {
+ _description->SetLabel (_("Multiple content selected"));
return;
}
+ shared_ptr<VideoContent> vcs = vc.front ();
+
wxString d;
int lines = 0;
- if (vc->video_size().width && vc->video_size().height) {
+ if (vcs->video_size().width && vcs->video_size().height) {
d << wxString::Format (
- _("Original video is %dx%d (%.2f:1)\n"),
- vc->video_size().width, vc->video_size().height,
- float (vc->video_size().width) / vc->video_size().height
+ _("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 = vc->crop ();
- if ((crop.left || crop.right || crop.top || crop.bottom) && vc->video_size() != libdcp::Size (0, 0)) {
- libdcp::Size cropped = vc->video_size ();
- cropped.width -= crop.left + crop.right;
- cropped.height -= crop.top + crop.bottom;
+ 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,
- float (cropped.width) / cropped.height
+ cropped.ratio ()
);
++lines;
}
- Ratio const * ratio = vc->ratio ();
- if (ratio) {
- libdcp::Size container_size = _editor->film()->container()->size (_editor->film()->full_frame ());
-
- libdcp::Size const scaled = ratio->size (container_size);
+ Ratio const * ratio = vcs->ratio ();
+ dcp::Size container_size = fit_ratio_within (_editor->film()->container()->ratio (), _editor->film()->full_frame ());
+ float const ratio_value = ratio ? ratio->ratio() : vcs->video_size_after_crop().ratio ();
+
+ /* We have a specified ratio to scale to */
+ dcp::Size const scaled = fit_ratio_within (ratio_value, container_size);
+
+ d << wxString::Format (
+ _("Scaled to %dx%d (%.2f:1)\n"),
+ scaled.width, scaled.height,
+ scaled.ratio ()
+ );
+ ++lines;
+
+ if (scaled != container_size) {
d << wxString::Format (
- _("Scaled to %dx%d (%.2f:1)\n"),
- scaled.width, scaled.height,
- float (scaled.width) / scaled.height
+ _("Padded with black to %dx%d (%.2f:1)\n"),
+ container_size.width, container_size.height,
+ container_size.ratio ()
);
++lines;
-
- if (scaled != container_size) {
- d << wxString::Format (
- _("Padded with black to %dx%d (%.2f:1)\n"),
- container_size.width, container_size.height,
- float (container_size.width) / container_size.height
- );
- ++lines;
- }
}
- for (int i = lines; i < 4; ++i) {
+ 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;
+
+ for (int i = lines; i < 6; ++i) {
d << wxT ("\n ");
}
- _scaling_description->SetLabel (d);
+ _description->SetLabel (d);
_sizer->Layout ();
}
-
void
-VideoPanel::ratio_changed (wxCommandEvent &)
+VideoPanel::edit_colour_conversion_clicked ()
{
- if (!_editor->film ()) {
+ VideoContentList vc = _editor->selected_video_content ();
+ if (vc.size() != 1) {
return;
}
- shared_ptr<VideoContent> vc = _editor->selected_video_content ();
-
- int const n = _ratio->GetSelection ();
- if (n >= 0) {
- vector<Ratio const *> ratios = Ratio::all ();
- assert (n < int (ratios.size()));
- vc->set_ratio (ratios[n]);
- }
+ ColourConversion conversion = vc.front()->colour_conversion ();
+ ContentColourConversionDialog* d = new ContentColourConversionDialog (this);
+ d->set (conversion);
+ d->ShowModal ();
+
+ vc.front()->set_colour_conversion (d->get ());
+ d->Destroy ();
}
void
-VideoPanel::frame_type_changed ()
+VideoPanel::content_selection_changed ()
{
- shared_ptr<VideoContent> vc = _editor->selected_video_content ();
- if (vc) {
- vc->set_video_frame_type (static_cast<VideoFrameType> (_frame_type->GetSelection ()));
- }
+ VideoContentList sel = _editor->selected_video_content ();
+ bool const single = sel.size() == 1;
+
+ _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);
+ _ratio->set_content (sel);
+
+ /* Things that are only allowed with single selections */
+ _filters_button->Enable (single);
+ _colour_conversion_button->Enable (single);
+
+ film_content_changed (VideoContentProperty::VIDEO_CROP);
+ film_content_changed (VideoContentProperty::VIDEO_FRAME_RATE);
+ film_content_changed (VideoContentProperty::COLOUR_CONVERSION);
+ film_content_changed (FFmpegContentProperty::FILTERS);
}