2.0. ffmpeg_producer: Fixed data race and frame timing.

[casparcg] / modules / ffmpeg / producer / input.cpp

diff --git a/modules/ffmpeg/producer/input.cpp b/modules/ffmpeg/producer/input.cpp
index b19c9794fbc96ca230faa9404498020d3cce4308..84fadc9912a2fda1558b9733eea3b65b7112a0a5 100644 (file)
--- a/modules/ffmpeg/producer/input.cpp
+++ b/modules/ffmpeg/producer/input.cpp
@@ -80,14 +80,15 @@ public:
                index_ = (*it)->index;\r
 \r
                int errn = tbb_avcodec_open((*it)->codec, codec);\r
-               if(errn >= 0)\r
-               {\r
-                       ctx_.reset((*it)->codec, tbb_avcodec_close);\r
+               if(errn < 0)\r
+                       return errn;\r
+                               \r
+               ctx_.reset((*it)->codec, tbb_avcodec_close);\r
 \r
-                       // Some files give an invalid time_base numerator, try to fix it.\r
-                       if(ctx_ && ctx_->time_base.num == 1)\r
-                               ctx_->time_base.num = static_cast<int>(std::pow(10.0, static_cast<int>(std::log10(static_cast<float>(ctx_->time_base.den)))-1));\r
-               }\r
+               // Some files give an invalid time_base numerator, try to fix it.\r
+               if(ctx_ && ctx_->time_base.num == 1)\r
+                       ctx_->time_base.num = static_cast<int>(std::pow(10.0, static_cast<int>(std::log10(static_cast<float>(ctx_->time_base.den)))-1));\r
+               \r
                return errn;    \r
        }\r
 \r
@@ -101,6 +102,9 @@ public:
                if(pkt && pkt->stream_index != index_)\r
                        return;\r
 \r
+               if(!ctx_)\r
+                       return;\r
+\r
                if(pkt)\r
                        av_dup_packet(pkt.get());\r
 \r
@@ -109,7 +113,7 @@ public:
 \r
        int index() const {return index_;}\r
        \r
-       const std::shared_ptr<AVCodecContext>& ctx() { return ctx_; }\r
+       const std::shared_ptr<AVCodecContext>& ctx() const { return ctx_; }\r
 \r
        operator bool(){return ctx_ != nullptr;}\r
 \r
@@ -142,11 +146,7 @@ public:
                , filename_(filename)\r
                , executor_(print())\r
                , start_(std::max(start, 0))\r
