frames: define assign method in the IFrame based class

Clement Champetier · Clement Champetier · commit 2a61683f5749 · 2016-10-28T11:10:32.000+02:00
* Less code to maintain.
* Rename assign methods to assignBuffer and assignValue (to avoid
 implicite C++ cast and so calling the wrong method).
diff --git a/src/AvTranscoder/data/decoded/AudioFrame.cpp b/src/AvTranscoder/data/decoded/AudioFrame.cpp
@@ -122,19 +122,7 @@ void AudioFrame::freeData()
     _dataAllocated = false;
 }
 
-void AudioFrame::assign(const unsigned char value)
-{
-    // Create the audio buffer
-    // The buffer will be freed in destructor of based class
-    const int audioSize = getSize();
-    unsigned char* audioBuffer = new unsigned char[audioSize];
-    memset(audioBuffer, value, audioSize);
-
-    // Fill the picture
-    assign(audioBuffer);
-}
-
-void AudioFrame::assign(const unsigned char* ptrValue)
+void AudioFrame::assignBuffer(const unsigned char* ptrValue)
 {
     const int align = 0;
     const int ret = av_samples_fill_arrays(_frame->data, _frame->linesize, ptrValue, getNbChannels(),
diff --git a/src/AvTranscoder/data/decoded/AudioFrame.hpp b/src/AvTranscoder/data/decoded/AudioFrame.hpp
@@ -58,17 +58,7 @@ class AvExport AudioFrame : public IFrame
 
     void setNbSamplesPerChannel(const size_t nbSamples) { _frame->nb_samples = nbSamples; }
 
-    /**
-     * @brief Assign the given value to all the data of the audio frame.
-     */
-    void assign(const unsigned char value);
-
-    /**
-     * @brief Assign the given ptr of data to the data of the audio frame.
-     * @warning the given ptr should have the size of the audio frame..
-     * @see getSize
-     */
-    void assign(const unsigned char* ptrValue);
+    void assignBuffer(const unsigned char* ptrValue);
 
 private:
     /**
diff --git a/src/AvTranscoder/data/decoded/IFrame.cpp b/src/AvTranscoder/data/decoded/IFrame.cpp
@@ -62,6 +62,17 @@ void IFrame::freeAVFrame()
     }
 }
 
+void IFrame::assignValue(const unsigned char value)
+{
+    // Create the buffer
+    const int bufferSize = getSize();
+    unsigned char* dataBuffer = new unsigned char[bufferSize];
+    memset(dataBuffer, value, bufferSize);
+
+    // Fill the frame
+    assignBuffer(dataBuffer);
+}
+
 bool IFrame::isAudioFrame() const
 {
     if(_frame->sample_rate && _frame->channels && _frame->channel_layout && _frame->format != -1)
diff --git a/src/AvTranscoder/data/decoded/IFrame.hpp b/src/AvTranscoder/data/decoded/IFrame.hpp
@@ -45,6 +45,18 @@ class AvExport IFrame
      */
     virtual size_t getSize() const = 0;
 
+    /**
+     * @brief Assign the given ptr of data to the data of the frame.
+     * @warning the given ptr should have the size of the frame..
+     * @see getSize
+     */
+    virtual void assignBuffer(const unsigned char* ptrValue) = 0;
+
+    /**
+     * @brief Assign the given value to all the data of the frame.
+     */
+    void assignValue(const unsigned char value);
+
     /**
      * @brief Get all the data of the frame.
      */
diff --git a/src/AvTranscoder/data/decoded/VideoFrame.cpp b/src/AvTranscoder/data/decoded/VideoFrame.cpp
@@ -105,19 +105,7 @@ void VideoFrame::freeData()
     _dataAllocated = false;
 }
 
-void VideoFrame::assign(const unsigned char value)
-{
-    // Create the image buffer
-    // The buffer will be freed in destructor of based class
-    const int imageSize = getSize();
-    unsigned char* imageBuffer = new unsigned char[imageSize];
-    memset(imageBuffer, value, imageSize);
-
-    // Fill the picture
-    assign(imageBuffer);
-}
-
-void VideoFrame::assign(const unsigned char* ptrValue)
+void VideoFrame::assignBuffer(const unsigned char* ptrValue)
 {
     const int ret =
         avpicture_fill(reinterpret_cast<AVPicture*>(_frame), ptrValue, getPixelFormat(), getWidth(), getHeight());
diff --git a/src/AvTranscoder/data/decoded/VideoFrame.hpp b/src/AvTranscoder/data/decoded/VideoFrame.hpp
@@ -60,17 +60,7 @@ class AvExport VideoFrame : public IFrame
 
     size_t getSize() const;
 
-    /**
-     * @brief Assign the given value to all the data of the picture.
-     */
-    void assign(const unsigned char value);
-
-    /**
-     * @brief Assign the given ptr of data to the data of the picture.
-     * @warning the given ptr should have the size of the picture.
-     * @see getSize
-     */
-    void assign(const unsigned char* ptrValue);
+    void assignBuffer(const unsigned char* ptrValue);
 
 private:
     /**
diff --git a/src/AvTranscoder/decoder/VideoGenerator.cpp b/src/AvTranscoder/decoder/VideoGenerator.cpp
@@ -31,7 +31,7 @@ bool VideoGenerator::decodeNextFrame(IFrame& frameBuffer)
             VideoFrameDesc blackDesc(_frameDesc._width, _frameDesc._height, "rgb24");
             _blackImage = new VideoFrame(blackDesc);
             const unsigned char fillChar = 0;
-            _blackImage->assign(fillChar);
+            _blackImage->assignValue(fillChar);
 
             std::stringstream msg;
             msg << "Generate a black image with the following features:" << std::endl;

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,17 @@ void IFrame::freeAVFrame()`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
	`65`	`+void IFrame::assignValue(const unsigned char value)`
	`66`	`+{`
	`67`	`+ // Create the buffer`
	`68`	`+ const int bufferSize = getSize();`
	`69`	`+ unsigned char* dataBuffer = new unsigned char[bufferSize];`
	`70`	`+ memset(dataBuffer, value, bufferSize);`
	`71`	`+`
	`72`	`+ // Fill the frame`
	`73`	`+ assignBuffer(dataBuffer);`
	`74`	`+}`
	`75`	`+`
`65`	`76`	`bool IFrame::isAudioFrame() const`
`66`	`77`	`{`
`67`	`78`	`if(_frame->sample_rate && _frame->channels && _frame->channel_layout && _frame->format != -1)`