Frame: override copy constructor in order to copy AVPacket data

Clement Champetier · Clement Champetier · commit 7da461e6fed4 · 2015-02-26T11:59:51.000+01:00
Add copyAVPacket private function.
diff --git a/src/AvTranscoder/frame/Frame.cpp b/src/AvTranscoder/frame/Frame.cpp
@@ -15,13 +15,12 @@ Frame::Frame( const size_t dataSize )
 
 Frame::Frame(AVPacket& avPacket)
 {
-#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(54, 56, 0)
-	av_copy_packet( &_packet, &avPacket );
-#else
-	// we just care about data, not side properties of AVPacket
-	initAVPacket();
-	copyData( avPacket.data, avPacket.size );
-#endif
+	copyAVPacket( avPacket );
+}
+
+Frame::Frame( const Frame& other )
+{
+	copyAVPacket( other.getAVPacket() );
 }
 
 Frame::~Frame()
@@ -75,4 +74,17 @@ void Frame::initAVPacket()
 	_packet.size = 0;
 }
 
+void Frame::copyAVPacket( const AVPacket& avPacket )
+{
+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(55, 56, 108)
+	av_copy_packet( &_packet, &avPacket );
+#elif LIBAVCODEC_VERSION_INT > AV_VERSION_INT(54, 56, 0)
+	av_copy_packet( &_packet, const_cast<AVPacket*>( &avPacket ) );
+#else
+	// we just care about data, not side properties of AVPacket
+	initAVPacket();
+	copyData( avPacket.data, avPacket.size );
+#endif
+}
+
 }
diff --git a/src/AvTranscoder/frame/Frame.hpp b/src/AvTranscoder/frame/Frame.hpp
@@ -22,6 +22,9 @@ class AvExport Frame
 	/// Create a frame from the given AVPAcket (copy data of given packet)
 	Frame( AVPacket& avPacket );
 
+	/// Override copy constructor in order to copy AVPacket data
+	Frame( const Frame& other );
+
 	/// Free buffer of data
 	~Frame();
 
@@ -57,6 +60,7 @@ class AvExport Frame
 
 private:
 	void initAVPacket();
+	void copyAVPacket( const AVPacket& avPacket );
 
 private:
 	AVPacket _packet;