-       {               \r
-               graph_->set_color("audio-input-buffer", diagnostics::color(0.5f, 1.0f, 0.2f));\r
-               graph_->set_color("video-input-buffer", diagnostics::color(0.2f, 0.5f, 1.0f));\r
-               graph_->set_color("seek", diagnostics::color(0.5f, 1.0f, 0.5f));        \r
-               \r
+       {                               \r
                int errn;\r
 \r
                AVFormatContext* weak_format_context_ = nullptr;\r
@@ -198,7 +198,15 @@ public:
 \r
                for(size_t n = 0; n < 32; ++n) // Read some packets for pre-rolling.\r
                        read_next_packet();\r
-                                                       \r
+                                               \r
+               if(audio_stream_)\r
+                       graph_->set_color("audio-input-buffer", diagnostics::color(0.5f, 1.0f, 0.2f));\r
+               \r
+               if(video_stream_)\r
+                       graph_->set_color("video-input-buffer", diagnostics::color(0.2f, 0.5f, 1.0f));\r
+               \r
+               graph_->set_color("seek", diagnostics::color(0.5f, 1.0f, 0.5f));        \r
+\r
                executor_.begin_invoke([this]{read_file();});\r
                CASPAR_LOG(info) << print() << " Started.";\r
        }\r
@@ -206,6 +214,10 @@ public:
        ~implementation()\r
        {\r
                stop();\r
+               // Unblock thread.\r
+               std::shared_ptr<AVPacket> packet;\r
+               try_pop_video_packet(packet);\r
+               try_pop_audio_packet(packet);\r
        }\r
                \r
        bool try_pop_video_packet(std::shared_ptr<AVPacket>& packet)\r
@@ -234,12 +246,7 @@ private:
        void stop()\r
        {\r
                executor_.stop();\r
-\r
-               // Unblock thread.\r
-               std::shared_ptr<AVPacket> packet;\r
-               try_pop_video_packet(packet);\r
-               try_pop_audio_packet(packet);\r
-\r
+               \r
                CASPAR_LOG(info) << print() << " Stopping.";\r
        }\r
 \r
@@ -257,7 +264,7 @@ private:
        {               \r
                try\r
                {\r
-                       std::shared_ptr<AVPacket> read_packet(new AVPacket(), [](AVPacket* p)\r
+                       std::shared_ptr<AVPacket> read_packet(new AVPacket, [](AVPacket* p)\r
                        {\r
                                av_free_packet(p);\r
                                delete p;\r
@@ -271,12 +278,12 @@ private:
                                {\r
                                        seek_frame(start_, AVSEEK_FLAG_BACKWARD);\r
                                        graph_->add_tag("seek");                \r
-                                       CASPAR_LOG(info) << print() << " Received EOF. Looping.";                       \r
+                                       //CASPAR_LOG(info) << print() << " Received EOF. Looping.";                     \r
                                }       \r
                                else\r
                                {\r
                                        stop();\r
-                                       CASPAR_LOG(info) << print() << " Received EOF. Stopping.";\r
+                                       //CASPAR_LOG(info) << print() << " Received EOF. Stopping.";\r
                                }\r
                        }\r
                        else if(errn < 0)\r
@@ -290,12 +297,17 @@ private:
                        }\r
                        else\r
                        {\r
-                               video_stream_.push(read_packet);\r
-                               audio_stream_.push(read_packet);\r
-                       }\r
-                                               \r
-                       graph_->update_value("video-input-buffer", static_cast<float>(video_stream_.size())/static_cast<float>(PACKET_BUFFER_COUNT));           \r
-                       graph_->update_value("audio-input-buffer", static_cast<float>(audio_stream_.size())/static_cast<float>(PACKET_BUFFER_COUNT));           \r
+                               if(video_stream_)\r
+                               {       \r
+                                       video_stream_.push(read_packet);\r
+                                       graph_->update_value("video-input-buffer", static_cast<float>(video_stream_.size())/static_cast<float>(PACKET_BUFFER_COUNT));           \r
+                               }\r
+                               if(audio_stream_)\r
+                               {       \r
+                                       audio_stream_.push(read_packet);\r
+                                       graph_->update_value("audio-input-buffer", static_cast<float>(audio_stream_.size())/static_cast<float>(PACKET_BUFFER_COUNT));   \r
+                               }\r
+                       }                                                       \r
                }\r
                catch(...)\r
                {\r
@@ -334,15 +346,18 @@ private:
 \r
        bool is_eof(int errn)\r
        {\r
-               if(errn == AVERROR(EIO))\r
-                       CASPAR_LOG(warning) << print() << " Received EIO, assuming EOF";\r
+               //if(errn == AVERROR(EIO))\r
+               //      CASPAR_LOG(warning) << print() << " Received EIO, assuming EOF";\r
 \r
                return errn == AVERROR_EOF || errn == AVERROR(EIO); // av_read_frame doesn't always correctly return AVERROR_EOF;\r
        }\r
        \r
        std::wstring print() const\r
        {\r
-               return L"ffmpeg_input[" + filename_ + L"]";\r
+               const auto video = widen(video_stream_.ctx() ? video_stream_.ctx()->codec->name : "no-video");\r
+               const auto audio = widen(audio_stream_.ctx() ? audio_stream_.ctx()->codec->name : "no-audio");\r
+\r
+               return L"ffmpeg_input[" + filename_ + L"(" + boost::lexical_cast<std::wstring>(static_cast<int>(100*fps_)) + L"|" + video + L"|" + audio + L")]";\r
        }\r
 };\r
 \r