2.0. audio:

[casparcg] / modules / ffmpeg / producer / audio / audio_decoder.h

diff --git a/modules/ffmpeg/producer/audio/audio_decoder.h b/modules/ffmpeg/producer/audio/audio_decoder.h
index 3de095da4c8f0bee910da8899d4f4274524f6f74..e2c978cf8db3854b3b523d57f1988f9504f7759d 100644 (file)
--- a/modules/ffmpeg/producer/audio/audio_decoder.h
+++ b/modules/ffmpeg/producer/audio/audio_decoder.h
@@ -19,27 +19,39 @@
 */\r
 #pragma once\r
 \r
-#include <tbb/cache_aligned_allocator.h>\r
+#include <core/mixer/audio/audio_mixer.h>\r
+\r
+#include <common/memory/safe_ptr.h>\r
 \r
 #include <boost/noncopyable.hpp>\r
 \r
-#include <memory>\r
 #include <vector>\r
 \r
-struct AVCodecContext;\r
+struct AVPacket;\r
+struct AVFormatContext;\r
 \r
 namespace caspar {\r
-       \r
-typedef std::vector<unsigned char, tbb::cache_aligned_allocator<unsigned char>> aligned_buffer;\r
+\r
+namespace core {\r
+\r
+struct video_format_desc;\r
+\r
+}\r
 \r
 class audio_decoder : boost::noncopyable\r
 {\r
 public:\r
-       explicit audio_decoder(AVCodecContext* codec_context, double fps);\r
-       std::vector<std::vector<short>> execute(const aligned_buffer& audio_packet);\r
+       explicit audio_decoder(const safe_ptr<AVFormatContext>& context, const core::video_format_desc& format_desc);\r
+       \r
+       void push(const std::shared_ptr<AVPacket>& packet);\r
+       bool ready() const;\r
+       std::vector<std::shared_ptr<core::audio_buffer>> poll();\r
+\r
+       int64_t nb_frames() const;\r
+\r
 private:\r
        struct implementation;\r
-       std::shared_ptr<implementation> impl_;\r
+       safe_ptr<implementation> impl_;\r
 };\r
 \r
 }
\ No newline at end of file