*/
+
#include "audio_mapping.h"
#include "audio_ring_buffers.h"
#include "change_signaller.h"
#include <boost/thread.hpp>
#include <boost/thread/condition.hpp>
+
class Player;
class PlayerVideo;
+
class Butler : public ExceptionStore
{
public:
+ enum class Audio
+ {
+ ENABLED,
+ DISABLED
+ };
+
Butler (
std::weak_ptr<const Film> film,
std::shared_ptr<Player> player,
AudioMapping map,
int audio_channels,
- boost::function<AVPixelFormat (AVPixelFormat)> pixel_format,
+ std::function<AVPixelFormat (AVPixelFormat)> pixel_format,
+ dcp::Size display_container,
+ dcp::Size film_container,
VideoRange video_range,
- bool aligned,
- bool fast
+ Image::Alignment alignment,
+ bool fast,
+ bool prepare_only_proxy,
+ Audio audio
);
~Butler ();
class Error {
public:
- enum Code{
+ enum class Code {
NONE,
AGAIN,
DIED,
FINISHED
};
- Error()
- : code (NONE)
- {}
-
- Code code;
+ Code code = Code::NONE;
std::string message;
std::string summary () const;
};
- std::pair<std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> get_video (bool blocking, Error* e = 0);
- boost::optional<dcpomatic::DCPTime> get_audio (float* out, Frame frames);
- boost::optional<TextRingBuffers::Data> get_closed_caption ();
+ enum class Behaviour {
+ BLOCKING,
+ NON_BLOCKING
+ };
- void disable_audio ();
+ std::pair<std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> get_video (Behaviour behaviour, Error* e = nullptr);
+ boost::optional<dcpomatic::DCPTime> get_audio (Behaviour behaviour, float* out, Frame frames);
+ boost::optional<TextRingBuffers::Data> get_closed_caption ();
std::pair<size_t, std::string> memory_used () const;
bool _disable_audio;
- boost::function<AVPixelFormat (AVPixelFormat)> _pixel_format;
+ std::function<AVPixelFormat (AVPixelFormat)> _pixel_format;
+ dcp::Size _display_container;
+ dcp::Size _film_container;
VideoRange _video_range;
- bool _aligned;
+ Image::Alignment _alignment;
bool _fast;
+ /** true to ask PlayerVideo::prepare to only prepare the ImageProxy and not also
+ * the final image. We want to do this when the viewer is intending to call
+ * PlayerVideo::raw_image() and do the things in PlayerVideo::make_image() itself:
+ * this is the case for the GLVideoView which can do scale, pixfmt conversion etc.
+ * in the shader.
+ */
+ bool _prepare_only_proxy = false;
+
/** If we are waiting to be refilled following a seek, this is the time we were
seeking to.
*/