VideoProperties: fix nb decoded frames in analyseFull method

Clement Champetier · Clement Champetier · commit ac763ff0b313 · 2016-11-21T16:18:40.000+01:00
Use the number of decoded frames in analyseGopStructure method.
diff --git a/src/AvTranscoder/properties/VideoProperties.cpp b/src/AvTranscoder/properties/VideoProperties.cpp
@@ -568,23 +568,27 @@ size_t VideoProperties::analyseGopStructure(IProgress& progress)
     return nbDecodedFrames;
 }
 
-void VideoProperties::analyseFull(IProgress& progress)
+size_t VideoProperties::analyseFull(IProgress& progress)
 {
-    analyseGopStructure(progress);
+    const size_t nbDecodedFrames = analyseGopStructure(progress);
+
+    if(! _fileProperties->isRawFormat())
+        return nbDecodedFrames;
 
     if(! _formatContext || ! _codecContext || ! _codec)
-        return;
+        return 0;
     if(! _codecContext->width || ! _codecContext->height)
-        return;
+        return 0;
 
     InputFile& file = const_cast<InputFile&>(_fileProperties->getInputFile());
     // Get the stream
     IInputStream& stream = file.getStream(_streamIndex);
     stream.activate();
     // Create a decoder
     VideoDecoder decoder(static_cast<InputStream&>(stream));
-
     VideoFrame frame(VideoFrameDesc(getWidth(), getHeight(), getPixelFormatName(getPixelProperties().getAVPixelFormat())), false);
+
+    _nbFrames = nbDecodedFrames;
     while(decoder.decodeNextFrame(frame))
     {
         ++_nbFrames;
@@ -598,6 +602,7 @@ void VideoProperties::analyseFull(IProgress& progress)
     {
         throw std::runtime_error("Invalid number of frames when decoding the video stream.");
     }
+    return _nbFrames;
 }
 
 PropertyVector& VideoProperties::fillVector(PropertyVector& data) const
diff --git a/src/AvTranscoder/properties/VideoProperties.hpp b/src/AvTranscoder/properties/VideoProperties.hpp
@@ -111,8 +111,9 @@ class AvExport VideoProperties : public StreamProperties
 
     /**
      * @param progress: callback to get analysis progression
+     * @return the number of decoded frames to parse all the file.
      */
-    void analyseFull(IProgress& progress);
+    size_t analyseFull(IProgress& progress);
 
 #ifndef SWIG
     template <typename T>
