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 d022e8d8882577d014918595de816b9176570e33..2f919279f01ce0633355e4f1545c520a8d0477ec 100644 (file)
--- a/modules/ffmpeg/producer/audio/audio_decoder.cpp
+++ b/modules/ffmpeg/producer/audio/audio_decoder.cpp
@@ -98,47 +98,23 @@ public:
                auto result = std::make_shared<core::audio_buffer>();\r
 \r
                if(!codec_context_)\r
-               {\r
-                       result = empty_audio();\r
-                       return result;\r
-               }\r
+                       return empty_audio();\r
 \r
                std::shared_ptr<AVPacket> packet;\r
                if(!input_->try_pop_audio(packet))\r
                        return result;\r
 \r
-               if(packet == flush_packet())\r
+               if(packet)\r
                {\r
+                       if(!packet->data && (codec_context_->codec->capabilities & CODEC_CAP_DELAY))\r
+                               while(decode(*packet, *result));\r
+\r
+                       while(packet->size > 0)         \r
+                               decode(*packet, *result);\r
+               }               \r
+               else            \r
                        avcodec_flush_buffers(codec_context_.get());\r
-                       return result;\r
-               }\r
-               \r
-               if(packet == null_packet())\r
-               {\r
-                       if(codec_context_->codec->capabilities & CODEC_CAP_DELAY)\r
-                       {\r
-                               AVPacket pkt = {0};                \r
-                               av_init_packet(&pkt);\r
-                               \r
-                               core::audio_buffer audio;\r
-                               while(decode(pkt, audio))\r
-                                       boost::range::push_back(*result, audio);\r
-                       }\r
-                       return result;\r
-               }\r
 \r
-               while(packet->size > 0)\r
-               {\r
-                       core::audio_buffer audio;\r
-                       if(decode(*packet, audio))\r
-                               boost::range::push_back(*result, audio);                                \r
-               }\r
-               \r
-               event_subject_  << monitor::event("file/audio/sample-rate")     % codec_context_->sample_rate\r
-                                               << monitor::event("file/audio/channels")        % codec_context_->channels\r
-                                               << monitor::event("file/audio/format")          % u8(av_get_sample_fmt_name(codec_context_->sample_fmt))\r
-                                               << monitor::event("file/audio/codec")           % u8(codec_context_->codec->long_name);         \r
-               \r
                return result;\r
        }\r
 \r
@@ -169,8 +145,13 @@ public:
                                                                                        in, decoded_frame->nb_samples);\r
                        \r
                auto ptr = reinterpret_cast<int32_t*>(buffer_.data());\r
-               result = core::audio_buffer(ptr, ptr + channel_samples * format_desc_.audio_channels);\r
+               result.insert(result.end(), ptr, ptr + channel_samples * format_desc_.audio_channels);          \r
                \r
+               event_subject_  << monitor::event("file/audio/sample-rate")     % codec_context_->sample_rate\r
+                                               << monitor::event("file/audio/channels")        % codec_context_->channels\r
+                                               << monitor::event("file/audio/format")          % u8(av_get_sample_fmt_name(codec_context_->sample_fmt))\r
+                                               << monitor::event("file/audio/codec")           % u8(codec_context_->codec->long_name);                         \r
+\r
                return true;\r
        }\r
        \r

diff --git a/modules/ffmpeg/producer/input/input.cpp b/modules/ffmpeg/producer/input/input.cpp
index 376c681ac1a07654b0f1d9dad886bbe472452440..f356aa3fa59fe9ded1651248223939599b99addf 100644 (file)
--- a/modules/ffmpeg/producer/input/input.cpp
+++ b/modules/ffmpeg/producer/input/input.cpp
@@ -79,7 +79,7 @@ public:
        \r
        void push(const std::shared_ptr<AVPacket>& packet)\r
        {\r
-               if(packet->stream_index != index_ && packet != flush_packet() && packet != null_packet())\r
+               if(packet && packet->data && packet->stream_index != index_)\r
                        return;\r
 \r
                packets_.push(packet);\r
@@ -222,8 +222,8 @@ private:
                \r
                THROW_ON_ERROR2(avformat_seek_file(format_context_.get(), default_stream_index_, std::numeric_limits<int64_t>::min(), fixed_target, fixed_target, 0), print());         \r
                \r
-               video_stream_.push(flush_packet());\r
-               audio_stream_.push(flush_packet());\r
+               video_stream_.push(nullptr);\r
+               audio_stream_.push(nullptr);\r
        }\r
                \r
        bool full() const\r
