VideoProperties: update log when estimate bitrate / duration

Clement Champetier · Clement Champetier · commit 604d7a87c5f4 · 2016-11-21T17:01:24.000+01:00
diff --git a/src/AvTranscoder/properties/VideoProperties.cpp b/src/AvTranscoder/properties/VideoProperties.cpp
@@ -338,11 +338,11 @@ size_t VideoProperties::getBitRate() const
     // return bit rate of stream if present or VBR mode
     if(_codecContext->bit_rate || _codecContext->rc_max_rate)
         return _codecContext->bit_rate;
+    LOG_WARN("The bitrate of the stream '" << _streamIndex << "' of file '" << _formatContext->filename << "' is unknown.")
 
     if(_levelAnalysis == eAnalyseLevelHeader)
     {
-        LOG_WARN("The bitrate of the stream '" << _streamIndex << "' of file '" << _formatContext->filename << "' is unknown. "
-                "Need a deeper analysis: see eAnalyseLevelFirstGop.")
+        LOG_INFO("Need a deeper analysis: see eAnalyseLevelFirstGop.")
         return 0;
     }
 
@@ -457,16 +457,14 @@ float VideoProperties::getDuration() const
     const float duration = StreamProperties::getDuration();
     if(duration != 0)
         return duration;
+    LOG_WARN("The duration of the stream '" << _streamIndex << "' of file '" << _formatContext->filename << "' is unknown.")
 
     if(_fileProperties->isRawFormat())
     {
-        LOG_INFO("Get the stream bitrate to compute the duration.")
+        LOG_INFO("Estimate the duration from the file size and the bitrate.")
         const size_t bitRate = getBitRate();
         if(bitRate)
-        {
-            LOG_INFO("Get the file size to compute the duration.")
             return _fileProperties->getFileSize() / bitRate * 8;
-        }
     }
     return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -338,11 +338,11 @@ size_t VideoProperties::getBitRate() const`
`338`	`338`	`// return bit rate of stream if present or VBR mode`
`339`	`339`	`if(_codecContext->bit_rate \|\| _codecContext->rc_max_rate)`
`340`	`340`	`return _codecContext->bit_rate;`
	`341`	`+ LOG_WARN("The bitrate of the stream '" << _streamIndex << "' of file '" << _formatContext->filename << "' is unknown.")`
`341`	`342`
`342`	`343`	`if(_levelAnalysis == eAnalyseLevelHeader)`
`343`	`344`	`{`
`344`		`- LOG_WARN("The bitrate of the stream '" << _streamIndex << "' of file '" << _formatContext->filename << "' is unknown. "`
`345`		`- "Need a deeper analysis: see eAnalyseLevelFirstGop.")`
	`345`	`+ LOG_INFO("Need a deeper analysis: see eAnalyseLevelFirstGop.")`
`346`	`346`	`return 0;`
`347`	`347`	`}`
`348`	`348`
`@@ -457,16 +457,14 @@ float VideoProperties::getDuration() const`
`457`	`457`	`const float duration = StreamProperties::getDuration();`
`458`	`458`	`if(duration != 0)`
`459`	`459`	`return duration;`
	`460`	`+ LOG_WARN("The duration of the stream '" << _streamIndex << "' of file '" << _formatContext->filename << "' is unknown.")`
`460`	`461`
`461`	`462`	`if(_fileProperties->isRawFormat())`
`462`	`463`	`{`
`463`		`- LOG_INFO("Get the stream bitrate to compute the duration.")`
	`464`	`+ LOG_INFO("Estimate the duration from the file size and the bitrate.")`
`464`	`465`	`const size_t bitRate = getBitRate();`
`465`	`466`	`if(bitRate)`
`466`		`- {`
`467`		`- LOG_INFO("Get the file size to compute the duration.")`
`468`	`467`	`return _fileProperties->getFileSize() / bitRate * 8;`
`469`		`- }`
`470`	`468`	`}`
`471`	`469`	`return 0;`
`472`	`470`	`}`