[ffmpeg] Reimplemented support for playing all audio streams in a clip and treating...

[casparcg] / modules / ffmpeg / producer / util / util.h

diff --git a/modules/ffmpeg/producer/util/util.h b/modules/ffmpeg/producer/util/util.h
index d3c6880b8d6862b6552bcafcf2e96e75d9fdab6c..4c1f45c06c51d294562a89ed3ef4409b55eab79d 100644 (file)
--- a/modules/ffmpeg/producer/util/util.h
+++ b/modules/ffmpeg/producer/util/util.h
@@ -26,11 +26,27 @@
 
 #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 <array>
+#include <boost/rational.hpp>
 
+#include <array>
+#include <vector>
+#include <utility>
+
+#if defined(_MSC_VER)
+#pragma warning (push)
+#pragma warning (disable : 4244)
+#endif
+extern "C"
+{
 #include <libavutil/avutil.h>
+}
+#if defined(_MSC_VER)
+#pragma warning (pop)
+#endif
 
 struct AVFrame;
 struct AVFormatContext;
@@ -38,18 +54,15 @@ struct AVPacket;
 struct AVRational;
 struct AVCodecContext;
 
-FORWARD2(caspar, core, struct pixel_format_desc);
-FORWARD2(caspar, core, class mutable_frame);
-FORWARD2(caspar, core, class frame_factory);
-
 namespace caspar { namespace ffmpeg {
-               
+
+typedef std::vector<std::pair<std::string, std::string>> ffmpeg_options;
+
 // Utils
 
 core::field_mode                                       get_mode(const AVFrame& frame);
-core::mutable_frame                                    make_frame(const void* tag, const spl::shared_ptr<AVFrame>& decoded_frame, double fps, core::frame_factory& frame_factory);
+core::mutable_frame                                    make_frame(const void* tag, const spl::shared_ptr<AVFrame>& decoded_frame, core::frame_factory& frame_factory, const core::audio_channel_layout& channel_layout);
 spl::shared_ptr<AVFrame>                       make_av_frame(core::mutable_frame& frame);
-spl::shared_ptr<AVFrame>                       make_av_frame(core::const_frame& frame);
 spl::shared_ptr<AVFrame>                       make_av_frame(std::array<uint8_t*, 4> data, const core::pixel_format_desc& pix_desc);
 
 core::pixel_format_desc                                pixel_format_desc(PixelFormat pix_fmt, int width, int height);
@@ -57,17 +70,31 @@ core::pixel_format_desc                             pixel_format_desc(PixelFormat pix_fmt, int width, int
 spl::shared_ptr<AVPacket> create_packet();
 spl::shared_ptr<AVFrame>  create_frame();
 
-spl::shared_ptr<AVCodecContext> open_codec(AVFormatContext& context, AVMediaType type, int& index);
+spl::shared_ptr<AVCodecContext> open_codec(AVFormatContext& context, AVMediaType type, int& index, bool single_threaded);
 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<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);
 
 std::wstring print_mode(int width, int height, double fps, bool interlaced);
 
-std::wstring probe_stem(const std::wstring& stem);
-bool is_valid_file(const std::wstring& filename);
+std::wstring probe_stem(const std::wstring& stem, bool only_video);
+bool is_valid_file(const std::wstring& filename, bool only_video);
+bool try_get_duration(const std::wstring filename, std::int64_t& duration, boost::rational<std::int64_t>& time_base);
+
+core::audio_channel_layout get_audio_channel_layout(int num_channels, std::uint64_t layout, const std::wstring& channel_layout_spec);
+
+// av_get_default_channel_layout does not work for layouts not predefined in ffmpeg. This is needed to support > 8 channels.
+std::uint64_t create_channel_layout_bitmask(int num_channels);
+
+std::vector<int> find_audio_cadence(const boost::rational<int>& framerate);
 
 }}