Rename Essence classes to Encoder / Decoder

Clement Champetier · Clement Champetier · commit 0838d9a947a6 · 2015-01-12T18:05:42.000+01:00
* Rename IInputEssence to IDecoder.
* Rename AvInputVideo to VideoDecoder.
* Rename AvInputAudio to AudioDecoder.

* Rename IOutputEssence to IEncoder.
* Rename AvOutputVideo to VideoEncoder.
* Rename AvOutputAudio to AudioEncoder.
diff --git a/app/avTranscoder/avTranscoder.cpp b/app/avTranscoder/avTranscoder.cpp
@@ -7,10 +7,8 @@
 
 #include <AvTranscoder/frame/Frame.hpp>
 
-#include <AvTranscoder/essenceStream/AvInputAudio.hpp>
-#include <AvTranscoder/essenceStream/AvInputVideo.hpp>
-#include <AvTranscoder/essenceStream/AvOutputAudio.hpp>
-#include <AvTranscoder/essenceStream/AvOutputVideo.hpp>
+#include <AvTranscoder/essenceStream/VideoDecoder.hpp>
+#include <AvTranscoder/essenceStream/VideoEncoder.hpp>
 
 #include <AvTranscoder/transform/VideoTransform.hpp>
 
@@ -31,12 +29,12 @@ void transcodeVideo( const char* inputfilename, const char* outputFilename )
 	input.activateStream( input.getProperties().getVideoProperties().at( 0 ).getStreamId() );
 
 	// init video decoders
-	AvInputVideo inputVideo( input.getStream( 0 ) );
+	VideoDecoder inputVideo( input.getStream( 0 ) );
 	VideoFrameDesc VideoFrameDesc = input.getStream( 0 ).getVideoCodec().getVideoFrameDesc();
 	VideoFrame sourceImage( VideoFrameDesc );
 
 	// init video encoder
-	AvOutputVideo outputVideo( "mpeg2video" );
+	VideoEncoder outputVideo( "mpeg2video" );
 	outputVideo.setProfile( profileLoader.getProfile( "xdcamhd422" ), VideoFrameDesc );
 	VideoFrame imageToEncode( outputVideo.getVideoCodec().getVideoFrameDesc() );
 	
diff --git a/app/avplay/AvReader.hpp b/app/avplay/AvReader.hpp
@@ -2,12 +2,13 @@
 #define _AVPLAYER_AVREADER_
 
 #include <AvTranscoder/file/InputFile.hpp>
-#include <AvTranscoder/essenceStream/AvInputAudio.hpp>
-#include <AvTranscoder/essenceStream/AvInputVideo.hpp>
-#include <AvTranscoder/transform/VideoTransform.hpp>
+#include <AvTranscoder/progress/ConsoleProgress.hpp>
 #include <AvTranscoder/mediaProperty/print.hpp>
 
-#include <AvTranscoder/progress/ConsoleProgress.hpp>
+#include <AvTranscoder/essenceStream/AudioDecoder.hpp>
+#include <AvTranscoder/essenceStream/VideoDecoder.hpp>
+
+#include <AvTranscoder/transform/VideoTransform.hpp>
 
 #include "Reader.hpp"
 
@@ -26,7 +27,7 @@ class AvReader : public Reader
 		_videoStream = _inputFile.getProperties().getVideoProperties().at(0).getStreamId();
 		_inputFile.activateStream( _videoStream );
 
-		_inputVideo = new avtranscoder::AvInputVideo( _inputFile.getStream( _videoStream ) );
+		_inputVideo = new avtranscoder::VideoDecoder( _inputFile.getStream( _videoStream ) );
 		_inputVideo->setup();
 
 		_sourceImage = new avtranscoder::VideoFrame( _inputFile.getStream( _videoStream ).getVideoCodec().getVideoFrameDesc() );
@@ -97,7 +98,7 @@ class AvReader : public Reader
 private:
 	avtranscoder::InputFile   _inputFile;
 
-	avtranscoder::AvInputVideo* _inputVideo;
+	avtranscoder::VideoDecoder* _inputVideo;
 
 	avtranscoder::VideoFrame* _sourceImage;
 	avtranscoder::VideoFrame* _imageToDisplay;
diff --git a/app/presetChecker/presetChecker.cpp b/app/presetChecker/presetChecker.cpp
@@ -3,8 +3,8 @@
 #include <iomanip>
 #include <AvTranscoder/ProfileLoader.hpp>
 
