Transcoder: renamed addGeneratedStream methods to addGenerateStream

Clement Champetier · Clement Champetier · commit 584f53020aee · 2016-07-19T18:27:41.000+02:00
diff --git a/app/avProcessor/avProcessor.cpp b/app/avProcessor/avProcessor.cpp
@@ -41,7 +41,7 @@ void parseConfigFile(const std::string& configFilename, avtranscoder::Transcoder
 
                 // generated stream
                 if(!filename.length())
-                    transcoder.addGeneratedStream(transcodeProfile);
+                    transcoder.addGenerateStream(transcodeProfile);
                 else
                 {
                     avtranscoder::InputStreamDesc inputDesc(filename, streamIndex, channelIndexArray);
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -67,13 +67,13 @@ void Transcoder::addStream(const InputStreamDesc& inputStreamDesc, const Profile
     addTranscodeStream(inputStreamDesc, profile, offset);
 }
 
-void Transcoder::addGeneratedStream(const std::string& encodingProfileName)
+void Transcoder::addGenerateStream(const std::string& encodingProfileName)
 {
     const ProfileLoader::Profile& encodingProfile = _profileLoader.getProfile(encodingProfileName);
-    addGeneratedStream(encodingProfile);
+    addGenerateStream(encodingProfile);
 }
 
-void Transcoder::addGeneratedStream(const ProfileLoader::Profile& encodingProfile)
+void Transcoder::addGenerateStream(const ProfileLoader::Profile& encodingProfile)
 {
     // Add profile
     if(!_profileLoader.hasProfile(encodingProfile))
diff --git a/src/AvTranscoder/transcoder/Transcoder.hpp b/src/AvTranscoder/transcoder/Transcoder.hpp
@@ -67,8 +67,8 @@ class AvExport Transcoder
 
     //@{
     // @brief Add a new generated stream to the output file, created from the given encoding profile.
-    void addGeneratedStream(const std::string& encodingProfileName);
-    void addGeneratedStream(const ProfileLoader::Profile& encodingProfile);
+    void addGenerateStream(const std::string& encodingProfileName);
+    void addGenerateStream(const ProfileLoader::Profile& encodingProfile);
     //@}
 
     /**
diff --git a/test/pyTest/testSetFrame.py b/test/pyTest/testSetFrame.py
@@ -23,7 +23,7 @@ def testSetVideoFrame():
 
     # create transcoder and add a video stream
     transcoder = av.Transcoder( ouputFile )
-    transcoder.addGeneratedStream( encodingProfile )
+    transcoder.addGenerateStream( encodingProfile )
     videoDecoder = transcoder.getStreamTranscoder( 0 ).getCurrentDecoder()
 
     # start process
@@ -69,7 +69,7 @@ def testSetAudioFrame():
 
     # create transcoder and add a video stream
     transcoder = av.Transcoder( ouputFile )
-    transcoder.addGeneratedStream( "wave24b48kmono" )
+    transcoder.addGenerateStream( "wave24b48kmono" )
     audioDecoder = transcoder.getStreamTranscoder( 0 ).getCurrentDecoder()
 
     # start process
diff --git a/test/pyTest/testTranscoderGenerateStream.py b/test/pyTest/testTranscoderGenerateStream.py
@@ -36,7 +36,7 @@ def testGenerateVideoWithIncompleteProfile():
         av.avProfileIdentificatorHuman : "New video preset",
         av.avProfileType : av.avProfileTypeVideo,
     }
-    transcoder.addGeneratedStream( encodingProfile )
+    transcoder.addGenerateStream( encodingProfile )
 
     transcoder.process()
 
@@ -60,7 +60,7 @@ def testGenerateAudioWithIncompleteProfile():
         av.avProfileIdentificatorHuman : "New audio preset",
         av.avProfileType : av.avProfileTypeAudio,
     }
-    transcoder.addGeneratedStream( encodingProfile )
+    transcoder.addGenerateStream( encodingProfile )
 
     transcoder.process()
 
@@ -74,7 +74,7 @@ def testTranscodeDummyAudio():
     transcoder = av.Transcoder( ouputFile )
 
     # generate an audio stream
-    transcoder.addGeneratedStream( "wave24b48kmono" )
+    transcoder.addGenerateStream( "wave24b48kmono" )
 
     ouputFile.beginWrap()
     transcoder.processFrame()
@@ -90,7 +90,7 @@ def testTranscodeDummyVideo():
     transcoder = av.Transcoder( ouputFile )
 
     # generate a video stream
-    transcoder.addGeneratedStream( "dnxhd120" )
+    transcoder.addGenerateStream( "dnxhd120" )
 
     ouputFile.beginWrap()
     transcoder.processFrame()

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ void parseConfigFile(const std::string& configFilename, avtranscoder::Transcoder`
`41`	`41`
`42`	`42`	`// generated stream`
`43`	`43`	`if(!filename.length())`
`44`		`- transcoder.addGeneratedStream(transcodeProfile);`
	`44`	`+ transcoder.addGenerateStream(transcodeProfile);`
`45`	`45`	`else`
`46`	`46`	`{`
`47`	`47`	`avtranscoder::InputStreamDesc inputDesc(filename, streamIndex, channelIndexArray);`
Original file line number	Diff line number	Diff line change
`@@ -67,13 +67,13 @@ void Transcoder::addStream(const InputStreamDesc& inputStreamDesc, const Profile`
`67`	`67`	`addTranscodeStream(inputStreamDesc, profile, offset);`
`68`	`68`	`}`
`69`	`69`
`70`		`-void Transcoder::addGeneratedStream(const std::string& encodingProfileName)`
	`70`	`+void Transcoder::addGenerateStream(const std::string& encodingProfileName)`
`71`	`71`	`{`
`72`	`72`	`const ProfileLoader::Profile& encodingProfile = _profileLoader.getProfile(encodingProfileName);`
`73`		`- addGeneratedStream(encodingProfile);`
	`73`	`+ addGenerateStream(encodingProfile);`
`74`	`74`	`}`
`75`	`75`
`76`		`-void Transcoder::addGeneratedStream(const ProfileLoader::Profile& encodingProfile)`
	`76`	`+void Transcoder::addGenerateStream(const ProfileLoader::Profile& encodingProfile)`
`77`	`77`	`{`
`78`	`78`	`// Add profile`
`79`	`79`	`if(!_profileLoader.hasProfile(encodingProfile))`