Frame: added attribute to retreive info of stream which contains the packet

Clement Champetier · Clement Champetier · commit 3a973e20c623 · 2015-11-17T16:44:11.000+01:00
diff --git a/src/AvTranscoder/frame/Frame.cpp b/src/AvTranscoder/frame/Frame.cpp
@@ -6,28 +6,33 @@ namespace avtranscoder
 {
 
 Frame::Frame()
+	: _avStream( NULL )
 {
 	initAVPacket();
 }
 
 Frame::Frame( const size_t dataSize )
+	: _avStream( NULL )
 {
 	av_new_packet( &_packet, dataSize );
 }
 
 Frame::Frame( const AVPacket& avPacket )
+	: _avStream( NULL )
 {
 	copyAVPacket( avPacket );
 }
 
 Frame::Frame( const Frame& other )
 {
 	copyAVPacket( other.getAVPacket() );
+	_avStream = &other.getAVStream();
 }
 
 Frame& Frame::operator=( const Frame& other )
 {
 	copyAVPacket( other.getAVPacket() );
+	_avStream = &other.getAVStream();
 	return *this;
 }
 
diff --git a/src/AvTranscoder/frame/Frame.hpp b/src/AvTranscoder/frame/Frame.hpp
@@ -7,6 +7,8 @@ extern "C" {
 #include <libavcodec/avcodec.h>
 }
 
+struct AVStream;
+
 namespace avtranscoder
 {
 
@@ -33,6 +35,7 @@ class AvExport Frame
 	/// Free buffer of data
 	~Frame();
 
+	void refAVStream( const AVStream& avStream ) { _avStream = &avStream; }
 	/// Resize data buffer
 	void resize( const size_t newSize );
 
@@ -58,6 +61,7 @@ class AvExport Frame
 	size_t getSize() const { return _packet.size; }
 
 #ifndef SWIG
+	const AVStream& getAVStream() const { return *_avStream; }
 	AVPacket& getAVPacket() { return _packet; }
 	const AVPacket& getAVPacket() const { return _packet; }
 	const unsigned char* getData() const { return _packet.data; }
@@ -69,6 +73,9 @@ class AvExport Frame
 
 private:
 	AVPacket _packet;
+
+	// Stream which contains the packet
+	const AVStream* _avStream;  //< Has link (no ownership)
 };
 
 // Typedef to represent buffer of coded data.

Original file line number	Diff line number	Diff line change
`@@ -6,28 +6,33 @@ namespace avtranscoder`
`6`	`6`	`{`
`7`	`7`
`8`	`8`	`Frame::Frame()`
	`9`	`+ : _avStream( NULL )`
`9`	`10`	`{`
`10`	`11`	`initAVPacket();`
`11`	`12`	`}`
`12`	`13`
`13`	`14`	`Frame::Frame( const size_t dataSize )`
	`15`	`+ : _avStream( NULL )`
`14`	`16`	`{`
`15`	`17`	`av_new_packet( &_packet, dataSize );`
`16`	`18`	`}`
`17`	`19`
`18`	`20`	`Frame::Frame( const AVPacket& avPacket )`
	`21`	`+ : _avStream( NULL )`
`19`	`22`	`{`
`20`	`23`	`copyAVPacket( avPacket );`
`21`	`24`	`}`
`22`	`25`
`23`	`26`	`Frame::Frame( const Frame& other )`
`24`	`27`	`{`
`25`	`28`	`copyAVPacket( other.getAVPacket() );`
	`29`	`+ _avStream = &other.getAVStream();`
`26`	`30`	`}`
`27`	`31`
`28`	`32`	`Frame& Frame::operator=( const Frame& other )`
`29`	`33`	`{`
`30`	`34`	`copyAVPacket( other.getAVPacket() );`
	`35`	`+ _avStream = &other.getAVStream();`
`31`	`36`	`return *this;`
`32`	`37`	`}`
`33`	`38`