FilterGraph: fix AudioFrameBuffer class name case typo

Valentin NOEL · Valentin NOEL · commit c823ad678834 · 2017-09-08T10:43:19.000+02:00
diff --git a/src/AvTranscoder/filter/FilterGraph.cpp b/src/AvTranscoder/filter/FilterGraph.cpp
@@ -18,25 +18,25 @@ namespace avtranscoder
 
 /******************
 
-    AudioFramebuffer
+    AudioFrameBuffer
 
  ******************/
 
-AudioFramebuffer::AudioFramebuffer(const AudioFrameDesc& audioFrameDesc)
+AudioFrameBuffer::AudioFrameBuffer(const AudioFrameDesc& audioFrameDesc)
     : _audioFrameDesc(audioFrameDesc)
     , _frameQueue()
     , _totalDataSize(0)
     , _positionInFrontFrame(0)
 {
 }
 
-AudioFramebuffer::~AudioFramebuffer()
+AudioFrameBuffer::~AudioFrameBuffer()
 {
     for(size_t i = 0; i < _frameQueue.size(); ++i)
         popFrame();
 }
 
-void AudioFramebuffer::addFrame(IFrame* frame)
+void AudioFrameBuffer::addFrame(IFrame* frame)
 {
     LOG_DEBUG("Add a new " << frame->getDataSize() << " bytes frame to frame buffer. New buffer size: " << _frameQueue.size() + 1);
     // Copy the input frame to store it into the queue
@@ -50,13 +50,13 @@ void AudioFramebuffer::addFrame(IFrame* frame)
     _frameQueue.push(newAudioFrame);
 }
 
-void AudioFramebuffer::popFrame()
+void AudioFrameBuffer::popFrame()
 {
     _frameQueue.pop();
     LOG_DEBUG("Pop frame from buffer. Remaining frames in buffer: " << _frameQueue.size());
 }
 
