#include "video_view.h"
-#include "lib/film.h"
#include "lib/config.h"
+#include "lib/film.h"
#include "lib/player_text.h"
-#include "lib/timer.h"
#include "lib/signaller.h"
-#include "lib/warnings.h"
+#include "lib/timer.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <RtAudio.h>
-DCPOMATIC_DISABLE_WARNINGS
#include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
#include <vector>
-class wxToggleButton;
+class Butler;
+class ClosedCaptionsDialog;
class FFmpegPlayer;
class Image;
-class RGBPlusAlphaImage;
-class PlayerVideo;
class Player;
-class Butler;
-class ClosedCaptionsDialog;
+class PlayerVideo;
+class RGBPlusAlphaImage;
+class wxToggleButton;
/** @class FilmViewer
return _video_view->get();
}
- VideoView const * video_view () const {
+ std::shared_ptr<const VideoView> video_view () const {
return _video_view;
}
dcpomatic::DCPTime position () const {
return _video_view->position();
}
+ boost::optional<dcpomatic::ContentTime> position_in_content (std::shared_ptr<const Content> content) const;
dcpomatic::DCPTime one_video_frame () const;
void start ();
void set_dcp_decode_reduction (boost::optional<int> reduction);
boost::optional<int> dcp_decode_reduction () const;
void set_outline_content (bool o);
- void set_outline_subtitles (boost::optional<dcpomatic::Rect<double> >);
+ void set_outline_subtitles (boost::optional<dcpomatic::Rect<double>>);
void set_eyes (Eyes e);
void set_pad_black (bool p);
+ void set_optimise_for_j2k (bool o);
+ void set_crop_guess (dcpomatic::Rect<float> crop);
+ void unset_crop_guess ();
void slow_refresh ();
}
/* Some accessors and utility methods that VideoView classes need */
- dcp::Size out_size () const {
- return _out_size;
- }
bool outline_content () const {
return _outline_content;
}
- boost::optional<dcpomatic::Rect<double> > outline_subtitles () const {
+ boost::optional<dcpomatic::Rect<double>> outline_subtitles () const {
return _outline_subtitles;
}
bool pad_black () const {
}
void finished ();
void image_changed (std::shared_ptr<PlayerVideo> video);
+ boost::optional<dcpomatic::Rect<float>> crop_guess () const {
+ return _crop_guess;
+ }
bool pending_idle_get () const {
return _idle_get;
}
boost::signals2::signal<void (std::shared_ptr<PlayerVideo>)> ImageChanged;
- boost::signals2::signal<void (dcpomatic::DCPTime)> Started;
- boost::signals2::signal<void (dcpomatic::DCPTime)> Stopped;
+ boost::signals2::signal<void ()> Started;
+ boost::signals2::signal<void ()> Stopped;
/** While playing back we reached the end of the film (emitted from GUI thread) */
boost::signals2::signal<void ()> Finished;
+ /** Emitted from the GUI thread when a lot of frames are being dropped */
+ boost::signals2::signal<void()> TooManyDropped;
boost::signals2::signal<bool ()> PlaybackPermitted;
void config_changed (Config::Property);
void film_length_change ();
void ui_finished ();
- void too_many_frames_dropped ();
+ void start_audio_stream_if_open ();
dcpomatic::DCPTime uncorrected_time () const;
Frame average_latency () const;
std::shared_ptr<Film> _film;
std::shared_ptr<Player> _player;
- VideoView* _video_view;
- bool _coalesce_player_changes;
+ std::shared_ptr<VideoView> _video_view;
+ bool _coalesce_player_changes = false;
std::vector<int> _pending_player_changes;
- /** Size of our output (including padding if we have any) */
- dcp::Size _out_size;
-
RtAudio _audio;
- int _audio_channels;
- unsigned int _audio_block_size;
- bool _playing;
- int _suspended;
+ int _audio_channels = 0;
+ unsigned int _audio_block_size = 1024;
+ bool _playing = false;
+ int _suspended = 0;
std::shared_ptr<Butler> _butler;
std::list<Frame> _latency_history;
/** Mutex to protect _latency_history */
mutable boost::mutex _latency_history_mutex;
- int _latency_history_count;
+ int _latency_history_count = 0;
boost::optional<int> _dcp_decode_reduction;
- ClosedCaptionsDialog* _closed_captions_dialog;
+ /** true to assume that this viewer is only being used for JPEG2000 sources
+ * so it can optimise accordingly.
+ */
+ bool _optimise_for_j2k = false;
- bool _outline_content;
- boost::optional<dcpomatic::Rect<double> > _outline_subtitles;
+ ClosedCaptionsDialog* _closed_captions_dialog = nullptr;
+
+ bool _outline_content = false;
+ boost::optional<dcpomatic::Rect<double>> _outline_subtitles;
/** true to pad the viewer panel with black, false to use
the normal window background colour.
*/
- bool _pad_black;
+ bool _pad_black = false;
/** true if an get() is required next time we are idle */
- bool _idle_get;
+ bool _idle_get = false;
+
+ boost::optional<dcpomatic::Rect<float>> _crop_guess;
boost::signals2::scoped_connection _config_changed_connection;
};