Video/Audio transform: add check before converting the data

Clement Champetier · Clement Champetier · commit 5d0f51ffb554 · 2016-10-27T15:40:30.000+02:00
* Remove protected method inherited from ITransform.
* Add the same series of test for the video and the audio transform.
diff --git a/src/AvTranscoder/transform/AudioTransform.cpp b/src/AvTranscoder/transform/AudioTransform.cpp
@@ -26,8 +26,9 @@ extern "C" {
 #endif
 }
 
-#include <stdexcept>
 #include <sstream>
+#include <cassert>
+#include <stdexcept>
 
 namespace avtranscoder
 {
@@ -43,7 +44,7 @@ AudioTransform::~AudioTransform()
     FreeResampleContext(&_audioConvertContext);
 }
 
-bool AudioTransform::init(const Frame& srcFrame, const Frame& dstFrame)
+bool AudioTransform::init(const AudioFrame& src, const AudioFrame& dst)
 {
     // Set convert context
     _audioConvertContext = AllocResampleContext();
@@ -52,9 +53,6 @@ bool AudioTransform::init(const Frame& srcFrame, const Frame& dstFrame)
         throw std::runtime_error("unable to create audio convert context");
     }
 
-    const AudioFrame& src = static_cast<const AudioFrame&>(srcFrame);
-    const AudioFrame& dst = static_cast<const AudioFrame&>(dstFrame);
-
     av_opt_set_int(_audioConvertContext, "in_channel_layout", src.getChannelLayout(), 0);
     av_opt_set_int(_audioConvertContext, "out_channel_layout", dst.getChannelLayout(), 0);
     av_opt_set_int(_audioConvertContext, "in_sample_rate", src.getSampleRate(), 0);
@@ -92,8 +90,17 @@ bool AudioTransform::init(const Frame& srcFrame, const Frame& dstFrame)
 
 void AudioTransform::convert(const Frame& srcFrame, Frame& dstFrame)
 {
+    const AudioFrame& src = static_cast<const AudioFrame&>(srcFrame);
+    const AudioFrame& dst = static_cast<const AudioFrame&>(dstFrame);
+
+    assert(src.getSampleRate() > 0);
+    assert(src.getNbChannels() > 0);
+    assert(src.getNbSamplesPerChannel() > 0);
+    assert(src.getSampleFormat() != AV_SAMPLE_FMT_NONE);
+    assert(dst.getSize() > 0);
+
     if(!_isInit)
-        _isInit = init(srcFrame, dstFrame);
+        _isInit = init(src, dst);
 
     // if number of samples change from previous frame
     const size_t nbInputSamplesPerChannel = srcFrame.getAVFrame().nb_samples;
@@ -110,13 +117,9 @@ void AudioTransform::convert(const Frame& srcFrame, Frame& dstFrame)
         swr_convert(_audioConvertContext, dstData, nbInputSamplesPerChannel, srcData, nbInputSamplesPerChannel);
 #endif
 
+    // update the number of samples of the output frame
     if(nbOutputSamplesPerChannel < 0)
-    {
-        throw std::runtime_error("unable to convert audio samples");
-    }
-    else
-    {
-        dstFrame.getAVFrame().nb_samples = nbOutputSamplesPerChannel;
-    }
+        throw std::runtime_error("Unable to convert audio samples");
+    dstFrame.getAVFrame().nb_samples = nbOutputSamplesPerChannel;
 }
 }
diff --git a/src/AvTranscoder/transform/AudioTransform.hpp b/src/AvTranscoder/transform/AudioTransform.hpp
@@ -3,8 +3,7 @@
 
 #include "ITransform.hpp"
 
-#include <AvTranscoder/common.hpp>
-#include <AvTranscoder/data/decoded/Frame.hpp>
+#include <AvTranscoder/data/decoded/AudioFrame.hpp>
 
 #ifdef AVTRANSCODER_LIBAV_DEPENDENCY
 #define ResampleContext AVAudioResampleContext
