X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fffmpeg%2Fproducer%2Futil%2Futil.h;h=be76ca5dc81e393b130c421ab6d7b270bb9e9d55;hb=726897adbf881d3b75f171fff24f2b917ba5f05a;hp=abd167a0180f3708a2105ec736db7a33b49c001c;hpb=cd1a44a41dd64c05de067ba728c285f001b66bf3;p=casparcg

diff --git a/modules/ffmpeg/producer/util/util.h b/modules/ffmpeg/producer/util/util.h
index abd167a01..be76ca5dc 100644
--- a/modules/ffmpeg/producer/util/util.h
+++ b/modules/ffmpeg/producer/util/util.h
@@ -26,12 +26,15 @@
 
 #include <core/video_format.h>
 #include <core/frame/pixel_format.h>
-#include <core/mixer/audio/audio_mixer.h>
+#include <core/frame/audio_channel_layout.h>
+#include <core/frame/frame.h>
 #include <core/fwd.h>
 
 #include <boost/rational.hpp>
 
 #include <array>
+#include <vector>
+#include <utility>
 
 #if defined(_MSC_VER)
 #pragma warning (push)
@@ -52,7 +55,15 @@ struct AVRational;
 struct AVCodecContext;
 
 namespace caspar { namespace ffmpeg {
-		
+
+enum class FFMPEG_Resource {
+	FFMPEG_FILE,
+	FFMPEG_DEVICE,
+	FFMPEG_STREAM
+};
+
+typedef std::vector<std::pair<std::string, std::string>> ffmpeg_options;
+
 // Utils
 
 core::field_mode					get_mode(const AVFrame& frame);
@@ -71,7 +82,10 @@ spl::shared_ptr<AVFormatContext> open_input(const std::wstring& filename);
 bool is_sane_fps(AVRational time_base);
 AVRational fix_time_base(AVRational time_base);
 
-std::shared_ptr<AVFrame> flush();
+std::shared_ptr<core::mutable_audio_buffer>	flush_audio();
+std::shared_ptr<core::mutable_audio_buffer>	empty_audio();
+std::shared_ptr<AVFrame>					flush_video();
+std::shared_ptr<AVFrame>					empty_video();
 
 double read_fps(AVFormatContext& context, double fail_value);
 boost::rational<int> read_framerate(AVFormatContext& context, const boost::rational<int>& fail_value);
@@ -87,4 +101,6 @@ core::audio_channel_layout get_audio_channel_layout(int num_channels, std::uint6
 // av_get_default_channel_layout does not work for layouts not predefined in ffmpeg. This is needed to support > 8 channels.
 std::int64_t create_channel_layout_bitmask(int num_channels);
 
+std::vector<int> find_audio_cadence(const boost::rational<int>& framerate);
+
 }}