/*
- Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#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"
using boost::dynamic_pointer_cast;
using boost::bind;
using boost::optional;
+using namespace dcpomatic;
static VideoContentScale
index_to_scale (int n)
VideoPanel::VideoPanel (ContentPanel* p)
: ContentSubPanel (p, _("Video"))
{
- wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL);
-
- _reference = new wxCheckBox (this, wxID_ANY, _("Use this DCP's video as OV and make VF"));
- reference_sizer->Add (_reference, 0, wxLEFT | wxRIGHT | wxTOP, DCPOMATIC_SIZER_GAP);
-
- _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);
- reference_sizer->Add (_reference_note, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP);
wxFont font = _reference_note->GetFont();
font.SetStyle(wxFONTSTYLE_ITALIC);
font.SetPointSize(font.GetPointSize() - 1);
_reference_note->SetFont(font);
- _sizer->Add (reference_sizer);
-
- _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<VideoContent, VideoFrameType> (
&caster<VideoFrameType, int>
);
- _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<VideoContent> (
this,
new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
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<VideoContent> (
this,
new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
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<VideoContent> (
this,
new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
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<VideoContent> (
this,
new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
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);
/// 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..."));
- _description = new wxStaticText (this, wxID_ANY, wxT ("\n \n \n \n \n"), wxDefaultPosition, wxDefaultSize);
+ _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 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 ()) {
_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;
- add_label_to_sizer (_grid, _type_label, true, wxGBPosition(r, 0));
- _frame_type->add (_grid, wxGBPosition (r, 1), wxGBSpan (1, 2));
+ _reference->Show (full);
+ _reference_note->Show (full && !_reference_note->GetLabel().IsEmpty());
+
+ if (full) {
+ wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL);
+ reference_sizer->Add (_reference, 0);
+ reference_sizer->Add (_reference_note, 0);
+ _grid->Add (reference_sizer, wxGBPosition(r, 0), wxGBSpan(1, 3));
+ ++r;
+ }
+
+ _use->Show (full);
+ _grid->Add (_use, wxGBPosition(r, 0), wxGBSpan(1, 2));
++r;
- add_label_to_sizer (_grid, _crop_label, true, wxGBPosition(r, 0));
+ add_label_to_sizer (_grid, _type_label, true, wxGBPosition(r, 0));
+ _frame_type->add (_grid, wxGBPosition(r, 1), wxGBSpan(1, 2));
+ ++r;
int cr = 0;
wxGridBagSizer* crop = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
_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;
_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)
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:
checked_set (_filters, p);
}
}
+ } else if (property == VideoContentProperty::USE) {
+ set<bool> check;
+ BOOST_FOREACH (shared_ptr<const Content> 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<Frame> check;
BOOST_FOREACH (shared_ptr<const Content> i, vc) {
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 ();
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 ();
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 ();
}
}
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) {
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);
}
string why_not;
- bool const can_reference = dcp && dcp->can_reference_video (why_not);
+ bool const can_reference = dcp && dcp->can_reference_video (_parent->film(), why_not);
setup_refer_button (_reference, _reference_note, dcp, can_reference, why_not);
- if (_reference->GetValue ()) {
+ bool const enable = !_reference->GetValue() && _use->GetValue();
+
+ _use->Enable (!_reference->GetValue());
+
+ if (!enable) {
_frame_type->wrapped()->Enable (false);
_left_crop->wrapped()->Enable (false);
_right_crop->wrapped()->Enable (false);
_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 ();
_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 ();
VideoPanel::fade_in_changed ()
{
BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_video ()) {
- int const vfr = _parent->film()->video_frame_rate ();
+ int const vfr = i->active_video_frame_rate (_parent->film());
i->video->set_fade_in (_fade_in->get (vfr).frames_round (vfr));
}
}
VideoPanel::fade_out_changed ()
{
BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_video ()) {
- int const vfr = _parent->film()->video_frame_rate ();
+ int 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<Content> i, _parent->selected_video()) {
+ i->video->set_use (_use->GetValue());
+ }
+}
+
void
VideoPanel::reference_clicked ()
{
projects / dcpomatic.git / blobdiff