Merge pull request #55 from mikrosimage/dev_mediaAnalyserAnalyseSilence

mediaAnalyser app: the readers generate silence if there is no more data to decode

Author: valnoel

INSTALL.md

@@ -21,6 +21,16 @@ scons --help
 ```
 
 
+## Test
+
+C++ tests, based on [GTest](https://github.com/google/googletest) framework, are used to check the loudness analysis with the EBU test material.
+
+#### Run tests
+```
+scons test
+```
+
+
 ## Dependencies
 
 #### Libraries
@@ -54,7 +64,7 @@ To analyse and correct given audio files.
 Simple GUI to analyse and correct given audio files.
 
 * __loudness-media-analyser__  
-*External dependencies to [avtranscoder](https://github.com/avTranscoder/avTranscoder).*  
+*External dependencies to [avtranscoder](https://github.com/avTranscoder/avTranscoder) v0.9.2 or upper.*  
 To analyse audio in given files of any types.
 
 ## Tested compilers

USAGE.md

@@ -4,19 +4,28 @@
 Analyse the loudness of the given file.
 
 ```
-./build/release/loudness-analyser
+./install/bin/loudness-analyser
 ```
 
 #### Corrector
 Correct the loudness of the given file.
 
 ```
-./build/release/loudness-corrector
+./install/bin/loudness-corrector
 ```
 
 #### Validator
 A GUI which enables to analyse, visualize and correct the loudness.
 
 ```
-./build/release/loudness-validator
+./install/bin/loudness-validator
+```
+
+#### Media analyser
+Analyse the loudness of the set of streams defined in a given configuration file.
+The application is able to extract audio from a file with other type of streams (video, data...).
+It is based on [avtranscoder](https://github.com/avTranscoder/avTranscoder).
+
+```
+./install/bin/media-loudness-analyser
 ```

app/mediaAnalyser/AvSoundFile.cpp

@@ -65,6 +65,7 @@ AvSoundFile::AvSoundFile(const std::vector<AudioElement>& arrayToAnalyse)
 
         // Create reader to convert to float planar
         avtranscoder::AudioReader* reader = new avtranscoder::AudioReader(*inputFile, streamIndex, channelIndex);
+        reader->continueWithGenerator();
         _audioReader.push_back(reader);
 
         // Get data from audio stream
@@ -141,11 +142,8 @@ void AvSoundFile::analyse(Loudness::analyser::LoudnessAnalyser& analyser)
         {
             newTotalNbSamplesToAnalyse += _forceDurationToAnalyse * _inputSampleRate.at(i) * _inputNbChannels.at(i);
         }
-        // the forced number of samples cannot be superior to the existing number of samples!
-        if(newTotalNbSamplesToAnalyse < _totalNbSamplesToAnalyse)
-        {
-            _totalNbSamplesToAnalyse = newTotalNbSamplesToAnalyse;
-        }
+        // set total number of samples to analyse
+        _totalNbSamplesToAnalyse = newTotalNbSamplesToAnalyse;
     }
 
     // open file to print duration