Fix deprecated warnings into decoded data classes

valnoel · valnoel · commit 9bda038850db · 2020-02-12T17:03:24.000+01:00
diff --git a/src/AvTranscoder/data/decoded/AudioFrame.cpp b/src/AvTranscoder/data/decoded/AudioFrame.cpp
@@ -45,9 +45,9 @@ AudioFrame::AudioFrame(const AudioFrameDesc& desc, const bool forceDataAllocatio
     , _desc(desc)
 {
     // Set Frame properties
-    av_frame_set_sample_rate(_frame, desc._sampleRate);
-    av_frame_set_channels(_frame, desc._nbChannels);
-    av_frame_set_channel_layout(_frame, av_get_default_channel_layout(desc._nbChannels));
+    _frame->sample_rate = desc._sampleRate;
+    _frame->channels = desc._nbChannels;
+    _frame->channel_layout = av_get_default_channel_layout(desc._nbChannels);
     _frame->format = desc._sampleFormat;
     _frame->nb_samples = getDefaultNbSamples();
 
@@ -102,9 +102,9 @@ void AudioFrame::allocateData()
         LOG_WARN("The AudioFrame seems to already have allocated data. This could lead to memory leaks.")
 
     // Set Frame properties
-    av_frame_set_sample_rate(_frame, _desc._sampleRate);
-    av_frame_set_channels(_frame, _desc._nbChannels);
-    av_frame_set_channel_layout(_frame, av_get_default_channel_layout(_desc._nbChannels));
+    _frame->sample_rate = _desc._sampleRate;
+    _frame->channels = _desc._nbChannels;
+    _frame->channel_layout = av_get_default_channel_layout(_desc._nbChannels);
     _frame->format = _desc._sampleFormat;
     if(_frame->nb_samples == 0)
         _frame->nb_samples = getDefaultNbSamples();
diff --git a/src/AvTranscoder/data/decoded/AudioFrame.hpp b/src/AvTranscoder/data/decoded/AudioFrame.hpp
@@ -51,9 +51,9 @@ class AvExport AudioFrame : public IFrame
     void freeData();
     size_t getDataSize() const;
 
-    size_t getSampleRate() const { return av_frame_get_sample_rate(_frame); }
-    size_t getNbChannels() const { return av_frame_get_channels(_frame); }
-    size_t getChannelLayout() const { return av_frame_get_channel_layout(_frame); }
+    size_t getSampleRate() const { return _frame->sample_rate; }
+    size_t getNbChannels() const { return _frame->channels; }
+    size_t getChannelLayout() const { return _frame->channel_layout; }
     std::string getChannelLayoutDesc() const; ///< Get a description of a channel layout (example: '5.1').
     AVSampleFormat getSampleFormat() const { return static_cast<AVSampleFormat>(_frame->format); }
     size_t getBytesPerSample() const;  ///< 0 if unknown sample format
diff --git a/src/AvTranscoder/data/decoded/IFrame.cpp b/src/AvTranscoder/data/decoded/IFrame.cpp
@@ -69,7 +69,7 @@ void IFrame::assignValue(const unsigned char value)
 
     // Create the buffer
     const int bufferSize = getDataSize();
-    unsigned char* dataBuffer = static_cast<unsigned char*>(malloc(bufferSize * sizeof(unsigned char)));
+    unsigned char* dataBuffer = static_cast<unsigned char*>(av_malloc(bufferSize * sizeof(unsigned char)));
     memset(dataBuffer, value, bufferSize);
 
     // Fill the frame
diff --git a/src/AvTranscoder/data/decoded/VideoFrame.cpp b/src/AvTranscoder/data/decoded/VideoFrame.cpp
@@ -5,6 +5,7 @@
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavutil/pixdesc.h>
+#include <libavutil/imgutils.h>
 }
 
 #include <stdexcept>
@@ -75,7 +76,7 @@ size_t VideoFrame::getDataSize() const
         return 0;
     }
 
-    const size_t size = avpicture_get_size(getPixelFormat(), getWidth(), getHeight());
+    const size_t size = av_image_get_buffer_size(getPixelFormat(), getWidth(), getHeight(), 1);
     if(size == 0)
         throw std::runtime_error("Unable to determine image buffer size: " + getDescriptionFromErrorCode(size));
     return size;