-#include <AvTranscoder/essenceStream/AvOutputVideo.hpp>
-#include <AvTranscoder/essenceStream/AvOutputAudio.hpp>
+#include <AvTranscoder/essenceStream/VideoEncoder.hpp>
+#include <AvTranscoder/essenceStream/AudioEncoder.hpp>
 
 
 int main( int argc, char** argv )
@@ -27,13 +27,13 @@ int main( int argc, char** argv )
 		try{
 			if( profile.find( avtranscoder::constants::avProfileType )->second == avtranscoder::constants::avProfileTypeVideo )
 			{
-				avtranscoder::AvOutputVideo outputVideo( profile.at( avtranscoder::constants::avProfileCodec ) );
+				avtranscoder::VideoEncoder outputVideo( profile.at( avtranscoder::constants::avProfileCodec ) );
 				outputVideo.setProfile( profile, outputVideo.getVideoCodec().getVideoFrameDesc() );
 			}
 
 			if( profile.find( avtranscoder::constants::avProfileType )->second == avtranscoder::constants::avProfileTypeAudio )
 			{
-				avtranscoder::AvOutputAudio outputAudio( profile.at( avtranscoder::constants::avProfileCodec ) );
+				avtranscoder::AudioEncoder outputAudio( profile.at( avtranscoder::constants::avProfileCodec ) );
 				outputAudio.setProfile( profile, outputAudio.getAudioCodec().getAudioFrameDesc() );
 			}
 		}
diff --git a/src/AvTranscoder/avTranscoder.i b/src/AvTranscoder/avTranscoder.i
@@ -26,13 +26,13 @@
 #include <AvTranscoder/codedStream/IInputStream.hpp>
 #include <AvTranscoder/codedStream/AvInputStream.hpp>
 
-#include <AvTranscoder/essenceStream/IOutputEssence.hpp>
-#include <AvTranscoder/essenceStream/AvOutputAudio.hpp>
-#include <AvTranscoder/essenceStream/AvOutputVideo.hpp>
+#include <AvTranscoder/essenceStream/IEncoder.hpp>
+#include <AvTranscoder/essenceStream/AudioEncoder.hpp>
+#include <AvTranscoder/essenceStream/VideoEncoder.hpp>
 
-#include <AvTranscoder/essenceStream/IInputEssence.hpp>
-#include <AvTranscoder/essenceStream/AvInputAudio.hpp>
-#include <AvTranscoder/essenceStream/AvInputVideo.hpp>
+#include <AvTranscoder/essenceStream/IDecoder.hpp>
+#include <AvTranscoder/essenceStream/AudioDecoder.hpp>
+#include <AvTranscoder/essenceStream/VideoDecoder.hpp>
 #include <AvTranscoder/essenceStream/GeneratorVideo.hpp>
 #include <AvTranscoder/essenceStream/GeneratorAudio.hpp>
 
