[ffmpeg] Ported 2.0.7 ffmpeg producer to 2.1.0 while still keeping the usage of the...

[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 b03a3cfe26fb4fb82f8d433273747f46cb92144b..0deb8292045c7bbb7162f407fc17ef9e0cb2a096 100644 (file)
--- a/modules/ffmpeg/producer/audio/audio_decoder.h
+++ b/modules/ffmpeg/producer/audio/audio_decoder.h
@@ -1,70 +1,54 @@
-/*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
-*\r
-* This file is part of CasparCG (www.casparcg.com).\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
-* Author: Robert Nagy, ronag89@gmail.com\r
-*/\r
-\r
-#pragma once\r
-\r
-#include <core/mixer/audio/audio_mixer.h>\r
-#include <core/monitor/monitor.h>\r
-\r
-#include <common/memory.h>\r
-\r
-#include <boost/noncopyable.hpp>\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 : public monitor::observable\r
-                                       , boost::noncopyable\r
-{\r
-public:\r
-       explicit audio_decoder(const spl::shared_ptr<AVFormatContext>& context, const core::video_format_desc& format_desc);\r
-       \r
-       bool ready() const;\r
-       void push(const std::shared_ptr<AVPacket>& packet);\r
-       std::shared_ptr<core::audio_buffer> poll();\r
-\r
-       uint32_t nb_frames() const;\r
-       \r
-       uint32_t file_frame_number() const;\r
-\r
-       std::wstring print() const;\r
-       \r
-       // monitor::observable\r
-       \r
-       void subscribe(const monitor::observable::observer_ptr& o) override;\r
-       void unsubscribe(const monitor::observable::observer_ptr& o) override;\r
-\r
-private:\r
-       struct impl;\r
-       spl::shared_ptr<impl> impl_;\r
-};\r
-\r
-}}
\ No newline at end of file
+/*
+* Copyright 2013 Sveriges Television AB http://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 <common/memory.h>
+
+#include <core/frame/frame.h>
+
+#include <boost/noncopyable.hpp>
+
+struct AVPacket;
+struct AVFrame;
+struct AVFormatContext;
+
+namespace caspar { namespace ffmpeg {
+
+class audio_decoder : boost::noncopyable
+{
+public:
+       explicit audio_decoder(const spl::shared_ptr<AVFormatContext>& context, int out_samplerate);
+       
+       bool ready() const;
+       void push(const std::shared_ptr<AVPacket>& packet);
+       std::shared_ptr<core::mutable_audio_buffer> poll();
+
+       int     num_channels() const;
+       uint64_t ffmpeg_channel_layout() const;
+
+       std::wstring print() const;
+private:
+       struct implementation;
+       spl::shared_ptr<implementation> impl_;
+};
+
+}}