-IFrame* AudioFramebuffer::getFrame(const size_t size)
+IFrame* AudioFrameBuffer::getFrame(const size_t size)
 {
     LOG_DEBUG("Get a " << size << " bytes frame from a " << _totalDataSize << " bytes frame buffer");
     IFrame* next = _frameQueue.front();
@@ -169,7 +169,7 @@ bool FilterGraph::hasBufferedFrames()
     if(!_inputAudioFrameBuffers.size())
         return false;
 
-    for(std::vector<AudioFramebuffer>::iterator it = _inputAudioFrameBuffers.begin(); it != _inputAudioFrameBuffers.end(); ++it)
+    for(std::vector<AudioFrameBuffer>::iterator it = _inputAudioFrameBuffers.begin(); it != _inputAudioFrameBuffers.end(); ++it)
     {
         if(it->isEmpty())
             return false;
@@ -204,7 +204,7 @@ bool FilterGraph::areFrameBuffersEmpty()
     if(!_inputAudioFrameBuffers.size())
         return true;
 
-    for(std::vector<AudioFramebuffer>::iterator it = _inputAudioFrameBuffers.begin(); it != _inputAudioFrameBuffers.end(); ++it)
+    for(std::vector<AudioFrameBuffer>::iterator it = _inputAudioFrameBuffers.begin(); it != _inputAudioFrameBuffers.end(); ++it)
     {
         if(!it->isEmpty())
             return false;
@@ -356,7 +356,7 @@ void FilterGraph::addInBuffer(const std::vector<IFrame*>& inputs)
             const AudioFrameDesc audioFrameDesc(audioFrame->getSampleRate(),
                                                 audioFrame->getNbChannels(),
                                                 getSampleFormatName(audioFrame->getSampleFormat()));
-            _inputAudioFrameBuffers.push_back(AudioFramebuffer(audioFrameDesc));
+            _inputAudioFrameBuffers.push_back(AudioFrameBuffer(audioFrameDesc));
         }
         // video frame
         else if((*it)->isVideoFrame())
diff --git a/src/AvTranscoder/filter/FilterGraph.hpp b/src/AvTranscoder/filter/FilterGraph.hpp
@@ -21,11 +21,11 @@ namespace avtranscoder
  * It makes no sense to use such buffers for video, since video frames are spatially consistent,
  * so can not be divided nor concatenated.
  **/
-class AudioFramebuffer
+class AudioFrameBuffer
 {
 public:
-    AudioFramebuffer(const AudioFrameDesc& audioFrameDesc);
-    ~AudioFramebuffer();
+    AudioFrameBuffer(const AudioFrameDesc& audioFrameDesc);
+    ~AudioFrameBuffer();
 
     /**
      * @brief Return whether the buffer is empty or not.
@@ -151,7 +151,7 @@ class AvExport FilterGraph
     std::vector<Filter*> _filters; ///< List of filters to process.
     const ICodec& _codec;          ///< Codec of the stream on which the filters will be applied.
 
-    std::vector<AudioFramebuffer> _inputAudioFrameBuffers;
+    std::vector<AudioFrameBuffer> _inputAudioFrameBuffers;
 
     /**
      * @brief Is the FilterGraph initialized.

Original file line number	Diff line number	Diff line change
`@@ -18,25 +18,25 @@ namespace avtranscoder`
`18`	`18`
`19`	`19`	`/******************`
`20`	`20`
`21`		`- AudioFramebuffer`
	`21`	`+ AudioFrameBuffer`
`22`	`22`
`23`	`23`	`******************/`
`24`	`24`
`25`		`-AudioFramebuffer::AudioFramebuffer(const AudioFrameDesc& audioFrameDesc)`
	`25`	`+AudioFrameBuffer::AudioFrameBuffer(const AudioFrameDesc& audioFrameDesc)`
`26`	`26`	`: _audioFrameDesc(audioFrameDesc)`
`27`	`27`	`, _frameQueue()`
`28`	`28`	`, _totalDataSize(0)`
`29`	`29`	`, _positionInFrontFrame(0)`
`30`	`30`	`{`
`31`	`31`	`}`
`32`	`32`
`33`		`-AudioFramebuffer::~AudioFramebuffer()`
	`33`	`+AudioFrameBuffer::~AudioFrameBuffer()`
`34`	`34`	`{`
`35`	`35`	`for(size_t i = 0; i < _frameQueue.size(); ++i)`
`36`	`36`	`popFrame();`
`37`	`37`	`}`
`38`	`38`
`39`		`-void AudioFramebuffer::addFrame(IFrame* frame)`
	`39`	`+void AudioFrameBuffer::addFrame(IFrame* frame)`
`40`	`40`	`{`
`41`	`41`	`LOG_DEBUG("Add a new " << frame->getDataSize() << " bytes frame to frame buffer. New buffer size: " << _frameQueue.size() + 1);`
`42`	`42`	`// Copy the input frame to store it into the queue`
`@@ -50,13 +50,13 @@ void AudioFramebuffer::addFrame(IFrame* frame)`
`50`	`50`	`_frameQueue.push(newAudioFrame);`
`51`	`51`	`}`
`52`	`52`
`53`		`-void AudioFramebuffer::popFrame()`
	`53`	`+void AudioFrameBuffer::popFrame()`
`54`	`54`	`{`
`55`	`55`	`_frameQueue.pop();`
`56`	`56`	`LOG_DEBUG("Pop frame from buffer. Remaining frames in buffer: " << _frameQueue.size());`
`57`	`57`	`}`
`58`	`58`
`59`		`-IFrame* AudioFramebuffer::getFrame(const size_t size)`
	`59`	`+IFrame* AudioFrameBuffer::getFrame(const size_t size)`
`60`	`60`	`{`
`61`	`61`	`LOG_DEBUG("Get a " << size << " bytes frame from a " << _totalDataSize << " bytes frame buffer");`
`62`	`62`	`IFrame* next = _frameQueue.front();`
`@@ -169,7 +169,7 @@ bool FilterGraph::hasBufferedFrames()`
`169`	`169`	`if(!_inputAudioFrameBuffers.size())`
`170`	`170`	`return false;`
`171`	`171`
`172`		`- for(std::vector<AudioFramebuffer>::iterator it = _inputAudioFrameBuffers.begin(); it != _inputAudioFrameBuffers.end(); ++it)`
	`172`	`+ for(std::vector<AudioFrameBuffer>::iterator it = _inputAudioFrameBuffers.begin(); it != _inputAudioFrameBuffers.end(); ++it)`
`173`	`173`	`{`
`174`	`174`	`if(it->isEmpty())`
`175`	`175`	`return false;`
`@@ -204,7 +204,7 @@ bool FilterGraph::areFrameBuffersEmpty()`
`204`	`204`	`if(!_inputAudioFrameBuffers.size())`
`205`	`205`	`return true;`
`206`	`206`
`207`		`- for(std::vector<AudioFramebuffer>::iterator it = _inputAudioFrameBuffers.begin(); it != _inputAudioFrameBuffers.end(); ++it)`
	`207`	`+ for(std::vector<AudioFrameBuffer>::iterator it = _inputAudioFrameBuffers.begin(); it != _inputAudioFrameBuffers.end(); ++it)`
`208`	`208`	`{`
`209`	`209`	`if(!it->isEmpty())`
`210`	`210`	`return false;`
`@@ -356,7 +356,7 @@ void FilterGraph::addInBuffer(const std::vector<IFrame*>& inputs)`
`356`	`356`	`const AudioFrameDesc audioFrameDesc(audioFrame->getSampleRate(),`
`357`	`357`	`audioFrame->getNbChannels(),`
`358`	`358`	`getSampleFormatName(audioFrame->getSampleFormat()));`
`359`		`- _inputAudioFrameBuffers.push_back(AudioFramebuffer(audioFrameDesc));`
	`359`	`+ _inputAudioFrameBuffers.push_back(AudioFrameBuffer(audioFrameDesc));`
`360`	`360`	`}`
`361`	`361`	`// video frame`
`362`	`362`	`else if((*it)->isVideoFrame())`