VideoProperties: fixed value of properties available when decode first gop

Clement Champetier · Clement Champetier · commit 85290f2bbdce · 2016-05-13T11:26:04.000+02:00
All properties have the same value if not found.
diff --git a/src/AvTranscoder/properties/VideoProperties.cpp b/src/AvTranscoder/properties/VideoProperties.cpp
@@ -553,31 +553,43 @@ PropertyVector& VideoProperties::fillVector(PropertyVector& data) const
     addProperty(data, "colorRange", &VideoProperties::getColorRange);
     addProperty(data, "colorPrimaries", &VideoProperties::getColorPrimaries);
     addProperty(data, "chromaSampleLocation", &VideoProperties::getChromaSampleLocation);
-    addProperty(data, "interlaced ", &VideoProperties::isInterlaced);
-    addProperty(data, "topFieldFirst", &VideoProperties::isTopFieldFirst);
     addProperty(data, "fieldOrder", &VideoProperties::getFieldOrder);
     addProperty(data, "fps", &VideoProperties::getFps);
     addProperty(data, "nbFrame", &VideoProperties::getNbFrames);
     addProperty(data, "ticksPerFrame", &VideoProperties::getTicksPerFrame);
     addProperty(data, "bitRate", &VideoProperties::getBitRate);
     addProperty(data, "maxBitRate", &VideoProperties::getMaxBitRate);
     addProperty(data, "minBitRate", &VideoProperties::getMinBitRate);
-    addProperty(data, "gopSize", &VideoProperties::getGopSize);
+    addProperty(data, "hasBFrames", &VideoProperties::hasBFrames);
+    addProperty(data, "referencesFrames", &VideoProperties::getReferencesFrames);
 
-    std::stringstream gop;
-    for(size_t frameIndex = 0; frameIndex < _gopStructure.size(); ++frameIndex)
+    // Add properties available when decode first gop
+    if(_levelAnalysis < eAnalyseLevelFirstGop)
     {
-        gop << _gopStructure.at(frameIndex).first;
-        gop << "(";
-        gop << _gopStructure.at(frameIndex).second;;
-        gop << ")";
-        gop << " ";
+        detail::add(data, "gopSize", detail::propertyValueIfError);
+        detail::add(data, "gop", detail::propertyValueIfError);
+        detail::add(data, "interlaced", detail::propertyValueIfError);
+        detail::add(data, "topFieldFirst", detail::propertyValueIfError);
     }
-    detail::add(data, "gop", gop.str());
-    // detail::add( data, "isClosedGop", isClosedGop() );
+    else
+    {
+        addProperty(data, "gopSize", &VideoProperties::getGopSize);
 
-    addProperty(data, "hasBFrames", &VideoProperties::hasBFrames);
-    addProperty(data, "referencesFrames", &VideoProperties::getReferencesFrames);
+        std::stringstream gop;
+        for(size_t frameIndex = 0; frameIndex < _gopStructure.size(); ++frameIndex)
+        {
+            gop << _gopStructure.at(frameIndex).first;
+            gop << "(";
+            gop << _gopStructure.at(frameIndex).second;;
+            gop << ")";
+            gop << " ";
+        }
+        detail::add(data, "gop", gop.str());
+        // detail::add( data, "isClosedGop", isClosedGop() );
+
+        addProperty(data, "interlaced ", &VideoProperties::isInterlaced);
+        addProperty(data, "topFieldFirst", &VideoProperties::isTopFieldFirst);
+    }
 
     // Add properties of the pixel
     PropertyVector pixelProperties;
