Transcoder: updated how to get profile from a file

Clement Champetier · Clement Champetier · commit 6a62a212f674 · 2016-07-20T16:48:29.000+02:00
* Renamed private method 'getProfileFromFile' to 'getProfileFromInput'.
* Removed private method 'addTranscodeStream'.
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -48,7 +48,10 @@ void Transcoder::addStream(const InputStreamDesc& inputStreamDesc, const std::st
             addRewrapStream(inputStreamDesc, offset);
         // Transcode (transparent for the user)
         else
-            addTranscodeStream(inputStreamDesc, offset);
+        {
+            const ProfileLoader::Profile profile = getProfileFromInput(inputStreamDesc);
+            addStream(inputStreamDesc, profile, offset);
+        }
     }
     // Transcode
     else
@@ -203,24 +206,6 @@ void Transcoder::addRewrapStream(const InputStreamDesc& inputStreamDesc, const f
     _streamTranscoders.push_back(_streamTranscodersAllocated.back());
 }
 
-void Transcoder::addTranscodeStream(const InputStreamDesc& inputStreamDesc, const float offset)
-{
-    // Get profile from input file
-    InputFile inputFile(inputStreamDesc._filename);
-    ProfileLoader::Profile profile = getProfileFromFile(inputFile, inputStreamDesc._streamIndex);
-
-    // override number of channels parameters to manage demultiplexing
-    if(inputStreamDesc.demultiplexing())
-    {
-        // number of channels
-        std::stringstream ss;
-        ss << inputStreamDesc._channelIndexArray.size();
-        profile[constants::avProfileChannel] = ss.str();
-    }
-
-    addTranscodeStream(inputStreamDesc, profile, offset);
-}
-
 void Transcoder::addTranscodeStream(const InputStreamDesc& inputStreamDesc, const ProfileLoader::Profile& profile,
                                     const float offset)
 {
@@ -296,12 +281,14 @@ InputFile* Transcoder::addInputFile(const std::string& filename, const int strea
     return referenceFile;
 }
 
-ProfileLoader::Profile Transcoder::getProfileFromFile(InputFile& inputFile, const size_t streamIndex)
-{
-    const StreamProperties* streamProperties = &inputFile.getProperties().getStreamPropertiesWithIndex(streamIndex);
+ProfileLoader::Profile Transcoder::getProfileFromInput(const InputStreamDesc& inputStreamDesc)
+{    
+    InputFile inputFile(inputStreamDesc._filename);
+
+    const StreamProperties* streamProperties = &inputFile.getProperties().getStreamPropertiesWithIndex(inputStreamDesc._streamIndex);
     const VideoProperties* videoProperties = NULL;
     const AudioProperties* audioProperties = NULL;
-    switch(inputFile.getStream(streamIndex).getProperties().getStreamType())
+    switch(inputFile.getStream(inputStreamDesc._streamIndex).getProperties().getStreamType())
     {
         case AVMEDIA_TYPE_VIDEO:
         {
@@ -343,9 +330,18 @@ ProfileLoader::Profile Transcoder::getProfileFromFile(InputFile& inputFile, cons
         std::stringstream ss;
         ss << audioProperties->getSampleRate();
         profile[constants::avProfileSampleRate] = ss.str();
-        ss.str("");
-        ss << audioProperties->getNbChannels();
-        profile[constants::avProfileChannel] = ss.str();
+        ss.str(""); 
+        // override number of channels parameters to manage demultiplexing
+        if(inputStreamDesc.demultiplexing())
+        {
+            ss << inputStreamDesc._channelIndexArray.size();
+            profile[constants::avProfileChannel] = ss.str();
+        }
+        else
+        {
+            ss << audioProperties->getNbChannels();
+            profile[constants::avProfileChannel] = ss.str();
+        }
     }
 
     return profile;
diff --git a/src/AvTranscoder/transcoder/Transcoder.hpp b/src/AvTranscoder/transcoder/Transcoder.hpp
@@ -129,8 +129,6 @@ class AvExport Transcoder
 
 private:
     void addRewrapStream(const InputStreamDesc& inputStreamDesc, const float offset);
-
-    void addTranscodeStream(const InputStreamDesc& inputStreamDesc, const float offset);
     void addTranscodeStream(const InputStreamDesc& inputStreamDesc, const ProfileLoader::Profile& profile,
                             const float offset = 0);
 
@@ -139,8 +137,10 @@ class AvExport Transcoder
      */
     InputFile* addInputFile(const std::string& filename, const int streamIndex, const float offset);
 
-    ProfileLoader::Profile getProfileFromFile(InputFile& inputFile,
-                                              const size_t streamIndex); ///< The function analyses the inputFile
+    /**
+     * @return The profile from the given input. 
+     */
+    ProfileLoader::Profile getProfileFromInput(const InputStreamDesc& inputStreamDesc);
 
     /**
      * @brief Get the duration of the stream, in seconds
