VideoProperties: refactor how to return the number of frames

Clement Champetier · Clement Champetier · commit eb7442d0ba27 · 2016-11-21T17:09:46.000+01:00
* Add log.
* Avoid complicate if/else...
diff --git a/src/AvTranscoder/properties/VideoProperties.cpp b/src/AvTranscoder/properties/VideoProperties.cpp
@@ -373,24 +373,28 @@ size_t VideoProperties::getNbFrames() const
 {
     if(!_formatContext)
         throw std::runtime_error("unknown format context");
+
     size_t nbFrames = _formatContext->streams[_streamIndex]->nb_frames;
-    if(nbFrames == 0)
-    {
-        if(_levelAnalysis == eAnalyseLevelFull && _nbFrames)
-            return _nbFrames;
+    if(nbFrames)
+        return nbFrames;
+    LOG_WARN("The number of frames of the stream '" << _streamIndex << "' of file '" << _formatContext->filename
+                                                    << "' is unknown.")
 
-        LOG_WARN("The number of frames in the stream '" << _streamIndex << "' of file '" << _formatContext->filename
-                                                        << "' is unknown.")
-        const float duration = getDuration();
-        if(duration != 0)
+    if(_levelAnalysis == eAnalyseLevelHeader)
+    {
+        LOG_INFO("Need a deeper analysis: see eAnalyseLevelFirstGop.")
+        return 0;
+    }
+    else
+    {
+        if(! _nbFrames)
         {
-            LOG_INFO("Try to compute the number of frames from the fps and the duration.")
-            nbFrames = getFps() * duration;
+            LOG_INFO("Estimate the number of frames from the fps and the duration.")
+            return getFps() * getDuration();
         }
-        else
-            return 0;
+        LOG_INFO("Get the exact number of frames.")
+        return _nbFrames;
     }
-    return nbFrames;
 }
 
 size_t VideoProperties::getTicksPerFrame() const
