*/\r
#pragma once\r
\r
-#include <tbb/cache_aligned_allocator.h>\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 std::shared_ptr<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<std::vector<int32_t>>> 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