git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/modules/ffmpeg/producer/audio/audio_decoder.cpp b/modules/ffmpeg/producer/audio/audio_decoder.cpp
index eabf4429e57acba62d86b07b97c318c37690dcd8..8bb629be80e5fe614ede23e4bea7591fc7263cf5 100644 (file)
--- a/modules/ffmpeg/producer/audio/audio_decoder.cpp
+++ b/modules/ffmpeg/producer/audio/audio_decoder.cpp
@@ -58,7 +58,7 @@ struct audio_decoder::implementation : boost::noncopyable
 \r
        int64_t                                                                                                         nb_frames_;\r
 public:\r
-       explicit implementation(const std::shared_ptr<AVFormatContext>& context, const core::video_format_desc& format_desc) \r
+       explicit implementation(const safe_ptr<AVFormatContext>& context, const core::video_format_desc& format_desc) \r
                : format_desc_(format_desc)     \r
                , nb_frames_(0)\r
        {                               \r
@@ -187,7 +187,7 @@ public:
        }\r
 };\r
 \r
-audio_decoder::audio_decoder(const std::shared_ptr<AVFormatContext>& context, const core::video_format_desc& format_desc) : impl_(new implementation(context, format_desc)){}\r
+audio_decoder::audio_decoder(const safe_ptr<AVFormatContext>& context, const core::video_format_desc& format_desc) : impl_(new implementation(context, format_desc)){}\r
 void audio_decoder::push(const std::shared_ptr<AVPacket>& packet){impl_->push(packet);}\r
 bool audio_decoder::ready() const{return impl_->ready();}\r
 std::vector<std::shared_ptr<std::vector<int16_t>>> audio_decoder::poll(){return impl_->poll();}\r

diff --git a/modules/ffmpeg/producer/audio/audio_decoder.h b/modules/ffmpeg/producer/audio/audio_decoder.h
index 41bc8b49a6b12339c03c70447fce3a440f19e29b..2ef82eaabe339a55049b879fb97ee6dcabe0d296 100644 (file)
--- a/modules/ffmpeg/producer/audio/audio_decoder.h
+++ b/modules/ffmpeg/producer/audio/audio_decoder.h
@@ -39,7 +39,7 @@ struct video_format_desc;
 class audio_decoder : boost::noncopyable\r
 {\r
 public:\r
-       explicit audio_decoder(const std::shared_ptr<AVFormatContext>& context, const core::video_format_desc& format_desc);\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

diff --git a/modules/ffmpeg/producer/input.cpp b/modules/ffmpeg/producer/input.cpp
index cffee97717450e5233b315f512a1ee8f23664599..07d45a505b63aa6970821cee80e1ac6be619c85d 100644 (file)
--- a/modules/ffmpeg/producer/input.cpp
+++ b/modules/ffmpeg/producer/input.cpp
@@ -259,6 +259,6 @@ input::input(const safe_ptr<diagnostics::graph>& graph, const std::wstring& file
        : impl_(new implementation(graph, filename, loop, start)){}\r
 bool input::eof() const {return !impl_->is_running_;}\r
 bool input::try_pop(std::shared_ptr<AVPacket>& packet){return impl_->try_pop(packet);}\r
-std::shared_ptr<AVFormatContext> input::context(){return impl_->format_context_;}\r
+safe_ptr<AVFormatContext> input::context(){return make_safe(impl_->format_context_);}\r
 size_t input::nb_frames() const {return impl_->nb_frames();}\r
 }
\ No newline at end of file

diff --git a/modules/ffmpeg/producer/input.h b/modules/ffmpeg/producer/input.h
index 262aca4cc487992c421e24c2fb592524db8e2cd9..5736a4eedbb04dbc5cb06766134338b7248d1373 100644 (file)
--- a/modules/ffmpeg/producer/input.h
+++ b/modules/ffmpeg/producer/input.h
@@ -47,7 +47,7 @@ public:
 \r
        size_t nb_frames() const;\r
 \r
-       std::shared_ptr<AVFormatContext> context();\r
+       safe_ptr<AVFormatContext> context();\r
 private:\r
        struct implementation;\r
        std::shared_ptr<implementation> impl_;\r

diff --git a/modules/ffmpeg/producer/video/video_decoder.cpp b/modules/ffmpeg/producer/video/video_decoder.cpp
index b426131e97c7b9c2b01a014f0c3bd4ef38a6febb..ca70484da3a810d3ae800c647fcb9fa1892495cb 100644 (file)
--- a/modules/ffmpeg/producer/video/video_decoder.cpp
+++ b/modules/ffmpeg/producer/video/video_decoder.cpp
@@ -62,7 +62,7 @@ struct video_decoder::implementation : boost::noncopyable
        double                                                                  fps_;\r
        int64_t                                                                 nb_frames_;\r
 public:\r
-       explicit implementation(const std::shared_ptr<AVFormatContext>& context, const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filter) \r
+       explicit implementation(const safe_ptr<AVFormatContext>& context, const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filter) \r
                : frame_factory_(frame_factory)\r
                , filter_(filter)\r
                , fps_(frame_factory_->get_video_format_desc().fps)\r
@@ -199,7 +199,7 @@ public:
        }\r
 };\r
 \r
-video_decoder::video_decoder(const std::shared_ptr<AVFormatContext>& context, const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filter) : impl_(new implementation(context, frame_factory, filter)){}\r
+video_decoder::video_decoder(const safe_ptr<AVFormatContext>& context, const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filter) : impl_(new implementation(context, frame_factory, filter)){}\r
 void video_decoder::push(const std::shared_ptr<AVPacket>& packet){impl_->push(packet);}\r
 std::vector<std::shared_ptr<AVFrame>> video_decoder::poll(){return impl_->poll();}\r
 bool video_decoder::ready() const{return impl_->ready();}\r

diff --git a/modules/ffmpeg/producer/video/video_decoder.h b/modules/ffmpeg/producer/video/video_decoder.h
index 76609f9ce3125ad596df9e0e4fe73ba4a170e599..dd91216aa4af28ec8bc77edf36bea528d428fc5b 100644 (file)
--- a/modules/ffmpeg/producer/video/video_decoder.h
+++ b/modules/ffmpeg/producer/video/video_decoder.h
@@ -41,7 +41,7 @@ namespace core {
 class video_decoder : boost::noncopyable\r
 {\r
 public:\r
-       explicit video_decoder(const std::shared_ptr<AVFormatContext>& context, const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filter);\r
+       explicit video_decoder(const safe_ptr<AVFormatContext>& context, const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filter);\r
        \r
        void push(const std::shared_ptr<AVPacket>& packet);\r
        bool ready() const;\r