NotificationsYou must be signed in to change notification settings
Fork50
Star165

Commitc823ad6

Valentin NOEL

committed

FilterGraph: fix AudioFrameBuffer class name case typo

1 parent969c6c3 commitc823ad6Copy full SHA for c823ad6

File tree

2 files changed

+13

-13

lines changed

src/AvTranscoder/filter
- FilterGraph.cpp
- FilterGraph.hpp

2 files changed

+13

-13

lines changed

`‎src/AvTranscoder/filter/FilterGraph.cpp`

Lines changed: 9 additions & 9 deletions

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`		`-voidAudioFramebuffer::addFrame(IFrame* frame)`
	`39`	`+voidAudioFrameBuffer::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`		`-voidAudioFramebuffer::popFrame()`
	`53`	`+voidAudioFrameBuffer::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(constsize_t size)`
	`59`	`+IFrame*AudioFrameBuffer::getFrame(constsize_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`	`returnfalse;`
`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`	`returnfalse;`
`@@ -204,7 +204,7 @@ bool FilterGraph::areFrameBuffersEmpty()`
`204`	`204`	`if(!_inputAudioFrameBuffers.size())`
`205`	`205`	`returntrue;`
`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`	`returnfalse;`
`@@ -356,7 +356,7 @@ void FilterGraph::addInBuffer(const std::vector<IFrame*>& inputs)`
`356`	`356`	`const AudioFrameDescaudioFrameDesc(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`	`elseif((*it)->isVideoFrame())`

`‎src/AvTranscoder/filter/FilterGraph.hpp`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,11 @@ namespace avtranscoder`
`21`	`21`	`* It makes no sense to use such buffers for video, since video frames are spatially consistent,`
`22`	`22`	`* so can not be divided nor concatenated.`
`23`	`23`	`**/`
`24`		`-classAudioFramebuffer`
	`24`	`+classAudioFrameBuffer`
`25`	`25`	`{`
`26`	`26`	`public:`
`27`		`-AudioFramebuffer(const AudioFrameDesc& audioFrameDesc);`
`28`		`-~AudioFramebuffer();`
	`27`	`+AudioFrameBuffer(const AudioFrameDesc& audioFrameDesc);`
	`28`	`+~AudioFrameBuffer();`
`29`	`29`
`30`	`30`	`/**`
`31`	`31`	`* @brief Return whether the buffer is empty or not.`
`@@ -151,7 +151,7 @@ class AvExport FilterGraph`
`151`	`151`	`std::vector<Filter*> _filters;///< List of filters to process.`
`152`	`152`	`const ICodec& _codec;///< Codec of the stream on which the filters will be applied.`
`153`	`153`
`154`		`- std::vector<AudioFramebuffer> _inputAudioFrameBuffers;`
	`154`	`+ std::vector<AudioFrameBuffer> _inputAudioFrameBuffers;`
`155`	`155`
`156`	`156`	`/**`
`157`	`157`	`* @brief Is the FilterGraph initialized.`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitc823ad6

File tree

2 files changed

2 files changed

`‎src/AvTranscoder/filter/FilterGraph.cpp`

`‎src/AvTranscoder/filter/FilterGraph.hpp`

0 commit comments