Reverted audio stream fix

diff --git a/CHANGES.txt b/CHANGES.txt
index 183a5f896d92a03393e9d5ea9b4792b01e646b36..7a028201ae629b4703274efe31420324d5bae077 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,7 +8,6 @@ General
   o FFmpeg: Upgraded to master and adapted CasparCG to FFmpeg API changes\r
     (Robert Nagy sponsored by SVT)\r
   o FFmpeg: Fixed problem with frame count calculation (Thomas Kaltz III)\r
-  o FFmpeg: Disable audio decoding if no audio is decoded (Thomas Kaltz III)\r
 \r
 Producers\r
 ---------\r

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index ab5b6a88a43cce5087937e63fa0543675bdbd0ea..7c7ec51765da26d71df03db3dfb65df2aef4aebb 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -119,8 +119,6 @@ struct ffmpeg_producer : public core::frame_producer
 \r
        int64_t                                                                                                         frame_number_;\r
        uint32_t                                                                                                        file_frame_number_;\r
-\r
-       uint32_t                                                                                                        audio_poll_tries_;\r
                \r
 public:\r
        explicit ffmpeg_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filename, FFMPEG_Resource resource_type, const std::wstring& filter, bool loop, uint32_t start, uint32_t length, bool thumbnail_mode, const std::wstring& custom_channel_order, const ffmpeg_producer_params& vid_params)\r
@@ -137,7 +135,6 @@ public:
                , thumbnail_mode_(thumbnail_mode)\r
                , last_frame_(core::basic_frame::empty())\r
                , frame_number_(0)\r
-               , audio_poll_tries_(0)\r
        {\r
                graph_->set_color("frame-time", diagnostics::color(0.1f, 1.0f, 0.1f));\r
                graph_->set_color("underflow", diagnostics::color(0.6f, 0.3f, 0.9f));   \r
@@ -463,19 +460,9 @@ public:
                [&]\r
                {               \r
                        if(!muxer_->audio_ready() && audio_decoder_)\r
-                       {\r
                                audio = audio_decoder_->poll();\r
-                               if(audio == nullptr)\r
-                                       audio_poll_tries_++;\r
-                       }\r
                });\r
                \r
-               if(audio_decoder_ && audio_poll_tries_ > 7)\r
-               {\r
-                       CASPAR_LOG(warning) << print() << "Failed to get valid packets from audio stream. Removing audio decoder.";\r
-                       audio_decoder_.reset(nullptr);\r
-               }\r
-               \r
                muxer_->push(video, hints);\r
                muxer_->push(audio);\r
 \r