VideoProperties: updated value returned by getGopStructure

Clement Champetier · Clement Champetier · commit 46f983a6d8e4 · 2016-05-13T11:23:59.000+02:00
* Before: picture type, is key frame
* After: picture type, encoded frame size in bytes
* Note: "is key frame" info can be found using the picture type (I
frame).
* Updated SWIG interface.
diff --git a/src/AvTranscoder/properties/VideoProperties.cpp b/src/AvTranscoder/properties/VideoProperties.cpp
@@ -498,7 +498,7 @@ void VideoProperties::analyseGopStructure(IProgress& progress)
                         AVFrame& avFrame = frame.getAVFrame();
 
                         _gopStructure.push_back(
-                            std::make_pair(av_get_picture_type_char(avFrame.pict_type), avFrame.key_frame));
+                            std::make_pair(av_get_picture_type_char(avFrame.pict_type), frame.getEncodedSize()));
                         _isInterlaced = avFrame.interlaced_frame;
                         _isTopFieldFirst = avFrame.top_field_first;
                         if(avFrame.pict_type == AV_PICTURE_TYPE_I)
diff --git a/src/AvTranscoder/properties/VideoProperties.hpp b/src/AvTranscoder/properties/VideoProperties.hpp
@@ -74,7 +74,7 @@ class AvExport VideoProperties : public StreamProperties
      * @return the distance between two nearest I frame
      */
     size_t getGopSize() const { return _gopSize; }
-    std::vector<std::pair<char, bool> > getGopStructure() const { return _gopStructure; }
+    std::vector<std::pair<char, int> > getGopStructure() const { return _gopStructure; }
 //@}
 
 #ifndef SWIG
@@ -122,7 +122,7 @@ class AvExport VideoProperties : public StreamProperties
     bool _isInterlaced;
     bool _isTopFieldFirst;
     size_t _gopSize;
-    std::vector<std::pair<char, bool> > _gopStructure;
+    std::vector<std::pair<char, int> > _gopStructure;  ///< picture type, encoded frame size in bytes
     //@}
 
     /**
diff --git a/src/AvTranscoder/properties/properties.i b/src/AvTranscoder/properties/properties.i
@@ -40,8 +40,8 @@ namespace std {
 %template(PropertyPair)    pair< string, string >;
 %template(PropertyVector)  vector< pair< string, string > >;
 
-%template(GopPair)         pair< char, bool >;
-%template(GopVector)       vector< pair< char, bool > >;
+%template(GopPair)         pair< char, int >;
+%template(GopVector)       vector< pair< char, int > >;
 
 %template(ChannelVector)   vector< avtranscoder::Channel >;
 }

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,8 @@ namespace std {`
`40`	`40`	`%template(PropertyPair) pair< string, string >;`
`41`	`41`	`%template(PropertyVector) vector< pair< string, string > >;`
`42`	`42`
`43`		`-%template(GopPair) pair< char, bool >;`
`44`		`-%template(GopVector) vector< pair< char, bool > >;`
	`43`	`+%template(GopPair) pair< char, int >;`
	`44`	`+%template(GopVector) vector< pair< char, int > >;`
`45`	`45`
`46`	`46`	`%template(ChannelVector) vector< avtranscoder::Channel >;`
`47`	`47`	`}`