@@ -245,8 +245,12 @@ private:
                \r
                if(is_eof(ret))                                                                                                              \r
                {\r
-                       video_stream_.push(null_packet());\r
-                       audio_stream_.push(null_packet());\r
+                       std::shared_ptr<AVPacket> eof_packet(new AVPacket());\r
+                       memset(eof_packet.get(), 0, sizeof(AVPacket));\r
+                       av_init_packet(eof_packet.get());\r
+\r
+                       video_stream_.push(eof_packet);\r
+                       audio_stream_.push(eof_packet);\r
 \r
                        if(loop_)\r
                        {\r
@@ -293,7 +297,6 @@ private:
 \r
                while(is_running_)\r
                {\r
-\r
                        try\r
                        {\r
                                boost::this_thread::sleep(boost::posix_time::milliseconds(1));\r

diff --git a/modules/ffmpeg/producer/util/util.cpp b/modules/ffmpeg/producer/util/util.cpp
index fc91a876fdf17505d10b22b62839df2cf0f97968..d3aed7d0caa4b06a62b24accfcbdc8eae8b33012 100644 (file)
--- a/modules/ffmpeg/producer/util/util.cpp
+++ b/modules/ffmpeg/producer/util/util.cpp
@@ -63,43 +63,18 @@ extern "C"
 \r
 namespace caspar { namespace ffmpeg {\r
                \r
-std::shared_ptr<core::audio_buffer> flush_audio()\r
-{\r
-       static std::shared_ptr<core::audio_buffer> audio(new core::audio_buffer());\r
-       return audio;\r
-}\r
-\r
 std::shared_ptr<core::audio_buffer> empty_audio()\r
 {\r
        static std::shared_ptr<core::audio_buffer> audio(new core::audio_buffer());\r
        return audio;\r
 }\r
 \r
-std::shared_ptr<AVFrame>                       flush_video()\r
-{\r
-       static std::shared_ptr<AVFrame> video(avcodec_alloc_frame(), av_free);\r
-       return video;\r
-}\r
-\r
 std::shared_ptr<AVFrame>                       empty_video()\r
 {\r
        static std::shared_ptr<AVFrame> video(avcodec_alloc_frame(), av_free);\r
        return video;\r
 }\r
 \r
-spl::shared_ptr<AVPacket> flush_packet()\r
-{\r
-       static spl::shared_ptr<AVPacket> pkt(new AVPacket());\r
-       return pkt;\r
-}\r
-\r
-spl::shared_ptr<AVPacket> null_packet()\r
-{\r
-       static spl::shared_ptr<AVPacket> pkt(new AVPacket());\r
-       return pkt;\r
-}\r
-\r
-\r
 core::field_mode get_mode(const AVFrame& frame)\r
 {\r
        if(!frame.interlaced_frame)\r

diff --git a/modules/ffmpeg/producer/util/util.h b/modules/ffmpeg/producer/util/util.h
index 5ceff326ffeeb81d0ee8525bb24ceac8986fe5da..e4edb010cefe42ab1d1e56b8aa921790a0c6e4b1 100644 (file)
--- a/modules/ffmpeg/producer/util/util.h
+++ b/modules/ffmpeg/producer/util/util.h
@@ -43,13 +43,8 @@ FORWARD2(caspar, core, class frame_factory);
 \r
 namespace caspar { namespace ffmpeg {\r
                \r
-std::shared_ptr<core::audio_buffer> flush_audio();\r
 std::shared_ptr<core::audio_buffer> empty_audio();\r
-std::shared_ptr<AVFrame>                       flush_video();\r
-std::shared_ptr<AVFrame>                       empty_video();\r
-\r
-spl::shared_ptr<AVPacket>                      flush_packet(); \r
-spl::shared_ptr<AVPacket>                      null_packet();                  \r
+std::shared_ptr<AVFrame>                       empty_video();  \r
 \r
 // Utils\r
 \r

diff --git a/modules/ffmpeg/producer/video/video_decoder.cpp b/modules/ffmpeg/producer/video/video_decoder.cpp
index 043c75e01a2cd9ea160f39ab7341034a595aecf4..c8dbcb1a83a6ee96c85e7999a85e3d2dfea2d806 100644 (file)
--- a/modules/ffmpeg/producer/video/video_decoder.cpp
+++ b/modules/ffmpeg/producer/video/video_decoder.cpp
@@ -106,43 +106,27 @@ public:
                std::shared_ptr<AVPacket> packet;\r
                if(!input_->try_pop_video(packet))\r
                        return result;\r
-\r
-               if(packet == flush_packet())\r
-               {\r
-                       avcodec_flush_buffers(codec_context_.get());\r
-                       return result;\r
-               }\r
-               \r
-               if(packet == null_packet())\r
-               {\r
-                       if(codec_context_->codec->capabilities & CODEC_CAP_DELAY)\r
-                       {\r
-                               AVPacket pkt = {0};                \r
-                               av_init_packet(&pkt);\r
                                \r
-                               std::shared_ptr<AVFrame> frame;\r
-                               while(decode(pkt, frame))\r
-                                       result.push_back(frame);        \r
-                       }\r
-                       return result;\r
-               }\r
-\r
-               while(packet->size > 0)\r
+               if(packet)\r
                {\r
-                       std::shared_ptr<AVFrame> frame;\r
-                       if(decode(*packet, frame))\r
-                               result.push_back(frame);                                \r
+                       if(!packet->data && (codec_context_->codec->capabilities & CODEC_CAP_DELAY))            \r
+                               while(decode(*packet, result));                 \r
+\r
+                       while(packet->size > 0)\r
+                               decode(*packet, result);        \r
                }\r
+               else\r
+                       avcodec_flush_buffers(codec_context_.get());\r
                \r
                return result;\r
        }\r
 \r
-       bool decode(AVPacket& pkt, std::shared_ptr<AVFrame>& result)\r
+       bool decode(AVPacket& pkt, std::vector<std::shared_ptr<AVFrame>>& result)\r
        {\r
-               result = std::shared_ptr<AVFrame>(avcodec_alloc_frame(), av_free);\r
+               auto frame = std::shared_ptr<AVFrame>(avcodec_alloc_frame(), av_free);\r
 \r
                int got_frame = 0;\r
-               auto len = THROW_ON_ERROR2(avcodec_decode_video2(codec_context_.get(), result.get(), &got_frame, &pkt), "[video_decocer]");\r
+               auto len = THROW_ON_ERROR2(avcodec_decode_video2(codec_context_.get(), frame.get(), &got_frame, &pkt), "[video_decocer]");\r
                                \r
                if(len == 0)\r
                {\r
@@ -161,16 +145,18 @@ public:
 \r
                file_frame_number_ = packet_frame_number;\r
 \r
-               is_progressive_ = !result->interlaced_frame;\r
+               is_progressive_ = !frame->interlaced_frame;\r
                \r
-               if(result->repeat_pict > 0)\r
+               if(frame->repeat_pict > 0)\r
                        CASPAR_LOG(warning) << "[video_decoder] repeat_pict not implemented.";\r
                                \r
                event_subject_  << monitor::event("file/video/width")   % width_\r
                                                << monitor::event("file/video/height")  % height_\r
-                                               << monitor::event("file/video/field")   % u8(!result->interlaced_frame ? "progressive" : (result->top_field_first ? "upper" : "lower"))\r
+                                               << monitor::event("file/video/field")   % u8(!frame->interlaced_frame ? "progressive" : (frame->top_field_first ? "upper" : "lower"))\r
                                                << monitor::event("file/video/codec")   % u8(codec_context_->codec->long_name);\r
                \r
+               result.push_back(frame);\r
+\r
                return true;\r
        }\r
        \r