fail early in case of empty audiobuffer queue

medooze · Sep 17, 2024 · aab5a19 · aab5a19
1 parent b6423bb
commit aab5a19
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 35 deletions.
diff --git a/src/g711/pcmacodec.cpp b/src/g711/pcmacodec.cpp
@@ -64,11 +64,10 @@ int PCMADecoder::Decode(const AudioFrame::const_shared& audioFrame)
 
 AudioBuffer::shared PCMADecoder::GetDecodedAudioFrame()
 {
-	if(!audioBufferQueue.empty())
-	{
-		auto audioBuffer = audioBufferQueue.front();
-		audioBufferQueue.pop();
-		return audioBuffer;
-	}
-	return {};
+	if(audioBufferQueue.empty())
+		return {};
+
+	auto audioBuffer = audioBufferQueue.front();
+	audioBufferQueue.pop();
+	return audioBuffer;	
 }
diff --git a/src/g711/pcmucodec.cpp b/src/g711/pcmucodec.cpp
@@ -61,12 +61,11 @@ int PCMUDecoder::Decode(const AudioFrame::const_shared& audioFrame)
 
 AudioBuffer::shared PCMUDecoder::GetDecodedAudioFrame()
 {
-	if(!audioBufferQueue.empty())
-	{
-		auto audioBuffer = audioBufferQueue.front();
-		audioBufferQueue.pop();
-		return audioBuffer;
-	}
-	return {};
+	if(audioBufferQueue.empty())
+		return {};
+
+	auto audioBuffer = audioBufferQueue.front();
+	audioBufferQueue.pop();
+	return audioBuffer;
 }
 
diff --git a/src/g722/g722codec.cpp b/src/g722/g722codec.cpp
@@ -62,11 +62,10 @@ int G722Decoder::Decode(const AudioFrame::const_shared& audioFrame)
 
 AudioBuffer::shared G722Decoder::GetDecodedAudioFrame()
 {
-	if(!audioBufferQueue.empty())
-	{
-		auto audioBuffer = audioBufferQueue.front();
-		audioBufferQueue.pop();
-		return audioBuffer;
-	}
-	return {};
+	if(audioBufferQueue.empty())
+		return {};
+
+	auto audioBuffer = audioBufferQueue.front();
+	audioBufferQueue.pop();
+	return audioBuffer;
 }
diff --git a/src/gsm/gsmcodec.cpp b/src/gsm/gsmcodec.cpp
@@ -95,11 +95,10 @@ int GSMDecoder::Decode(const AudioFrame::const_shared& audioFrame)
 
 AudioBuffer::shared GSMDecoder::GetDecodedAudioFrame()
 {
-	if(!audioBufferQueue.empty())
-	{
-		auto audioBuffer = audioBufferQueue.front();
-		audioBufferQueue.pop();
-		return audioBuffer;
-	}
-	return {};
+	if(audioBufferQueue.empty())
+		return {};
+
+	auto audioBuffer = audioBufferQueue.front();
+	audioBufferQueue.pop();
+	return audioBuffer;	
 }
diff --git a/src/opus/OpusDecoder.cpp b/src/opus/OpusDecoder.cpp
@@ -71,11 +71,10 @@ int OpusDecoder::Decode(const AudioFrame::const_shared& audioFrame)
 
 AudioBuffer::shared OpusDecoder::GetDecodedAudioFrame()
 {
-	if(!audioBufferQueue.empty())
-	{
-		auto audioBuffer = audioBufferQueue.front();
-		audioBufferQueue.pop();
-		return audioBuffer;
-	}
-	return {};
+	if(audioBufferQueue.empty())
+		return {};
+
+	auto audioBuffer = audioBufferQueue.front();
+	audioBufferQueue.pop();
+	return audioBuffer;	
 }