ffmpeg_producer: Multiple audio streams are now merged (flattened) before the 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 fe480f284b3831dc0ea4c7c642103e9e3978f089..99f6e398be358d3342bb7c44b94b1761b28314fd 100644 (file)
--- a/modules/ffmpeg/producer/audio/audio_decoder.h
+++ b/modules/ffmpeg/producer/audio/audio_decoder.h
@@ -1,67 +1,59 @@
-/*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
-*\r
-*  This file is part of CasparCG.\r
-*\r
-*    CasparCG is free software: you can redistribute it and/or modify\r
-*    it under the terms of the GNU General Public License as published by\r
-*    the Free Software Foundation, either version 3 of the License, or\r
-*    (at your option) any later version.\r
-*\r
-*    CasparCG is distributed in the hope that it will be useful,\r
-*    but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-*    GNU General Public License for more details.\r
-\r
-*    You should have received a copy of the GNU General Public License\r
-*    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.\r
-*\r
-*/\r
-#pragma once\r
-\r
-#include "../util.h"\r
-\r
-#include <core/mixer/audio/audio_mixer.h>\r
-\r
-#include <common/memory/safe_ptr.h>\r
-#include <common/concurrency/governor.h>\r
-\r
-#include <boost/noncopyable.hpp>\r
-\r
-#include <agents.h>\r
-#include <vector>\r
-\r
-struct AVPacket;\r
-struct AVFormatContext;\r
-\r
-namespace caspar {\r
-\r
-namespace core {\r
-\r
-struct video_format_desc;\r
-\r
-}\r
-\r
-namespace ffmpeg {\r
-\r
-class audio_decoder : boost::noncopyable\r
-{\r
-public:\r
-\r
-       typedef safe_ptr<AVPacket>                                              source_element_t;\r
-       typedef safe_ptr<core::audio_buffer>                    target_element_t;\r
-\r
-       typedef Concurrency::ISource<source_element_t>& source_t;\r
-       typedef Concurrency::ITarget<target_element_t>& target_t;\r
-       \r
-       explicit audio_decoder(source_t& source, target_t& target, AVFormatContext& context, const core::video_format_desc& format_desc);\r
-       \r
-       int64_t nb_frames() const;\r
-\r
-private:\r
-       \r
-       struct implementation;\r
-       safe_ptr<implementation> impl_;\r
-};\r
-\r
+/*
+* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
+*
+* This file is part of CasparCG (www.casparcg.com).
+*
+* CasparCG is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* CasparCG is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.
+*
+* Author: Robert Nagy, ronag89@gmail.com
+*/
+
+#pragma once
+
+#include <core/mixer/audio/audio_mixer.h>
+#include <core/monitor/monitor.h>
+
+#include <common/memory.h>
+
+#include <core/fwd.h>
+
+#include <boost/noncopyable.hpp>
+
+struct AVPacket;
+struct AVFormatContext;
+
+namespace caspar { namespace ffmpeg {
+       
+class audio_decoder : public boost::noncopyable
+{
+public:
+       explicit audio_decoder(class input& input, const core::video_format_desc& format_desc, int audio_stream_index);
+       
+       audio_decoder(audio_decoder&& other);
+       audio_decoder& operator=(audio_decoder&& other);
+
+       std::shared_ptr<AVFrame> operator()();
+
+       uint32_t nb_frames() const;
+       
+       std::wstring print() const;
+       
+       core::monitor::subject& monitor_output();
+
+private:
+       struct impl;
+       spl::shared_ptr<impl> impl_;
+};
+
 }}
\ No newline at end of file