@@ -92,7 +93,7 @@ void VideoFrame::allocateData()
     _frame->format = _desc._pixelFormat;
 
     // Allocate data
-    const int ret = avpicture_alloc(reinterpret_cast<AVPicture*>(_frame), _desc._pixelFormat, _desc._width, _desc._height);
+    const int ret = av_image_alloc(_frame->data, _frame->linesize, _desc._width, _desc._height, _desc._pixelFormat, 1);
     if(ret < 0)
     {
         const std::string formatName = getPixelFormatName(_desc._pixelFormat);
@@ -109,14 +110,13 @@ void VideoFrame::allocateData()
 
 void VideoFrame::freeData()
 {
-    avpicture_free(reinterpret_cast<AVPicture*>(_frame));
+    av_freep(&_frame->data[0]);
     _dataAllocated = false;
 }
 
 void VideoFrame::assignBuffer(const unsigned char* ptrValue)
 {
-    const int ret =
-        avpicture_fill(reinterpret_cast<AVPicture*>(_frame), ptrValue, getPixelFormat(), getWidth(), getHeight());
+    const int ret = av_image_fill_arrays(_frame->data, _frame->linesize, ptrValue, getPixelFormat(), getWidth(), getHeight(), 1);
     if(ret < 0)
     {
         std::stringstream msg;

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`extern "C" {`
`6`	`6`	`#include <libavcodec/avcodec.h>`
`7`	`7`	`#include <libavutil/pixdesc.h>`
	`8`	`+#include <libavutil/imgutils.h>`
`8`	`9`	`}`
`9`	`10`
`10`	`11`	`#include <stdexcept>`
`@@ -75,7 +76,7 @@ size_t VideoFrame::getDataSize() const`
`75`	`76`	`return 0;`
`76`	`77`	`}`
`77`	`78`
`78`		`- const size_t size = avpicture_get_size(getPixelFormat(), getWidth(), getHeight());`
	`79`	`+ const size_t size = av_image_get_buffer_size(getPixelFormat(), getWidth(), getHeight(), 1);`
`79`	`80`	`if(size == 0)`
`80`	`81`	`throw std::runtime_error("Unable to determine image buffer size: " + getDescriptionFromErrorCode(size));`
`81`	`82`	`return size;`
`@@ -92,7 +93,7 @@ void VideoFrame::allocateData()`
`92`	`93`	`_frame->format = _desc._pixelFormat;`
`93`	`94`
`94`	`95`	`// Allocate data`
`95`		`- const int ret = avpicture_alloc(reinterpret_cast<AVPicture*>(_frame), _desc._pixelFormat, _desc._width, _desc._height);`
	`96`	`+ const int ret = av_image_alloc(_frame->data, _frame->linesize, _desc._width, _desc._height, _desc._pixelFormat, 1);`
`96`	`97`	`if(ret < 0)`
`97`	`98`	`{`
`98`	`99`	`const std::string formatName = getPixelFormatName(_desc._pixelFormat);`
`@@ -109,14 +110,13 @@ void VideoFrame::allocateData()`
`109`	`110`
`110`	`111`	`void VideoFrame::freeData()`
`111`	`112`	`{`
`112`		`- avpicture_free(reinterpret_cast<AVPicture*>(_frame));`
	`113`	`+ av_freep(&_frame->data[0]);`
`113`	`114`	`_dataAllocated = false;`
`114`	`115`	`}`
`115`	`116`
`116`	`117`	`void VideoFrame::assignBuffer(const unsigned char* ptrValue)`
`117`	`118`	`{`
`118`		`- const int ret =`
`119`		`- avpicture_fill(reinterpret_cast<AVPicture*>(_frame), ptrValue, getPixelFormat(), getWidth(), getHeight());`
	`119`	`+ const int ret = av_image_fill_arrays(_frame->data, _frame->linesize, ptrValue, getPixelFormat(), getWidth(), getHeight(), 1);`
`120`	`120`	`if(ret < 0)`
`121`	`121`	`{`
`122`	`122`	`std::stringstream msg;`