[ffmpeg_producer] Don't assume interlaced material based on resolution.

[casparcg] / core / producer / stage.h

diff --git a/core/producer/stage.h b/core/producer/stage.h
index 77595ecaec43673b620a50f4cf95d7817e97a276..69925892ec05babee4b27d6112e6b623b832ed00 100644 (file)
--- a/core/producer/stage.h
+++ b/core/producer/stage.h
@@ -21,8 +21,7 @@
 
 #pragma once
 
-#include "frame_producer.h"
-
+#include "../fwd.h"
 #include "../monitor/monitor.h"
 #include "../interaction/interaction_sink.h"
 
@@ -45,11 +44,11 @@ namespace caspar { namespace core {
 
 //typedef reactive::observable<std::map<int, class draw_frame>> frame_observable;
        
-class stage sealed : public interaction_sink
+class stage final : public interaction_sink
 {
        stage(const stage&);
        stage& operator=(const stage&);
-public:        
+public:
 
        // Static Members
        
@@ -58,28 +57,33 @@ public:
 
        // Constructors
 
-       explicit stage(spl::shared_ptr<diagnostics::graph> graph);
+       explicit stage(int channel_index, spl::shared_ptr<caspar::diagnostics::graph> graph);
        
        // Methods
 
-       std::map<int, class draw_frame> operator()(const struct video_format_desc& format_desc);
-
-       boost::unique_future<void>                      apply_transforms(const std::vector<transform_tuple_t>& transforms);
-       boost::unique_future<void>                      apply_transform(int index, const transform_func_t& transform, unsigned int mix_duration = 0, const tweener& tween = L"linear");
-       boost::unique_future<void>                      clear_transforms(int index);
-       boost::unique_future<void>                      clear_transforms();                             
-       boost::unique_future<void>                      load(int index, const spl::shared_ptr<class frame_producer>& producer, bool preview = false, const boost::optional<int32_t>& auto_play_delta = nullptr);
-       boost::unique_future<void>                      pause(int index);
-       boost::unique_future<void>                      play(int index);
-       boost::unique_future<void>                      stop(int index);
-       boost::unique_future<std::wstring>      call(int index, const std::vector<std::wstring>& params);
-       boost::unique_future<void>                      clear(int index);
-       boost::unique_future<void>                      clear();        
-       boost::unique_future<void>                      swap_layers(stage& other);
-       boost::unique_future<void>                      swap_layer(int index, int other_index);
-       boost::unique_future<void>                      swap_layer(int index, int other_index, stage& other);   
-
-       monitor::source& monitor_output();      
+       std::map<int, draw_frame>               operator()(const video_format_desc& format_desc);
+
+       std::future<void>                               apply_transforms(const std::vector<transform_tuple_t>& transforms);
+       std::future<void>                               apply_transform(int index, const transform_func_t& transform, unsigned int mix_duration, const tweener& tween);
+       std::future<void>                               clear_transforms(int index);
+       std::future<void>                               clear_transforms();
+       std::future<frame_transform>    get_current_transform(int index);
+       std::future<void>                               load(int index, const spl::shared_ptr<frame_producer>& producer, bool preview = false, const boost::optional<int32_t>& auto_play_delta = boost::optional<int32_t>());
+       std::future<void>                               pause(int index);
+       std::future<void>                               resume(int index);
+       std::future<void>                               play(int index);
+       std::future<void>                               stop(int index);
+       std::future<std::wstring>               call(int index, const std::vector<std::wstring>& params);
+       std::future<void>                               clear(int index);
+       std::future<void>                               clear();
+       std::future<void>                               swap_layers(stage& other, bool swap_transforms);
+       std::future<void>                               swap_layer(int index, int other_index, bool swap_transforms);
+       std::future<void>                               swap_layer(int index, int other_index, stage& other, bool swap_transforms);
+
+       void                                                    add_layer_consumer(void* token, int layer, const spl::shared_ptr<write_frame_consumer>& layer_consumer);
+       void                                                    remove_layer_consumer(void* token, int layer);
+
+       monitor::subject& monitor_output();     
 
        // frame_observable
        //void subscribe(const frame_observable::observer_ptr& o) override;
@@ -91,12 +95,14 @@ public:
 
        // Properties
 
-       boost::unique_future<spl::shared_ptr<class frame_producer>>     foreground(int index);
-       boost::unique_future<spl::shared_ptr<class frame_producer>>     background(int index);
+       std::future<std::shared_ptr<frame_producer>>    foreground(int index);
+       std::future<std::shared_ptr<frame_producer>>    background(int index);
 
-       boost::unique_future<boost::property_tree::wptree>                      info() const;
-       boost::unique_future<boost::property_tree::wptree>                      info(int index) const;
+       std::future<boost::property_tree::wptree>               info() const;
+       std::future<boost::property_tree::wptree>               info(int index) const;
 
+       std::future<boost::property_tree::wptree>               delay_info() const;
+       std::future<boost::property_tree::wptree>               delay_info(int layer) const;
 private:
        struct impl;
        spl::shared_ptr<impl> impl_;