@@ -64,13 +64,13 @@ namespace std {
 %include <AvTranscoder/codedStream/IInputStream.hpp>
 %include <AvTranscoder/codedStream/AvInputStream.hpp>
 
-%include <AvTranscoder/essenceStream/IOutputEssence.hpp>
-%include <AvTranscoder/essenceStream/AvOutputAudio.hpp>
-%include <AvTranscoder/essenceStream/AvOutputVideo.hpp>
+%include <AvTranscoder/essenceStream/IEncoder.hpp>
+%include <AvTranscoder/essenceStream/AudioEncoder.hpp>
+%include <AvTranscoder/essenceStream/VideoEncoder.hpp>
 
-%include <AvTranscoder/essenceStream/IInputEssence.hpp>
-%include <AvTranscoder/essenceStream/AvInputAudio.hpp>
-%include <AvTranscoder/essenceStream/AvInputVideo.hpp>
+%include <AvTranscoder/essenceStream/IDecoder.hpp>
+%include <AvTranscoder/essenceStream/AudioDecoder.hpp>
+%include <AvTranscoder/essenceStream/VideoDecoder.hpp>
 %include <AvTranscoder/essenceStream/GeneratorVideo.hpp>
 %include <AvTranscoder/essenceStream/GeneratorAudio.hpp>
 
diff --git a/src/AvTranscoder/essenceStream/AudioDecoder.cpp b/src/AvTranscoder/essenceStream/AudioDecoder.cpp
@@ -1,4 +1,4 @@
-#include "AvInputAudio.hpp"
+#include "AudioDecoder.hpp"
 
 #include <AvTranscoder/codec/ICodec.hpp>
 #include <AvTranscoder/codedStream/AvInputStream.hpp>
@@ -18,14 +18,13 @@ extern "C" {
 namespace avtranscoder
 {
 
-AvInputAudio::AvInputAudio( AvInputStream& inputStream ) 
-	: IInputEssence()
-	, _inputStream   ( &inputStream )
+AudioDecoder::AudioDecoder( AvInputStream& inputStream ) 
+	: _inputStream   ( &inputStream )
 	, _frame         ( NULL )
 {
 }
 
-AvInputAudio::~AvInputAudio()
+AudioDecoder::~AudioDecoder()
 {
 	if( _frame != NULL )
 	{
@@ -43,7 +42,7 @@ AvInputAudio::~AvInputAudio()
 }
 
 
-void AvInputAudio::setup()
+void AudioDecoder::setup()
 {
 	AVCodecContext& avCodecContext = _inputStream->getAudioCodec().getAVCodecContext();
 	AVCodec& avCodec = _inputStream->getAudioCodec().getAVCodec();
@@ -79,7 +78,7 @@ void AvInputAudio::setup()
 	}
 }
 
-bool AvInputAudio::decodeNextFrame( Frame& frameBuffer )
+bool AudioDecoder::decodeNextFrame( Frame& frameBuffer )
 {
 	if( ! decodeNextFrame() )
 		return false;
@@ -107,7 +106,7 @@ bool AvInputAudio::decodeNextFrame( Frame& frameBuffer )
 	return true;
 }
 
-bool AvInputAudio::decodeNextFrame( Frame& frameBuffer, const size_t subStreamIndex )
+bool AudioDecoder::decodeNextFrame( Frame& frameBuffer, const size_t subStreamIndex )
 {
 	if( ! decodeNextFrame() )
 		return false;
@@ -151,7 +150,7 @@ bool AvInputAudio::decodeNextFrame( Frame& frameBuffer, const size_t subStreamIn
 	return true;
 }
 
-bool AvInputAudio::decodeNextFrame()
+bool AudioDecoder::decodeNextFrame()
 {
 	int got_frame = 0;
 	while( ! got_frame )
diff --git a/src/AvTranscoder/essenceStream/AudioDecoder.hpp b/src/AvTranscoder/essenceStream/AudioDecoder.hpp
@@ -1,7 +1,7 @@
 #ifndef _AV_TRANSCODER_ESSENCE_STREAM_AV_INPUT_AUDIO_HPP_
 #define _AV_TRANSCODER_ESSENCE_STREAM_AV_INPUT_AUDIO_HPP_
 
-#include "IInputEssence.hpp"
+#include "IDecoder.hpp"
 
 struct AVFrame;
 
@@ -10,11 +10,11 @@ namespace avtranscoder
 
 class AvInputStream;
 
-class AvExport AvInputAudio : public IInputEssence
+class AvExport AudioDecoder : public IDecoder
 {
 public:
-	AvInputAudio( AvInputStream& inputStream );
-	~AvInputAudio();
+	AudioDecoder( AvInputStream& inputStream );
+	~AudioDecoder();
 
 	void setup();
 
diff --git a/src/AvTranscoder/essenceStream/AudioEncoder.cpp b/src/AvTranscoder/essenceStream/AudioEncoder.cpp
@@ -1,4 +1,4 @@
-#include "AvOutputAudio.hpp"
+#include "AudioEncoder.hpp"
 
 extern "C" {
 #include <libavcodec/avcodec.h>
@@ -12,12 +12,12 @@ extern "C" {
 namespace avtranscoder
 {
 
-AvOutputAudio::AvOutputAudio( const std::string& audioCodecName )
+AudioEncoder::AudioEncoder( const std::string& audioCodecName )
 	: _codec( eCodecTypeEncoder, audioCodecName )
 {
 }
 
-void AvOutputAudio::setup()
+void AudioEncoder::setup()
 {
 	av_register_all();
 
@@ -36,7 +36,7 @@ void AvOutputAudio::setup()
 	}
 }
 
-bool AvOutputAudio::encodeFrame( const Frame& sourceFrame, Frame& codedFrame )
+bool AudioEncoder::encodeFrame( const Frame& sourceFrame, Frame& codedFrame )
 {
 #if LIBAVCODEC_VERSION_MAJOR > 54
 	AVFrame* frame = av_frame_alloc();
@@ -126,7 +126,7 @@ bool AvOutputAudio::encodeFrame( const Frame& sourceFrame, Frame& codedFrame )
 	return ret == 0;
 }
 
-bool AvOutputAudio::encodeFrame( Frame& codedFrame )
+bool AudioEncoder::encodeFrame( Frame& codedFrame )
 {
 	AVCodecContext& avCodecContext = _codec.getAVCodecContext();
 
@@ -159,7 +159,7 @@ bool AvOutputAudio::encodeFrame( Frame& codedFrame )
 #endif
 }
 
-void AvOutputAudio::setProfile( const ProfileLoader::Profile& profile, const AudioFrameDesc& frameDesc  )
+void AudioEncoder::setProfile( const ProfileLoader::Profile& profile, const AudioFrameDesc& frameDesc  )
 {
 	if( ! profile.count( constants::avProfileCodec ) )
 	{
diff --git a/src/AvTranscoder/essenceStream/AudioEncoder.hpp b/src/AvTranscoder/essenceStream/AudioEncoder.hpp
@@ -1,17 +1,17 @@
 #ifndef _AV_TRANSCODER_ESSENCE_STREAM_AV_OUTPUT_AUDIO_HPP_
 #define _AV_TRANSCODER_ESSENCE_STREAM_AV_OUTPUT_AUDIO_HPP_
 
-#include "IOutputEssence.hpp"
+#include "IEncoder.hpp"
 #include <AvTranscoder/codec/AudioCodec.hpp>
 #include <AvTranscoder/ProfileLoader.hpp>
 
 namespace avtranscoder
 {
 
-class AvExport AvOutputAudio : public IOutputEssence
+class AvExport AudioEncoder : public IEncoder
 {
 public:
-	AvOutputAudio( const std::string& audioCodecName );
+	AudioEncoder( const std::string& audioCodecName );
 	
 	void setup();
 
diff --git a/src/AvTranscoder/essenceStream/GeneratorAudio.cpp b/src/AvTranscoder/essenceStream/GeneratorAudio.cpp
@@ -4,8 +4,7 @@ namespace avtranscoder
 {
 
 GeneratorAudio::GeneratorAudio( )
-	: IInputEssence( )
-	, _inputFrame( NULL )
+	: _inputFrame( NULL )
 	, _frameDesc()
 {
 }
diff --git a/src/AvTranscoder/essenceStream/GeneratorAudio.hpp b/src/AvTranscoder/essenceStream/GeneratorAudio.hpp
@@ -1,13 +1,13 @@
 #ifndef _AV_TRANSCODER_ESSENCE_STREAM_GENERATOR_AUDIO_HPP_
 #define _AV_TRANSCODER_ESSENCE_STREAM_GENERATOR_AUDIO_HPP_
 
-#include "IInputEssence.hpp"
+#include "IDecoder.hpp"
 #include <AvTranscoder/codec/AudioCodec.hpp>
 
 namespace avtranscoder
 {
 
-class AvExport GeneratorAudio : public IInputEssence
+class AvExport GeneratorAudio : public IDecoder
 {
 public:
 	GeneratorAudio( );
diff --git a/src/AvTranscoder/essenceStream/GeneratorVideo.cpp b/src/AvTranscoder/essenceStream/GeneratorVideo.cpp
@@ -6,8 +6,7 @@ namespace avtranscoder
 {
 
 GeneratorVideo::GeneratorVideo( )
-	: IInputEssence( )
-	, _inputFrame( NULL )
+	: _inputFrame( NULL )
 	, _frameDesc()
 {
 }
diff --git a/src/AvTranscoder/essenceStream/GeneratorVideo.hpp b/src/AvTranscoder/essenceStream/GeneratorVideo.hpp
@@ -1,16 +1,16 @@
 #ifndef _AV_TRANSCODER_ESSENCE_STREAM_GENERATOR_VIDEO_HPP_
 #define _AV_TRANSCODER_ESSENCE_STREAM_GENERATOR_VIDEO_HPP_
 
-#include "IInputEssence.hpp"
+#include "IDecoder.hpp"
 #include <AvTranscoder/codec/VideoCodec.hpp>
 
 namespace avtranscoder
 {
 
-class AvExport GeneratorVideo : public IInputEssence
+class AvExport GeneratorVideo : public IDecoder
 {
 public:
-	GeneratorVideo( );
+	GeneratorVideo();
 
 	VideoFrameDesc& getVideoFrameDesc() { return _frameDesc; }
 	void setVideoFrameDesc( const VideoFrameDesc& frameDesc );
diff --git a/src/AvTranscoder/essenceStream/IDecoder.hpp b/src/AvTranscoder/essenceStream/IDecoder.hpp
@@ -1,16 +1,16 @@
-#ifndef _AV_TRANSCODER_ESSENCE_STREAM_IINPUT_ESSENCE_HPP_
-#define _AV_TRANSCODER_ESSENCE_STREAM_IINPUT_ESSENCE_HPP_
+#ifndef _AV_TRANSCODER_ESSENCE_STREAM_IDECODER_HPP_
+#define _AV_TRANSCODER_ESSENCE_STREAM_IDECODER_HPP_
 
 #include <AvTranscoder/common.hpp>
 #include <AvTranscoder/frame/Frame.hpp>
 
 namespace avtranscoder
 {
 
-class AvExport IInputEssence
+class AvExport IDecoder
 {
 public:
-	virtual ~IInputEssence() {};
+	virtual ~IDecoder() {};
 
 	/**
 	 * @brief Open the decoder
@@ -33,8 +33,8 @@ class AvExport IInputEssence
 	virtual bool decodeNextFrame( Frame& frameBuffer, const size_t subStreamIndex ) = 0;
 
 	/**
-	 * Set the next frame of the input stream
-	 * @note Not yet implemented for AvInputVideo and AvInputAudio
+	 * @brief Set the next frame of the input stream (which bypass the work of decoding)
+	 * @note Not yet implemented for VideoDecoder and AudioDecoder
 	 * @param inputFrame: the new next frame
 	 */
 	virtual void setNextFrame( Frame& inputFrame ) {}
diff --git a/src/AvTranscoder/essenceStream/IEncoder.hpp b/src/AvTranscoder/essenceStream/IEncoder.hpp
@@ -1,16 +1,16 @@
-#ifndef _AV_TRANSCODER_ESSENCE_STREAM_IOUTPUT_ESSENCE_HPP_
-#define _AV_TRANSCODER_ESSENCE_STREAM_IOUTPUT_ESSENCE_HPP_
+#ifndef _AV_TRANSCODER_ESSENCE_STREAM_IENCODER_HPP_
+#define _AV_TRANSCODER_ESSENCE_STREAM_IENCODER_HPP_
 
 #include <AvTranscoder/frame/Frame.hpp>
 #include <AvTranscoder/codec/ICodec.hpp>
 
 namespace avtranscoder
 {
 
-class AvExport IOutputEssence
+class AvExport IEncoder
 {
 public:
-	virtual ~IOutputEssence() {}
+	virtual ~IEncoder() {}
 
 	/**
 	 * @brief Setup the encoder
diff --git a/src/AvTranscoder/essenceStream/VideoDecoder.cpp b/src/AvTranscoder/essenceStream/VideoDecoder.cpp
diff --git a/src/AvTranscoder/essenceStream/VideoDecoder.hpp b/src/AvTranscoder/essenceStream/VideoDecoder.hpp
diff --git a/src/AvTranscoder/essenceStream/VideoEncoder.cpp b/src/AvTranscoder/essenceStream/VideoEncoder.cpp
diff --git a/src/AvTranscoder/essenceStream/VideoEncoder.hpp b/src/AvTranscoder/essenceStream/VideoEncoder.hpp
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.hpp b/src/AvTranscoder/transcoder/StreamTranscoder.hpp
diff --git a/test/pyTest/testSetFrame.py b/test/pyTest/testSetFrame.py

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`	`#include <iomanip>`
`4`	`4`	`#include <AvTranscoder/ProfileLoader.hpp>`
`5`	`5`
`6`		`-#include <AvTranscoder/essenceStream/AvOutputVideo.hpp>`
`7`		`-#include <AvTranscoder/essenceStream/AvOutputAudio.hpp>`
	`6`	`+#include <AvTranscoder/essenceStream/VideoEncoder.hpp>`
	`7`	`+#include <AvTranscoder/essenceStream/AudioEncoder.hpp>`
`8`	`8`
`9`	`9`
`10`	`10`	`int main( int argc, char** argv )`
`@@ -27,13 +27,13 @@ int main( int argc, char** argv )`
`27`	`27`	`try{`
`28`	`28`	`if( profile.find( avtranscoder::constants::avProfileType )->second == avtranscoder::constants::avProfileTypeVideo )`
`29`	`29`	`{`
`30`		`- avtranscoder::AvOutputVideo outputVideo( profile.at( avtranscoder::constants::avProfileCodec ) );`
	`30`	`+ avtranscoder::VideoEncoder outputVideo( profile.at( avtranscoder::constants::avProfileCodec ) );`
`31`	`31`	`outputVideo.setProfile( profile, outputVideo.getVideoCodec().getVideoFrameDesc() );`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`if( profile.find( avtranscoder::constants::avProfileType )->second == avtranscoder::constants::avProfileTypeAudio )`
`35`	`35`	`{`
`36`		`- avtranscoder::AvOutputAudio outputAudio( profile.at( avtranscoder::constants::avProfileCodec ) );`
	`36`	`+ avtranscoder::AudioEncoder outputAudio( profile.at( avtranscoder::constants::avProfileCodec ) );`
`37`	`37`	`outputAudio.setProfile( profile, outputAudio.getAudioCodec().getAudioFrameDesc() );`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "AvInputAudio.hpp"`
	`1`	`+#include "AudioDecoder.hpp"`
`2`	`2`
`3`	`3`	`#include <AvTranscoder/codec/ICodec.hpp>`
`4`	`4`	`#include <AvTranscoder/codedStream/AvInputStream.hpp>`
`@@ -18,14 +18,13 @@ extern "C" {`
`18`	`18`	`namespace avtranscoder`
`19`	`19`	`{`
`20`	`20`
`21`		`-AvInputAudio::AvInputAudio( AvInputStream& inputStream )`
`22`		`- : IInputEssence()`
`23`		`- , _inputStream ( &inputStream )`
	`21`	`+AudioDecoder::AudioDecoder( AvInputStream& inputStream )`
	`22`	`+ : _inputStream ( &inputStream )`
`24`	`23`	`, _frame ( NULL )`
`25`	`24`	`{`
`26`	`25`	`}`
`27`	`26`
`28`		`-AvInputAudio::~AvInputAudio()`
	`27`	`+AudioDecoder::~AudioDecoder()`
`29`	`28`	`{`
`30`	`29`	`if( _frame != NULL )`
`31`	`30`	`{`
`@@ -43,7 +42,7 @@ AvInputAudio::~AvInputAudio()`
`43`	`42`	`}`
`44`	`43`
`45`	`44`
`46`		`-void AvInputAudio::setup()`
	`45`	`+void AudioDecoder::setup()`
`47`	`46`	`{`
`48`	`47`	`AVCodecContext& avCodecContext = _inputStream->getAudioCodec().getAVCodecContext();`
`49`	`48`	`AVCodec& avCodec = _inputStream->getAudioCodec().getAVCodec();`
`@@ -79,7 +78,7 @@ void AvInputAudio::setup()`
`79`	`78`	`}`
`80`	`79`	`}`
`81`	`80`
`82`		`-bool AvInputAudio::decodeNextFrame( Frame& frameBuffer )`
	`81`	`+bool AudioDecoder::decodeNextFrame( Frame& frameBuffer )`
`83`	`82`	`{`
`84`	`83`	`if( ! decodeNextFrame() )`
`85`	`84`	`return false;`
`@@ -107,7 +106,7 @@ bool AvInputAudio::decodeNextFrame( Frame& frameBuffer )`
`107`	`106`	`return true;`
`108`	`107`	`}`
`109`	`108`
`110`		`-bool AvInputAudio::decodeNextFrame( Frame& frameBuffer, const size_t subStreamIndex )`
	`109`	`+bool AudioDecoder::decodeNextFrame( Frame& frameBuffer, const size_t subStreamIndex )`
`111`	`110`	`{`
`112`	`111`	`if( ! decodeNextFrame() )`
`113`	`112`	`return false;`
`@@ -151,7 +150,7 @@ bool AvInputAudio::decodeNextFrame( Frame& frameBuffer, const size_t subStreamIn`
`151`	`150`	`return true;`
`152`	`151`	`}`
`153`	`152`
`154`		`-bool AvInputAudio::decodeNextFrame()`
	`153`	`+bool AudioDecoder::decodeNextFrame()`
`155`	`154`	`{`
`156`	`155`	`int got_frame = 0;`
`157`	`156`	`while( ! got_frame )`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "AvOutputAudio.hpp"`
	`1`	`+#include "AudioEncoder.hpp"`
`2`	`2`
`3`	`3`	`extern "C" {`
`4`	`4`	`#include <libavcodec/avcodec.h>`
`@@ -12,12 +12,12 @@ extern "C" {`
`12`	`12`	`namespace avtranscoder`
`13`	`13`	`{`
`14`	`14`
`15`		`-AvOutputAudio::AvOutputAudio( const std::string& audioCodecName )`
	`15`	`+AudioEncoder::AudioEncoder( const std::string& audioCodecName )`
`16`	`16`	`: _codec( eCodecTypeEncoder, audioCodecName )`
`17`	`17`	`{`
`18`	`18`	`}`
`19`	`19`
`20`		`-void AvOutputAudio::setup()`
	`20`	`+void AudioEncoder::setup()`
`21`	`21`	`{`
`22`	`22`	`av_register_all();`
`23`	`23`
`@@ -36,7 +36,7 @@ void AvOutputAudio::setup()`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
`39`		`-bool AvOutputAudio::encodeFrame( const Frame& sourceFrame, Frame& codedFrame )`
	`39`	`+bool AudioEncoder::encodeFrame( const Frame& sourceFrame, Frame& codedFrame )`
`40`	`40`	`{`
`41`	`41`	`#if LIBAVCODEC_VERSION_MAJOR > 54`
`42`	`42`	`AVFrame* frame = av_frame_alloc();`
`@@ -126,7 +126,7 @@ bool AvOutputAudio::encodeFrame( const Frame& sourceFrame, Frame& codedFrame )`
`126`	`126`	`return ret == 0;`
`127`	`127`	`}`
`128`	`128`
`129`		`-bool AvOutputAudio::encodeFrame( Frame& codedFrame )`
	`129`	`+bool AudioEncoder::encodeFrame( Frame& codedFrame )`
`130`	`130`	`{`
`131`	`131`	`AVCodecContext& avCodecContext = _codec.getAVCodecContext();`
`132`	`132`
`@@ -159,7 +159,7 @@ bool AvOutputAudio::encodeFrame( Frame& codedFrame )`
`159`	`159`	`#endif`
`160`	`160`	`}`
`161`	`161`
`162`		`-void AvOutputAudio::setProfile( const ProfileLoader::Profile& profile, const AudioFrameDesc& frameDesc )`
	`162`	`+void AudioEncoder::setProfile( const ProfileLoader::Profile& profile, const AudioFrameDesc& frameDesc )`
`163`	`163`	`{`
`164`	`164`	`if( ! profile.count( constants::avProfileCodec ) )`
`165`	`165`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,7 @@ namespace avtranscoder`
`4`	`4`	`{`
`5`	`5`
`6`	`6`	`GeneratorAudio::GeneratorAudio( )`
`7`		`- : IInputEssence( )`
`8`		`- , _inputFrame( NULL )`
	`7`	`+ : _inputFrame( NULL )`
`9`	`8`	`, _frameDesc()`
`10`	`9`	`{`
`11`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`#ifndef _AV_TRANSCODER_ESSENCE_STREAM_GENERATOR_AUDIO_HPP_`
`2`	`2`	`#define _AV_TRANSCODER_ESSENCE_STREAM_GENERATOR_AUDIO_HPP_`
`3`	`3`
`4`		`-#include "IInputEssence.hpp"`
	`4`	`+#include "IDecoder.hpp"`
`5`	`5`	`#include <AvTranscoder/codec/AudioCodec.hpp>`
`6`	`6`
`7`	`7`	`namespace avtranscoder`
`8`	`8`	`{`
`9`	`9`
`10`		`-class AvExport GeneratorAudio : public IInputEssence`
	`10`	`+class AvExport GeneratorAudio : public IDecoder`
`11`	`11`	`{`
`12`	`12`	`public:`
`13`	`13`	`GeneratorAudio( );`