VideoProperties: updated getters to the properties defined when analyse GOP

Clement Champetier · Clement Champetier · commit 567a5a805fce · 2016-06-22T16:19:11.000+02:00
Throw an exception when the first GOP has not been analysed.
diff --git a/src/AvTranscoder/properties/VideoProperties.cpp b/src/AvTranscoder/properties/VideoProperties.cpp
@@ -523,6 +523,34 @@ bool VideoProperties::hasBFrames() const
 //	return ( _codecContext->flags & CODEC_FLAG_CLOSED_GOP ) == CODEC_FLAG_CLOSED_GOP;
 //}
 
+bool VideoProperties::isInterlaced() const
+{
+    if(_levelAnalysis < eAnalyseLevelFirstGop)
+        throw std::runtime_error("Need a deeper analysis: see eAnalyseLevelFirstGop.");
+    return _isInterlaced;
+}
+
+bool VideoProperties::isTopFieldFirst() const
+{
+    if(_levelAnalysis < eAnalyseLevelFirstGop)
+        throw std::runtime_error("Need a deeper analysis: see eAnalyseLevelFirstGop.");
+    return _isTopFieldFirst;
+}
+
+size_t VideoProperties::getGopSize() const
+{
+    if(_levelAnalysis < eAnalyseLevelFirstGop)
+        throw std::runtime_error("Need a deeper analysis: see eAnalyseLevelFirstGop.");
+    return _gopSize;
+}
+
+std::vector<std::pair<char, int> > VideoProperties::getGopStructure() const
+{
+    if(_levelAnalysis < eAnalyseLevelFirstGop)
+        throw std::runtime_error("Need a deeper analysis: see eAnalyseLevelFirstGop.");
+    return _gopStructure;
+}
+
 void VideoProperties::analyseGopStructure(IProgress& progress)
 {
     if(_formatContext && _codecContext && _codec)
diff --git a/src/AvTranscoder/properties/VideoProperties.hpp b/src/AvTranscoder/properties/VideoProperties.hpp
@@ -71,16 +71,16 @@ class AvExport VideoProperties : public StreamProperties
     // bool isClosedGop() const;
 
     //@{
-    // Warning: Can acces these data when analyse first gop
+    // Warning: Can access these data only when analyse first gop (else throw a runtime_error)
     // @see EAnalyseLevel
     // @see analyseGopStructure
-    bool isInterlaced() const { return _isInterlaced; }
-    bool isTopFieldFirst() const { return _isTopFieldFirst; }
+    bool isInterlaced() const;
+    bool isTopFieldFirst() const;
     /**
      * @return the distance between two nearest I frame
      */
-    size_t getGopSize() const { return _gopSize; }
-    std::vector<std::pair<char, int> > getGopStructure() const { return _gopStructure; }
+    size_t getGopSize() const;
+    std::vector<std::pair<char, int> > getGopStructure() const;
 //@}
 
 #ifndef SWIG
diff --git a/test/pyTest/testInputFile.py b/test/pyTest/testInputFile.py
@@ -20,19 +20,64 @@ def testCreateInputFileFromUnexistingFilename():
     av.InputFile( inputFileName )
 
 
-def testInputFileAnalyseFirstGop():
+@raises(RuntimeError)
+def testInputFileAnalyseHeaderTryToAccessisInterlaced():
     """
-    Analyse the first gop of an InputFile, and check if the correct attributes are filled.
+    Analyse only header of an InputFile, and try to access a properties computed when access the first GOP.
     """
     inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_MOV_FILE']
-    inputFile = av.InputFile( inputFileName )
+    inputFile = av.InputFile(inputFileName)
+
+    # The analyse of the first GOP is not done yet
+    videoProperties = inputFile.getProperties().getVideoProperties()[0]
+    videoProperties.isInterlaced()
+
+
+@raises(RuntimeError)
+def testInputFileAnalyseHeaderTryToAccessisTopFieldFirst():
+    """
+    Analyse only header of an InputFile, and try to access a properties computed when access the first GOP.
+    """
+    inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_MOV_FILE']
+    inputFile = av.InputFile(inputFileName)
 
     # The analyse of the first GOP is not done yet
     videoProperties = inputFile.getProperties().getVideoProperties()[0]
-    assert_equals(videoProperties.isInterlaced(), False)
-    assert_equals(videoProperties.isTopFieldFirst(), False)
-    assert_equals(videoProperties.getGopSize(), 0)
-    assert_equals(videoProperties.getGopStructure(), ())
+    videoProperties.isTopFieldFirst()
+
+
+@raises(RuntimeError)
+def testInputFileAnalyseHeaderTryToAccessisGopSize():
+    """
+    Analyse only header of an InputFile, and try to access a properties computed when access the first GOP.
+    """
+    inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_MOV_FILE']
+    inputFile = av.InputFile(inputFileName)
+
+    # The analyse of the first GOP is not done yet
+    videoProperties = inputFile.getProperties().getVideoProperties()[0]
+    videoProperties.getGopSize()
+
+
+@raises(RuntimeError)
+def testInputFileAnalyseHeaderTryToAccessisGopStructure():
+    """
+    Analyse only header of an InputFile, and try to access a properties computed when access the first GOP.
+    """
+    inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_MOV_FILE']
+    inputFile = av.InputFile(inputFileName)
+
+    # The analyse of the first GOP is not done yet
+    videoProperties = inputFile.getProperties().getVideoProperties()[0]
+    videoProperties.getGopStructure()
+
+
+def testInputFileAnalyseFirstGop():
+    """
+    Analyse the first gop of an InputFile, and check if the correct attributes are filled.
+    """
+    inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_MOV_FILE']
+    inputFile = av.InputFile( inputFileName )
 
     # Analyse first GOP
     progress = av.NoDisplayProgress()
