VideoProperties: add progress callback in analyseFull method

Clement Champetier · Clement Champetier · commit b112ba8111b0 · 2016-11-21T16:26:39.000+01:00
diff --git a/src/AvTranscoder/properties/VideoProperties.cpp b/src/AvTranscoder/properties/VideoProperties.cpp
@@ -376,7 +376,7 @@ size_t VideoProperties::getNbFrames() const
     size_t nbFrames = _formatContext->streams[_streamIndex]->nb_frames;
     if(nbFrames == 0)
     {
-        if(_levelAnalysis == eAnalyseLevelFull)
+        if(_levelAnalysis == eAnalyseLevelFull && _nbFrames)
             return _nbFrames;
 
         LOG_WARN("The number of frames in the stream '" << _streamIndex << "' of file '" << _formatContext->filename
@@ -591,9 +591,11 @@ size_t VideoProperties::analyseFull(IProgress& progress)
     VideoDecoder decoder(static_cast<InputStream&>(stream));
     VideoFrame frame(VideoFrameDesc(getWidth(), getHeight(), getPixelFormatName(getPixelProperties().getAVPixelFormat())), false);
 
+    const size_t estimateNbFrames = getNbFrames();
     _nbFrames = nbDecodedFrames;
     while(decoder.decodeNextFrame(frame))
     {
+        progress.progress(_nbFrames, estimateNbFrames);
         ++_nbFrames;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -376,7 +376,7 @@ size_t VideoProperties::getNbFrames() const`
`376`	`376`	`size_t nbFrames = _formatContext->streams[_streamIndex]->nb_frames;`
`377`	`377`	`if(nbFrames == 0)`
`378`	`378`	`{`
`379`		`- if(_levelAnalysis == eAnalyseLevelFull)`
	`379`	`+ if(_levelAnalysis == eAnalyseLevelFull && _nbFrames)`
`380`	`380`	`return _nbFrames;`
`381`	`381`
`382`	`382`	`LOG_WARN("The number of frames in the stream '" << _streamIndex << "' of file '" << _formatContext->filename`
`@@ -591,9 +591,11 @@ size_t VideoProperties::analyseFull(IProgress& progress)`
`591`	`591`	`VideoDecoder decoder(static_cast<InputStream&>(stream));`
`592`	`592`	`VideoFrame frame(VideoFrameDesc(getWidth(), getHeight(), getPixelFormatName(getPixelProperties().getAVPixelFormat())), false);`
`593`	`593`
	`594`	`+ const size_t estimateNbFrames = getNbFrames();`
`594`	`595`	`_nbFrames = nbDecodedFrames;`
`595`	`596`	`while(decoder.decodeNextFrame(frame))`
`596`	`597`	`{`
	`598`	`+ progress.progress(_nbFrames, estimateNbFrames);`
`597`	`599`	`++_nbFrames;`
`598`	`600`	`}`
`599`	`601`