summaryrefslogtreecommitdiff
path: root/src/lib/butler.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/butler.h')
-rw-r--r--src/lib/butler.h15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/lib/butler.h b/src/lib/butler.h
index a231fd099..cd3891754 100644
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -45,8 +45,9 @@ public:
int audio_channels,
std::function<AVPixelFormat (AVPixelFormat)> pixel_format,
VideoRange video_range,
- bool aligned,
- bool fast
+ Image::Alignment alignment,
+ bool fast,
+ bool prepare_only_proxy
);
~Butler ();
@@ -124,9 +125,17 @@ private:
std::function<AVPixelFormat (AVPixelFormat)> _pixel_format;
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_imgae() 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.
*/