/*
- Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ DCP-o-matic is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
#include "lib/log.h"
#include "film_viewer.h"
#include "wx_util.h"
+extern "C" {
+#include <libavutil/pixfmt.h>
+}
#include <dcp/exceptions.h>
#include <wx/tglbtn.h>
#include <iostream>
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::weak_ptr;
+using boost::optional;
using dcp::Size;
FilmViewer::FilmViewer (wxWindow* p)
: wxPanel (p)
, _panel (new wxPanel (this))
, _outline_content (new wxCheckBox (this, wxID_ANY, _("Outline content")))
+ , _left_eye (new wxRadioButton (this, wxID_ANY, _("Left eye"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP))
+ , _right_eye (new wxRadioButton (this, wxID_ANY, _("Right eye")))
, _slider (new wxSlider (this, wxID_ANY, 0, 0, 4096))
, _back_button (new wxButton (this, wxID_ANY, wxT("<")))
, _forward_button (new wxButton (this, wxID_ANY, wxT(">")))
, _frame_number (new wxStaticText (this, wxID_ANY, wxT("")))
, _timecode (new wxStaticText (this, wxID_ANY, wxT("")))
, _play_button (new wxToggleButton (this, wxID_ANY, _("Play")))
+ , _coalesce_player_changes (false)
+ , _pending_player_change (false)
, _last_get_accurate (true)
{
#ifndef __WXOSX__
_v_sizer->Add (_panel, 1, wxEXPAND);
- _v_sizer->Add (_outline_content, 0, wxALL, DCPOMATIC_SIZER_GAP);
+ wxBoxSizer* view_options = new wxBoxSizer (wxHORIZONTAL);
+ view_options->Add (_outline_content, 0, wxRIGHT, DCPOMATIC_SIZER_GAP);
+ view_options->Add (_left_eye, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP);
+ view_options->Add (_right_eye, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP);
+ _v_sizer->Add (view_options, 0, wxALL, DCPOMATIC_SIZER_GAP);
wxBoxSizer* h_sizer = new wxBoxSizer (wxHORIZONTAL);
_panel->Bind (wxEVT_PAINT, boost::bind (&FilmViewer::paint_panel, this));
_panel->Bind (wxEVT_SIZE, boost::bind (&FilmViewer::panel_sized, this, _1));
_outline_content->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&FilmViewer::refresh_panel, this));
+ _left_eye->Bind (wxEVT_COMMAND_RADIOBUTTON_SELECTED, boost::bind (&FilmViewer::refresh, this));
+ _right_eye->Bind (wxEVT_COMMAND_RADIOBUTTON_SELECTED, boost::bind (&FilmViewer::refresh, this));
_slider->Bind (wxEVT_SCROLL_THUMBTRACK, boost::bind (&FilmViewer::slider_moved, this));
_slider->Bind (wxEVT_SCROLL_PAGEUP, boost::bind (&FilmViewer::slider_moved, this));
_slider->Bind (wxEVT_SCROLL_PAGEDOWN, boost::bind (&FilmViewer::slider_moved, this));
set_film (shared_ptr<Film> ());
JobManager::instance()->ActiveJobsChanged.connect (
- bind (&FilmViewer::active_jobs_changed, this, _1)
+ bind (&FilmViewer::active_jobs_changed, this, _2)
);
setup_sensitivity ();
try {
_player.reset (new Player (_film, _film->playlist ()));
+ _player->set_fast ();
} catch (bad_alloc) {
error_dialog (this, _("There is not enough free memory to do that."));
_film.reset ();
in the preview.
*/
_player->set_always_burn_subtitles (true);
+ _player->set_ignore_audio ();
+ _player->set_play_referenced ();
_film_connection = _film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1));
return;
}
- list<shared_ptr<PlayerVideo> > pvf;
+ list<shared_ptr<PlayerVideo> > all_pv;
try {
- pvf = _player->get_video (p, accurate);
+ all_pv = _player->get_video (p, accurate);
} catch (exception& e) {
error_dialog (this, wxString::Format (_("Could not get video for view (%s)"), std_to_wx(e.what()).data()));
}
- if (!pvf.empty ()) {
+ if (!all_pv.empty ()) {
try {
- _frame = pvf.front()->image (PIX_FMT_RGB24, boost::bind (&Log::dcp_log, _film->log().get(), _1, _2));
- ImageChanged (pvf.front ());
-
- dcp::YUVToRGB yuv_to_rgb = dcp::YUV_TO_RGB_REC601;
- if (pvf.front()->colour_conversion()) {
- yuv_to_rgb = pvf.front()->colour_conversion().get().yuv_to_rgb();
+ shared_ptr<PlayerVideo> pv;
+ if (all_pv.size() == 2) {
+ /* We have 3D; choose the correct eye */
+ if (_left_eye->GetValue()) {
+ if (all_pv.front()->eyes() == EYES_LEFT) {
+ pv = all_pv.front();
+ } else {
+ pv = all_pv.back();
+ }
+ } else {
+ if (all_pv.front()->eyes() == EYES_RIGHT) {
+ pv = all_pv.front();
+ } else {
+ pv = all_pv.back();
+ }
+ }
+ } else {
+ /* 2D; no choice to make */
+ pv = all_pv.front ();
}
- _frame = _frame->scale (_frame->size(), yuv_to_rgb, PIX_FMT_RGB24, false);
- _position = pvf.front()->time ();
- _inter_position = pvf.front()->inter_position ();
- _inter_size = pvf.front()->inter_size ();
+ _frame = pv->image (
+ bind (&Log::dcp_log, _film->log().get(), _1, _2), bind (&PlayerVideo::always_rgb, _1), false, true
+ );
+
+ ImageChanged (pv);
+
+ _position = pv->time ();
+ _inter_position = pv->inter_position ();
+ _inter_size = pv->inter_size ();
} catch (dcp::DCPReadError& e) {
/* This can happen on the following sequence of events:
* - load encrypted DCP
}
void
-FilmViewer::active_jobs_changed (bool a)
+FilmViewer::active_jobs_changed (optional<string> j)
{
- if (a) {
- list<shared_ptr<Job> > jobs = JobManager::instance()->get ();
- list<shared_ptr<Job> >::iterator i = jobs.begin ();
- while (i != jobs.end() && boost::dynamic_pointer_cast<ExamineContentJob> (*i) == 0) {
- ++i;
- }
-
- if (i == jobs.end() || (*i)->finished()) {
- /* no examine content job running, so we're ok to use the viewer */
- a = false;
- }
- }
-
- _slider->Enable (!a);
- _play_button->Enable (!a);
+ /* examine content is the only job which stops the viewer working */
+ bool const a = !j || *j != "examine_content";
+ _slider->Enable (a);
+ _play_button->Enable (a);
}
void
return;
}
+ if (_coalesce_player_changes) {
+ _pending_player_change = true;
+ return;
+ }
+
calculate_sizes ();
refresh ();
update_position_label ();
_outline_content->Enable (c);
_frame_number->Enable (c);
_timecode->Enable (c);
+
+ _left_eye->Enable (c && _film->three_d ());
+ _right_eye->Enable (c && _film->three_d ());
}
void
FilmViewer::film_changed (Film::Property p)
{
- if (p == Film::CONTENT) {
+ if (p == Film::CONTENT || p == Film::THREE_D) {
setup_sensitivity ();
}
}
{
get (_position, _last_get_accurate);
}
+
+void
+FilmViewer::set_position (DCPTime p)
+{
+ _position = p;
+ get (_position, true);
+ update_position_label ();
+ update_position_slider ();
+}
+
+void
+FilmViewer::set_coalesce_player_changes (bool c)
+{
+ _coalesce_player_changes = c;
+
+ if (c) {
+ _pending_player_change = false;
+ } else {
+ if (_pending_player_change) {
+ player_changed (false);
+ }
+ }
+}