VideoProperties: refactor how to getNbFrames

Clement Champetier · Clement Champetier · commit 0f7508fa11cd · 2016-11-23T11:10:41.000+01:00
Else statement was not necessary!
diff --git a/src/AvTranscoder/properties/VideoProperties.cpp b/src/AvTranscoder/properties/VideoProperties.cpp
@@ -392,16 +392,14 @@ size_t VideoProperties::getNbFrames() const
         LOG_INFO("Need a deeper analysis: see eAnalyseLevelFirstGop.")
         return 0;
     }
-    else
+
+    if(! _nbFrames)
     {
-        if(! _nbFrames)
-        {
-            LOG_INFO("Estimate the number of frames from the fps and the duration.")
-            return getFps() * getDuration();
-        }
-        LOG_INFO("Get the exact number of frames.")
-        return _nbFrames;
+        LOG_INFO("Estimate the number of frames from the fps and the duration.")
+        return getFps() * getDuration();
     }
+    LOG_INFO("Get the exact number of frames.")
+    return _nbFrames;
 }
 
 size_t VideoProperties::getTicksPerFrame() const

Original file line number	Diff line number	Diff line change
`@@ -392,16 +392,14 @@ size_t VideoProperties::getNbFrames() const`
`392`	`392`	`LOG_INFO("Need a deeper analysis: see eAnalyseLevelFirstGop.")`
`393`	`393`	`return 0;`
`394`	`394`	`}`
`395`		`- else`
	`395`	`+`
	`396`	`+ if(! _nbFrames)`
`396`	`397`	`{`
`397`		`- if(! _nbFrames)`
`398`		`- {`
`399`		`- LOG_INFO("Estimate the number of frames from the fps and the duration.")`
`400`		`- return getFps() * getDuration();`
`401`		`- }`
`402`		`- LOG_INFO("Get the exact number of frames.")`
`403`		`- return _nbFrames;`
	`398`	`+ LOG_INFO("Estimate the number of frames from the fps and the duration.")`
	`399`	`+ return getFps() * getDuration();`
`404`	`400`	`}`
	`401`	`+ LOG_INFO("Get the exact number of frames.")`
	`402`	`+ return _nbFrames;`
`405`	`403`	`}`
`406`	`404`
`407`	`405`	`size_t VideoProperties::getTicksPerFrame() const`