From e5f16f7ab23063fe9a8c647c490b37c97c23ee81 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Fri, 22 Jan 2016 13:34:12 +0100 Subject: [PATCH 1/5] AudioDecoder: checked if no need to extract one channel in the audio stream --- src/AvTranscoder/decoder/AudioDecoder.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/AvTranscoder/decoder/AudioDecoder.cpp b/src/AvTranscoder/decoder/AudioDecoder.cpp index fa7da88a..dae1684d 100644 --- 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(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)) From 695db8b58fa9105f277810fd7454918323d90055 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Fri, 22 Jan 2016 13:35:49 +0100 Subject: [PATCH 2/5] avplay: fixed compilation error --- app/avPlay/Window.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/avPlay/Window.cpp b/app/avPlay/Window.cpp index 4bb9d006..b560e195 100644 --- a/app/avPlay/Window.cpp +++ b/app/avPlay/Window.cpp @@ -1,7 +1,5 @@ #include "Window.hpp" -#include - #ifdef __APPLE__ #include #include From a85d12bad3ebfea9c4d518fcd5b75bcdcf4ed22e Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Fri, 22 Jan 2016 13:36:42 +0100 Subject: [PATCH 3/5] pyTest: avoid using 'format' key word in testOutputFile --- test/pyTest/testOutputFile.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/test/pyTest/testOutputFile.py b/test/pyTest/testOutputFile.py index 69d82298..e247a34f 100644 --- a/test/pyTest/testOutputFile.py +++ b/test/pyTest/testOutputFile.py @@ -7,12 +7,12 @@ def testCreateOutputFileWithExtension(): """ Create an OutputFile with a filename with extension. """ - ext = "mov" - outputFileName = "testCreateOutputFileWithExtension." + ext + formatName = "mov" + outputFileName = "testCreateOutputFileWithExtension." + formatName ouputFile = av.OutputFile( outputFileName ) assert_equals( ouputFile.getFilename(), outputFileName ) - assert_equals( ouputFile.getFormatName(), ext ) + assert_equals( ouputFile.getFormatName(), formatName ) @raises(IOError) @@ -31,12 +31,12 @@ def testCreateOutputFileWithoutExtensionWithFormat(): Create an OutputFile with a filename without extension. Indicate the format. """ - format = "mov" + formatName = "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 ) def testCreateOutputFileWithoutExtensionWithMimeType(): @@ -58,11 +58,11 @@ def testCreateOutputFileWithoutExtensionWithInconsistentFormatAndMimeType(): Indicate inconsistent format and Mime Type. The OutputFile should by-pass the Mime Type. """ - format = "mov" + formatName = "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 ) From 385a8850323555d55520fd3739726f447a6d5f76 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Fri, 22 Jan 2016 13:38:23 +0100 Subject: [PATCH 4/5] pyTest: checked formatLongName in testOutputFile --- test/pyTest/testOutputFile.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/pyTest/testOutputFile.py b/test/pyTest/testOutputFile.py index e247a34f..050f5f7e 100644 --- a/test/pyTest/testOutputFile.py +++ b/test/pyTest/testOutputFile.py @@ -8,11 +8,13 @@ def testCreateOutputFileWithExtension(): Create an OutputFile with a filename with extension. """ formatName = "mov" + formatLongName = "QuickTime / MOV" outputFileName = "testCreateOutputFileWithExtension." + formatName ouputFile = av.OutputFile( outputFileName ) assert_equals( ouputFile.getFilename(), outputFileName ) assert_equals( ouputFile.getFormatName(), formatName ) + assert_equals( ouputFile.getFormatLongName(), formatLongName ) @raises(IOError) @@ -32,11 +34,13 @@ def testCreateOutputFileWithoutExtensionWithFormat(): Indicate the format. """ formatName = "mov" + formatLongName = "QuickTime / MOV" outputFileName = "testCreateOutputFileWithoutExtensionWithFormat" ouputFile = av.OutputFile( outputFileName, formatName ) assert_equals( ouputFile.getFilename(), outputFileName ) assert_equals( ouputFile.getFormatName(), formatName ) + assert_equals( ouputFile.getFormatLongName(), formatLongName ) def testCreateOutputFileWithoutExtensionWithMimeType(): @@ -59,10 +63,12 @@ def testCreateOutputFileWithoutExtensionWithInconsistentFormatAndMimeType(): The OutputFile should by-pass the Mime Type. """ formatName = "mov" + formatLongName = "QuickTime / MOV" mimeType = "application/mp4" outputFileName = "testCreateOutputFileWithoutExtensionWithInconsistentFormatAndMimeType" ouputFile = av.OutputFile( outputFileName, formatName, mimeType ) assert_equals( ouputFile.getFilename(), outputFileName ) assert_equals( ouputFile.getFormatName(), formatName ) + assert_equals( ouputFile.getFormatLongName(), formatLongName ) From dbfc05027dc5023c6bbf77b108c983af69869cab Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Fri, 22 Jan 2016 13:39:24 +0100 Subject: [PATCH 5/5] pyTest: cleaned testOutputFile --- test/pyTest/testOutputFile.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/pyTest/testOutputFile.py b/test/pyTest/testOutputFile.py index 050f5f7e..6edfaf27 100644 --- a/test/pyTest/testOutputFile.py +++ b/test/pyTest/testOutputFile.py @@ -23,9 +23,7 @@ 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():