From: Helge Norberg <helge.norberg@gmail.com>
Date: Mon, 20 Jan 2014 15:28:12 +0000 (+0100)
Subject: Reverted audio stream fix
X-Git-Tag: 2.0.7_Beta~1
X-Git-Url: https://git.sesse.net/?p=casparcg;a=commitdiff_plain;h=c91c570e35e0c4a2be68de4c4d7bd4ddf22cd877

Reverted audio stream fix
---

diff --git a/CHANGES.txt b/CHANGES.txt
index 183a5f896..7a028201a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,7 +8,6 @@ General
   o FFmpeg: Upgraded to master and adapted CasparCG to FFmpeg API changes
     (Robert Nagy sponsored by SVT)
   o FFmpeg: Fixed problem with frame count calculation (Thomas Kaltz III)
-  o FFmpeg: Disable audio decoding if no audio is decoded (Thomas Kaltz III)
 
 Producers
 ---------
diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index ab5b6a88a..7c7ec5176 100644
--- 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
 
 	int64_t														frame_number_;
 	uint32_t													file_frame_number_;
-
-	uint32_t													audio_poll_tries_;
 		
 public:
 	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)
@@ -137,7 +135,6 @@ public:
 		, thumbnail_mode_(thumbnail_mode)
 		, last_frame_(core::basic_frame::empty())
 		, frame_number_(0)
-		, audio_poll_tries_(0)
 	{
 		graph_->set_color("frame-time", diagnostics::color(0.1f, 1.0f, 0.1f));
 		graph_->set_color("underflow", diagnostics::color(0.6f, 0.3f, 0.9f));	
@@ -463,19 +460,9 @@ public:
 		[&]
 		{		
 			if(!muxer_->audio_ready() && audio_decoder_)
-			{
 				audio = audio_decoder_->poll();
-				if(audio == nullptr)
-					audio_poll_tries_++;
-			}
 		});
 		
-		if(audio_decoder_ && audio_poll_tries_ > 7)
-		{
-			CASPAR_LOG(warning) << print() << "Failed to get valid packets from audio stream. Removing audio decoder.";
-			audio_decoder_.reset(nullptr);
-		}
-		
 		muxer_->push(video, hints);
 		muxer_->push(audio);