AvInputAudio: rename getNextFrame to decodeNextFrame

Clement Champetier · Clement Champetier · commit b323fbcd256a · 2014-11-03T12:17:01.000+01:00
This private function decodes the next frame (call
avcodec_decode_audio4).
diff --git a/src/AvTranscoder/essenceStream/AvInputAudio.cpp b/src/AvTranscoder/essenceStream/AvInputAudio.cpp
@@ -82,7 +82,7 @@ void AvInputAudio::setup()
 
 bool AvInputAudio::readNextFrame( Frame& frameBuffer )
 {
-	if( ! getNextFrame() )
+	if( ! decodeNextFrame() )
 		return false;
 
 	AVCodecContext* avCodecContext = _codec.getAVCodecContext();
@@ -116,7 +116,7 @@ bool AvInputAudio::readNextFrame( Frame& frameBuffer )
 
 bool AvInputAudio::readNextFrame( Frame& frameBuffer, const size_t subStreamIndex )
 {
-	if( ! getNextFrame() )
+	if( ! decodeNextFrame() )
 		return false;
 
 	const int output_nbChannels = 1;
@@ -156,7 +156,7 @@ bool AvInputAudio::readNextFrame( Frame& frameBuffer, const size_t subStreamInde
 	return true;
 }
 
-bool AvInputAudio::getNextFrame()
+bool AvInputAudio::decodeNextFrame()
 {
 	int got_frame = 0;
 	while( ! got_frame )
diff --git a/src/AvTranscoder/essenceStream/AvInputAudio.hpp b/src/AvTranscoder/essenceStream/AvInputAudio.hpp
@@ -23,7 +23,7 @@ class AvExport AvInputAudio : public IInputEssence
 	bool readNextFrame( Frame& frameBuffer, const size_t subStreamIndex );
 
 private:
-	bool getNextFrame();
+	bool decodeNextFrame();
 
 	AvInputStream*     _inputStream;
 	AudioCodec _codec;

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ void AvInputAudio::setup()`
`82`	`82`
`83`	`83`	`bool AvInputAudio::readNextFrame( Frame& frameBuffer )`
`84`	`84`	`{`
`85`		`- if( ! getNextFrame() )`
	`85`	`+ if( ! decodeNextFrame() )`
`86`	`86`	`return false;`
`87`	`87`
`88`	`88`	`AVCodecContext* avCodecContext = _codec.getAVCodecContext();`
`@@ -116,7 +116,7 @@ bool AvInputAudio::readNextFrame( Frame& frameBuffer )`
`116`	`116`
`117`	`117`	`bool AvInputAudio::readNextFrame( Frame& frameBuffer, const size_t subStreamIndex )`
`118`	`118`	`{`
`119`		`- if( ! getNextFrame() )`
	`119`	`+ if( ! decodeNextFrame() )`
`120`	`120`	`return false;`
`121`	`121`
`122`	`122`	`const int output_nbChannels = 1;`
`@@ -156,7 +156,7 @@ bool AvInputAudio::readNextFrame( Frame& frameBuffer, const size_t subStreamInde`
`156`	`156`	`return true;`
`157`	`157`	`}`
`158`	`158`
`159`		`-bool AvInputAudio::getNextFrame()`
	`159`	`+bool AvInputAudio::decodeNextFrame()`
`160`	`160`	`{`
`161`	`161`	`int got_frame = 0;`
`162`	`162`	`while( ! got_frame )`