]> git.sesse.net Git - casparcg/blobdiff - modules/ffmpeg/producer/frame_muxer.h
2.0. audio: Audio pipeline is now in 32 bit.
[casparcg] / modules / ffmpeg / producer / frame_muxer.h
index c7b60757f3c2505354adfce8895edbe28b16f314..da9f4108649182a478f36da726980e1a5540ceaf 100644 (file)
@@ -2,12 +2,12 @@
 \r
 #include <common/memory/safe_ptr.h>\r
 \r
-#include <core/video_format.h>\r
-\r
 #include <boost/noncopyable.hpp>\r
 \r
 #include <vector>\r
 \r
+struct AVFrame;\r
+\r
 namespace caspar { \r
        \r
 namespace core {\r
@@ -24,14 +24,18 @@ public:
        frame_muxer(double in_fps, const safe_ptr<core::frame_factory>& frame_factory);\r
        \r
        void push(const std::shared_ptr<AVFrame>& video_frame, int hints = 0);\r
-       void push(const std::shared_ptr<std::vector<int16_t>>& audio_samples);\r
+       void push(const std::shared_ptr<std::vector<int32_t>>& audio_samples);\r
        \r
+       void commit();\r
+\r
        bool video_ready() const;\r
        bool audio_ready() const;\r
 \r
        size_t size() const;\r
        bool empty() const;\r
 \r
+       int64_t calc_nb_frames(int64_t nb_frames) const;\r
+\r
        safe_ptr<core::basic_frame> pop();\r
 private:\r
        struct implementation;\r