properties: added fillVector method to avoid copy of the vector

Clement Champetier · Clement Champetier · commit dac41e85a103 · 2016-01-20T10:21:03.000+01:00
Fix #140
diff --git a/src/AvTranscoder/properties/AudioProperties.cpp b/src/AvTranscoder/properties/AudioProperties.cpp
@@ -149,12 +149,11 @@ size_t AudioProperties::getTicksPerFrame() const
     return _codecContext->ticks_per_frame;
 }
 
-PropertyVector AudioProperties::asVector() const
+PropertyVector& AudioProperties::fillVector(PropertyVector& data) const
 {
-    PropertyVector data;
-
     // Add properties of base class
-    PropertyVector basedProperty = StreamProperties::asVector();
+    PropertyVector basedProperty;
+    StreamProperties::fillVector(basedProperty);
     data.insert(data.begin(), basedProperty.begin(), basedProperty.end());
 
     addProperty(data, "sampleFormatName", &AudioProperties::getSampleFormatName);
diff --git a/src/AvTranscoder/properties/AudioProperties.hpp b/src/AvTranscoder/properties/AudioProperties.hpp
@@ -30,7 +30,7 @@ class AvExport AudioProperties : public StreamProperties
     AVCodecContext& getAVCodecContext() { return *_codecContext; }
 #endif
 
-    PropertyVector asVector() const;
+    PropertyVector& fillVector(PropertyVector& data) const;
 
 private:
 #ifndef SWIG
diff --git a/src/AvTranscoder/properties/FileProperties.cpp b/src/AvTranscoder/properties/FileProperties.cpp
@@ -210,8 +210,12 @@ size_t FileProperties::getNbStreams() const
 
 PropertyVector FileProperties::asVector() const
 {
-    PropertyVector data;
+    PropertyVector propertyVector;
+    return fillVector(propertyVector);
+}
 
+PropertyVector& FileProperties::fillVector(PropertyVector& data) const
+{
     addProperty(data, "filename", &FileProperties::getFilename);
     addProperty(data, "formatName", &FileProperties::getFormatName);
     addProperty(data, "formatLongName", &FileProperties::getFormatLongName);
diff --git a/src/AvTranscoder/properties/FileProperties.hpp b/src/AvTranscoder/properties/FileProperties.hpp
@@ -85,6 +85,7 @@ class AvExport FileProperties
     std::string asJson() const;              ///< Return all format properties as a json format.
     PropertyMap asMap() const;               ///< Return format properties as a map (name of property, value)
     PropertyVector asVector() const;         ///< Return format properties as a vector (name of property: value)
+    PropertyVector& fillVector(PropertyVector& data) const; ///< To avoid copy of the vector
 
 private:
 #ifndef SWIG
diff --git a/src/AvTranscoder/properties/PixelProperties.cpp b/src/AvTranscoder/properties/PixelProperties.cpp
@@ -235,8 +235,12 @@ std::vector<Channel> PixelProperties::getChannels() const
 
 PropertyVector PixelProperties::asVector() const
 {
-    PropertyVector data;
+    PropertyVector propertyVector;
+    return fillVector(propertyVector);
+}
 
+PropertyVector& PixelProperties::fillVector(PropertyVector& data) const
+{
     addProperty(data, "pixelName", &PixelProperties::getPixelName);
     addProperty(data, "pixelFormatName", &PixelProperties::getPixelFormatName);
     addProperty(data, "bitDepth", &PixelProperties::getBitsPerPixel);
diff --git a/src/AvTranscoder/properties/PixelProperties.hpp b/src/AvTranscoder/properties/PixelProperties.hpp
@@ -81,6 +81,7 @@ class AvExport PixelProperties
 #endif
 
     PropertyVector asVector() const; ///< Return all pixel properties as a vector (name of property: value)
+    PropertyVector& fillVector(PropertyVector& data) const; ///< To avoid copy of the vector
 
 private:
     void init(const AVPixelFormat avPixelFormat);
diff --git a/src/AvTranscoder/properties/StreamProperties.cpp b/src/AvTranscoder/properties/StreamProperties.cpp
@@ -100,8 +100,12 @@ std::string StreamProperties::getCodecLongName() const
 
 PropertyVector StreamProperties::asVector() const
 {
-    PropertyVector data;
+    PropertyVector propertyVector;
+    return fillVector(propertyVector);
+}
 
+PropertyVector& StreamProperties::fillVector(PropertyVector& data) const
+{
     addProperty(data, "streamId", &StreamProperties::getStreamId);
     addProperty(data, "streamIndex", &StreamProperties::getStreamIndex);
     addProperty(data, "timeBase", &StreamProperties::getTimeBase);
diff --git a/src/AvTranscoder/properties/StreamProperties.hpp b/src/AvTranscoder/properties/StreamProperties.hpp
@@ -31,9 +31,10 @@ class AvExport StreamProperties
     const AVFormatContext& getAVFormatContext() const { return *_formatContext; }
 #endif
 
-    std::string asJson() const;              ///< Return all properties as a json format.
-    PropertyMap asMap() const;               ///< Return all properties as a map (name of property, value)
-    virtual PropertyVector asVector() const; ///< Same data with a specific order
+    std::string asJson() const;      ///< Return all properties as a json format.
+    PropertyMap asMap() const;       ///< Return all properties as a map (name of property, value)
+    PropertyVector asVector() const; ///< Same data with a specific order
+    virtual PropertyVector& fillVector(PropertyVector& data) const; ///< To avoid copy of the vector
 
 private:
 #ifndef SWIG
diff --git a/src/AvTranscoder/properties/VideoProperties.cpp b/src/AvTranscoder/properties/VideoProperties.cpp
@@ -552,12 +552,11 @@ void VideoProperties::analyseGopStructure(IProgress& progress)
     }
 }
 
-PropertyVector VideoProperties::asVector() const
+PropertyVector& VideoProperties::fillVector(PropertyVector& data) const
 {
-    PropertyVector data;
-
     // Add properties of base class
-    PropertyVector basedProperty = StreamProperties::asVector();
+    PropertyVector basedProperty;
+    StreamProperties::fillVector(basedProperty);
     data.insert(data.begin(), basedProperty.begin(), basedProperty.end());
 
     addProperty(data, "profile", &VideoProperties::getProfile);
@@ -598,7 +597,8 @@ PropertyVector VideoProperties::asVector() const
     addProperty(data, "referencesFrames", &VideoProperties::getReferencesFrames);
 
     // Add properties of the pixel
-    PropertyVector pixelProperties = _pixelProperties.asVector();
+    PropertyVector pixelProperties;
+    _pixelProperties.fillVector(pixelProperties);
     data.insert(data.end(), pixelProperties.begin(), pixelProperties.end());
 
     return data;
diff --git a/src/AvTranscoder/properties/VideoProperties.hpp b/src/AvTranscoder/properties/VideoProperties.hpp
@@ -79,7 +79,7 @@ class AvExport VideoProperties : public StreamProperties
     const PixelProperties& getPixelProperties() const { return _pixelProperties; }
 #endif
 
-    PropertyVector asVector() const;
+    PropertyVector& fillVector(PropertyVector& data) const;
 
 private:
     /**

Original file line number	Diff line number	Diff line change
`@@ -149,12 +149,11 @@ size_t AudioProperties::getTicksPerFrame() const`
`149`	`149`	`return _codecContext->ticks_per_frame;`
`150`	`150`	`}`
`151`	`151`
`152`		`-PropertyVector AudioProperties::asVector() const`
	`152`	`+PropertyVector& AudioProperties::fillVector(PropertyVector& data) const`
`153`	`153`	`{`
`154`		`- PropertyVector data;`
`155`		`-`
`156`	`154`	`// Add properties of base class`
`157`		`- PropertyVector basedProperty = StreamProperties::asVector();`
	`155`	`+ PropertyVector basedProperty;`
	`156`	`+ StreamProperties::fillVector(basedProperty);`
`158`	`157`	`data.insert(data.begin(), basedProperty.begin(), basedProperty.end());`
`159`	`158`
`160`	`159`	`addProperty(data, "sampleFormatName", &AudioProperties::getSampleFormatName);`