Add Frame base class for Image and AudioFrame into DataStructures

Valentin Noel · Valentin Noel · commit 14ac3b979a50 · 2014-06-16T17:59:46.000+02:00
diff --git a/src/AvTranscoder/DatasStructures/AudioFrame.hpp b/src/AvTranscoder/DatasStructures/AudioFrame.hpp
@@ -20,13 +20,12 @@ extern "C" {
 #include <stdexcept>
 
 //#include "Sample.hpp"
+#include "Frame.hpp"
 
 namespace avtranscoder
 {
 
-typedef std::vector< unsigned char > DataBuffer;
-
-class AudioFrameDesc
+class AvExport AudioFrameDesc
 {
 public:
 	AudioFrameDesc()
@@ -59,28 +58,22 @@ class AudioFrameDesc
 	AVSampleFormat m_sampleFormat;
 };
 
-class AudioFrame
+class AvExport AudioFrame : public Frame
 {
 public:
 	AudioFrame( const AudioFrameDesc& ref )
-		: m_dataBuffer( ref.getDataSize(), 0 )
-		, m_audioFrameDesc( ref )
+		: m_audioFrameDesc( ref )
 		, m_nbSamples( 0 )
-	{ }
+	{
+		 m_dataBuffer = DataBuffer( ref.getDataSize(), (unsigned char) 0 );
+	}
 
 	const AudioFrameDesc& desc() const    { return m_audioFrameDesc; }
-	DataBuffer&           getBuffer()     { return m_dataBuffer; }
-	unsigned char*        getPtr()        { return &m_dataBuffer[0]; }
-#ifndef SWIG
-	const unsigned char*  getPtr()  const { return &m_dataBuffer[0]; }
-#endif
-	size_t                getSize() const { return m_dataBuffer.size(); }
 	
 	size_t getNbSamples() const { return m_nbSamples; }
 	void setNbSamples( size_t nbSamples ) { m_nbSamples = nbSamples; }
 
 private:
-	DataBuffer m_dataBuffer;
 	const AudioFrameDesc m_audioFrameDesc;
 	size_t m_nbSamples;
 };
diff --git a/src/AvTranscoder/DatasStructures/Frame.hpp b/src/AvTranscoder/DatasStructures/Frame.hpp
@@ -1,20 +1,34 @@
 #ifndef _AV_TRANSCODER_DATA_FRAME_HPP_
 #define _AV_TRANSCODER_DATA_FRAME_HPP_
 
+#include <AvTranscoder/common.hpp>
+
 #include <string>
+#include <vector>
 
 namespace avtranscoder
 {
 
-class Frame
+typedef std::vector< unsigned char> DataBuffer;
+
+class AvExport Frame
 {
 public:
-	Frame(){};
 
-private:
+	Frame() {};
+
+	virtual DataBuffer& getBuffer() { return m_dataBuffer; }
+	virtual unsigned char* getPtr() { return &m_dataBuffer[0]; }
+#ifndef SWIG
+	virtual const unsigned char* getPtr() const { return &m_dataBuffer[0]; }
+#endif
+	virtual size_t getSize() const { return m_dataBuffer.size(); }
+	
+protected:
+	DataBuffer m_dataBuffer;
 
 };
 
 }
 
-#endif
+#endif
diff --git a/src/AvTranscoder/DatasStructures/Image.hpp b/src/AvTranscoder/DatasStructures/Image.hpp
@@ -20,6 +20,7 @@ extern "C" {
 #include <stdexcept>
 
 #include "Pixel.hpp"
+#include "Frame.hpp"
 
 namespace avtranscoder
 {
@@ -78,27 +79,18 @@ class AvExport ImageDesc
 
 //template< template<typename> Alloc >
 //class AvExport ImageBase
-class AvExport Image
+class AvExport Image : public Frame
 {
 public:
-//	typedef std::vector< unsigned char, Alloc<unsigned char> > DataBuffer;
-	typedef std::vector< unsigned char> DataBuffer;
-
 	Image( const ImageDesc& ref )
-		: m_dataBuffer( ref.getDataSize(), 0 )
-		, m_imageDesc( ref )
-	{ }
+		: m_imageDesc( ref )
+	{
+		m_dataBuffer = DataBuffer( ref.getDataSize(), 0 );
+	}
 
 	const ImageDesc&     desc() const    { return m_imageDesc; }
-	DataBuffer&          getBuffer()     { return m_dataBuffer; }
-	unsigned char*       getPtr()        { return &m_dataBuffer[0]; }
-#ifndef SWIG
-	const unsigned char* getPtr()  const { return &m_dataBuffer[0]; }
-#endif
-	size_t               getSize() const { return m_dataBuffer.size(); }
 
 private:
-	DataBuffer m_dataBuffer;
 	const ImageDesc m_imageDesc;
 };
 
