AudioFrame: renamed get/setNbSamples to get/setNbSamplesPerChannel

Clement Champetier · Clement Champetier · commit f1ad8db432ea · 2016-01-12T15:12:32.000+01:00
diff --git a/src/AvTranscoder/decoder/AudioDecoder.cpp b/src/AvTranscoder/decoder/AudioDecoder.cpp
@@ -112,7 +112,7 @@ bool AudioDecoder::decodeNextFrame(Frame& frameBuffer)
         return false;
 
     AudioFrame& audioBuffer = static_cast<AudioFrame&>(frameBuffer);
-    audioBuffer.setNbSamples(_frame->nb_samples);
+    audioBuffer.setNbSamplesPerChannel(_frame->nb_samples);
     audioBuffer.resize(decodedSize);
 
     // @todo manage cases with data of frame not only on data[0] (use _frame.linesize)
@@ -152,7 +152,7 @@ bool AudioDecoder::decodeNextFrame(Frame& frameBuffer, const size_t channelIndex
     }
 
     AudioFrame& audioBuffer = static_cast<AudioFrame&>(frameBuffer);
-    audioBuffer.setNbSamples(_frame->nb_samples);
+    audioBuffer.setNbSamplesPerChannel(_frame->nb_samples);
     audioBuffer.resize(decodedSize);
 
     // @todo manage cases with data of frame not only on data[0] (use _frame.linesize)
diff --git a/src/AvTranscoder/decoder/AudioGenerator.cpp b/src/AvTranscoder/decoder/AudioGenerator.cpp
@@ -47,7 +47,7 @@ bool AudioGenerator::decodeNextFrame(Frame& frameBuffer)
     if(!_inputFrame)
     {
         AudioFrame& audioBuffer = static_cast<AudioFrame&>(frameBuffer);
-        audioBuffer.setNbSamples(_frameDesc.getSampleRate() / _frameDesc.getFps());
+        audioBuffer.setNbSamplesPerChannel(_frameDesc.getSampleRate() / _frameDesc.getFps());
 
         // Generate the silent only once
         if(!_silent)
@@ -56,7 +56,7 @@ bool AudioGenerator::decodeNextFrame(Frame& frameBuffer)
 
             _silent = new AudioFrame(audioBuffer.desc());
             _silent->assign(_frameDesc.getDataSize(), fillChar);
-            _silent->setNbSamples(audioBuffer.getNbSamples());
+            _silent->setNbSamplesPerChannel(audioBuffer.getNbSamplesPerChannel());
         }
         frameBuffer.refData(*_silent);
     }
diff --git a/src/AvTranscoder/encoder/AudioEncoder.cpp b/src/AvTranscoder/encoder/AudioEncoder.cpp
@@ -119,7 +119,7 @@ bool AudioEncoder::encodeFrame(const Frame& sourceFrame, Frame& codedFrame)
 
     const AudioFrame& sourceAudioFrame = static_cast<const AudioFrame&>(sourceFrame);
 
-    _frame->nb_samples = sourceAudioFrame.getNbSamples();
+    _frame->nb_samples = sourceAudioFrame.getNbSamplesPerChannel();
     _frame->format = avCodecContext.sample_fmt;
     _frame->channel_layout = avCodecContext.channel_layout;
 
diff --git a/src/AvTranscoder/frame/AudioFrame.hpp b/src/AvTranscoder/frame/AudioFrame.hpp
@@ -55,8 +55,8 @@ class AvExport AudioFrame : public Frame
 
     const AudioFrameDesc& desc() const { return _audioFrameDesc; }
 
-    size_t getNbSamples() const { return _nbSamples; }
-    void setNbSamples(size_t nbSamples) { _nbSamples = nbSamples; }
+    size_t getNbSamplesPerChannel() const { return _nbSamples; }
+    void setNbSamplesPerChannel(const size_t nbSamples) { _nbSamples = nbSamples; }
 
 private:
     const AudioFrameDesc _audioFrameDesc;
diff --git a/src/AvTranscoder/transform/AudioTransform.cpp b/src/AvTranscoder/transform/AudioTransform.cpp
@@ -106,7 +106,7 @@ void AudioTransform::convert(const Frame& srcFrame, Frame& dstFrame)
         _isInit = init(srcFrame, dstFrame);
 
     // if number of samples change from previous frame
-    const size_t nbSamplesOfCurrentFrame = static_cast<const AudioFrame&>(srcFrame).getNbSamples();
+    const size_t nbSamplesOfCurrentFrame = static_cast<const AudioFrame&>(srcFrame).getNbSamplesPerChannel();
     if(nbSamplesOfCurrentFrame != _nbSamplesOfPreviousFrame)
     {
         updateOutputFrame(nbSamplesOfCurrentFrame, dstFrame);

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ bool AudioGenerator::decodeNextFrame(Frame& frameBuffer)`
`47`	`47`	`if(!_inputFrame)`
`48`	`48`	`{`
`49`	`49`	`AudioFrame& audioBuffer = static_cast<AudioFrame&>(frameBuffer);`
`50`		`- audioBuffer.setNbSamples(_frameDesc.getSampleRate() / _frameDesc.getFps());`
	`50`	`+ audioBuffer.setNbSamplesPerChannel(_frameDesc.getSampleRate() / _frameDesc.getFps());`
`51`	`51`
`52`	`52`	`// Generate the silent only once`
`53`	`53`	`if(!_silent)`
`@@ -56,7 +56,7 @@ bool AudioGenerator::decodeNextFrame(Frame& frameBuffer)`
`56`	`56`
`57`	`57`	`_silent = new AudioFrame(audioBuffer.desc());`
`58`	`58`	`_silent->assign(_frameDesc.getDataSize(), fillChar);`
`59`		`- _silent->setNbSamples(audioBuffer.getNbSamples());`
	`59`	`+ _silent->setNbSamplesPerChannel(audioBuffer.getNbSamplesPerChannel());`
`60`	`60`	`}`
`61`	`61`	`frameBuffer.refData(*_silent);`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ void AudioTransform::convert(const Frame& srcFrame, Frame& dstFrame)`
`106`	`106`	`_isInit = init(srcFrame, dstFrame);`
`107`	`107`
`108`	`108`	`// if number of samples change from previous frame`
`109`		`- const size_t nbSamplesOfCurrentFrame = static_cast<const AudioFrame&>(srcFrame).getNbSamples();`
	`109`	`+ const size_t nbSamplesOfCurrentFrame = static_cast<const AudioFrame&>(srcFrame).getNbSamplesPerChannel();`
`110`	`110`	`if(nbSamplesOfCurrentFrame != _nbSamplesOfPreviousFrame)`
`111`	`111`	`{`
`112`	`112`	`updateOutputFrame(nbSamplesOfCurrentFrame, dstFrame);`