@@ -30,7 +29,7 @@ class AvExport AudioTransform : public ITransform
     void convert(const Frame& srcFrame, Frame& dstFrame);
 
 private:
-    bool init(const Frame& srcFrame, const Frame& dstFrame);
+    bool init(const AudioFrame& src, const AudioFrame& dst);
 
 private:
     ResampleContext* _audioConvertContext;
diff --git a/src/AvTranscoder/transform/ITransform.hpp b/src/AvTranscoder/transform/ITransform.hpp
@@ -15,9 +15,6 @@ class AvExport ITransform
     virtual ~ITransform() {}
 
     virtual void convert(const Frame& src, Frame& dst) = 0;
-
-protected:
-    virtual bool init(const Frame& src, const Frame& dst) = 0;
 };
 }
 
diff --git a/src/AvTranscoder/transform/VideoTransform.cpp b/src/AvTranscoder/transform/VideoTransform.cpp
@@ -1,7 +1,5 @@
 #include "VideoTransform.hpp"
 
-#include <AvTranscoder/data/decoded/VideoFrame.hpp>
-
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libswscale/swscale.h>
@@ -31,12 +29,8 @@ VideoTransform::~VideoTransform()
     sws_freeContext(_imageConvertContext);
 }
 
-bool VideoTransform::init(const Frame& srcFrame, const Frame& dstFrame)
+bool VideoTransform::init(const VideoFrame& src, const VideoFrame& dst)
 {
-    // Set convert context
-    const VideoFrame& src = static_cast<const VideoFrame&>(srcFrame);
-    const VideoFrame& dst = static_cast<const VideoFrame&>(dstFrame);
-
     const AVPixelFormat srcPixelFormat = src.getPixelFormat();
     const AVPixelFormat dstPixelFormat = dst.getPixelFormat();
 
@@ -71,12 +65,13 @@ void VideoTransform::convert(const Frame& srcFrame, Frame& dstFrame)
     const VideoFrame& src = static_cast<const VideoFrame&>(srcFrame);
     VideoFrame& dst = static_cast<VideoFrame&>(dstFrame);
 
-    assert(src.getWidth() != 0);
-    assert(src.getHeight() != 0);
+    assert(src.getWidth() > 0);
+    assert(src.getHeight() > 0);
     assert(src.getPixelFormat() != AV_PIX_FMT_NONE);
+    assert(dst.getSize() > 0);
 
     if(!_isInit)
-        _isInit = init(srcFrame, dstFrame);
+        _isInit = init(src, dst);
 
     if(!_imageConvertContext)
     {
diff --git a/src/AvTranscoder/transform/VideoTransform.hpp b/src/AvTranscoder/transform/VideoTransform.hpp
@@ -1,11 +1,9 @@
 #ifndef _AV_TRANSCODER_ESSENCE_TRANSFORM_VIDEO_ESSENCE_TRANSFORM_HPP
 #define _AV_TRANSCODER_ESSENCE_TRANSFORM_VIDEO_ESSENCE_TRANSFORM_HPP
 
-#include <vector>
-
 #include "ITransform.hpp"
 
-#include <AvTranscoder/data/decoded/Frame.hpp>
+#include <AvTranscoder/data/decoded/VideoFrame.hpp>
 
 class SwsContext;
 
@@ -25,7 +23,7 @@ class AvExport VideoTransform : public ITransform
     void convert(const Frame& srcFrame, Frame& dstFrame);
 
 private:
-    bool init(const Frame& srcFrame, const Frame& dstFrame);
+    bool init(const VideoFrame& src, const VideoFrame& dst);
 
     SwsContext* _imageConvertContext;
     bool _isInit;

Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,6 @@ class AvExport ITransform`
`15`	`15`	`virtual ~ITransform() {}`
`16`	`16`
`17`	`17`	`virtual void convert(const Frame& src, Frame& dst) = 0;`
`18`		`-`
`19`		`-protected:`
`20`		`- virtual bool init(const Frame& src, const Frame& dst) = 0;`
`21`	`18`	`};`
`22`	`19`	`}`
`23`	`20`