Merge pull request #217 from cchampet/dev_audioDecoderCheckIfExtractChannelIsNecessary

cchampet · cchampet · commit aea0ed9f5391 · 2016-01-22T14:54:29.000+01:00
AudioDecoder: check if extract one channel is necessary
diff --git a/app/avPlay/Window.cpp b/app/avPlay/Window.cpp
@@ -1,7 +1,5 @@
 #include "Window.hpp"
 
-#include <AvTranscoder/properties/print.hpp>
-
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
 #include <GLUT/glut.h>
diff --git a/src/AvTranscoder/decoder/AudioDecoder.cpp b/src/AvTranscoder/decoder/AudioDecoder.cpp
@@ -116,6 +116,12 @@ bool AudioDecoder::decodeNextFrame(Frame& frameBuffer, const size_t channelIndex
 {
     AudioFrame& audioBuffer = static_cast<AudioFrame&>(frameBuffer);
 
+    // if no need to extract one channel in the audio stream
+    if(audioBuffer.getNbChannels() == 1 && channelIndex == 0)
+    {
+        return decodeNextFrame(frameBuffer);
+    }
+
     // decode all data of the next frame
     AudioFrame allDataOfNextFrame(audioBuffer);
     if(!decodeNextFrame(allDataOfNextFrame))
diff --git a/test/pyTest/testOutputFile.py b/test/pyTest/testOutputFile.py
@@ -7,12 +7,14 @@ def testCreateOutputFileWithExtension():
     """
     Create an OutputFile with a filename with extension.
     """
-    ext = "mov"
-    outputFileName = "testCreateOutputFileWithExtension." + ext
+    formatName = "mov"
+    formatLongName = "QuickTime / MOV"
+    outputFileName = "testCreateOutputFileWithExtension." + formatName
     ouputFile = av.OutputFile( outputFileName )
 
     assert_equals( ouputFile.getFilename(), outputFileName )
-    assert_equals( ouputFile.getFormatName(), ext )
+    assert_equals( ouputFile.getFormatName(), formatName )
+    assert_equals( ouputFile.getFormatLongName(), formatLongName )
 
 
 @raises(IOError)
@@ -21,22 +23,22 @@ def testCreateOutputFileWithoutExtension():
     Create an OutputFile with a filename without extension.
     """
     outputFileName = "testCreateOutputFileWithoutExtension"
-    ouputFile = av.OutputFile( outputFileName )
-
-    assert_equals( ouputFile.getFilename(), outputFileName )
+    av.OutputFile( outputFileName )
 
 
 def testCreateOutputFileWithoutExtensionWithFormat():
     """
     Create an OutputFile with a filename without extension.
     Indicate the format.
     """
-    format = "mov"
+    formatName = "mov"
+    formatLongName = "QuickTime / MOV"
     outputFileName = "testCreateOutputFileWithoutExtensionWithFormat"
-    ouputFile = av.OutputFile( outputFileName, format )
+    ouputFile = av.OutputFile( outputFileName, formatName )
 
     assert_equals( ouputFile.getFilename(), outputFileName )
-    assert_equals( ouputFile.getFormatName(), format )
+    assert_equals( ouputFile.getFormatName(), formatName )
+    assert_equals( ouputFile.getFormatLongName(), formatLongName )
 
 
 def testCreateOutputFileWithoutExtensionWithMimeType():
@@ -58,11 +60,13 @@ def testCreateOutputFileWithoutExtensionWithInconsistentFormatAndMimeType():
     Indicate inconsistent format and Mime Type.
     The OutputFile should by-pass the Mime Type.
     """
-    format = "mov"
+    formatName = "mov"
+    formatLongName = "QuickTime / MOV"
     mimeType = "application/mp4"
     outputFileName = "testCreateOutputFileWithoutExtensionWithInconsistentFormatAndMimeType"
-    ouputFile = av.OutputFile( outputFileName, format, mimeType )
+    ouputFile = av.OutputFile( outputFileName, formatName, mimeType )
 
     assert_equals( ouputFile.getFilename(), outputFileName )
-    assert_equals( ouputFile.getFormatName(), format )
+    assert_equals( ouputFile.getFormatName(), formatName )
+    assert_equals( ouputFile.getFormatLongName(), formatLongName )
 
