avTranscoder · cchampet · Jan 5, 2016 · Dec 22, 2015 · Dec 22, 2015 · Dec 22, 2015
diff --git a/INSTALL.md b/INSTALL.md
@@ -4,7 +4,7 @@ AvTranscoder uses CMake as build system.
 
 #### Dependencies
 AvTranscoder can depend on ffmpeg, libav, or any fork of these projects that follow the same API.
-* Recommended ffmpeg versions: 2.2.11, 2.4.2, 2.5.7
+* Recommended ffmpeg versions: 2.4.2, 2.4.5, 2.5.7
 * Recommended libav versions: 11.3
 
 #### To build

diff --git a/appveyor.yml b/appveyor.yml
@@ -5,6 +5,9 @@ platform:
   - x86
 #  - x64
 
+environment:
+  FFMPEG_VERSION: 2.4.5
+
 matrix:
   fast_finish: true
 

diff --git a/src/AvTranscoder/file/InputFile.cpp b/src/AvTranscoder/file/InputFile.cpp
@@ -22,12 +22,16 @@ namespace avtranscoder
 
 InputFile::InputFile(const std::string& filename)
     : _formatContext(filename, AV_OPT_FLAG_DECODING_PARAM)
-    , _properties(_formatContext)
+    , _properties(NULL)
     , _filename(filename)
     , _inputStreams()
 {
+    // Fill the FormatContext with the stream information
     _formatContext.findStreamInfo();
 
+    // Get the stream information as properties
+    _properties = new FileProperties(_formatContext);
+
     // Create streams
     for(size_t streamIndex = 0; streamIndex < _formatContext.getNbStreams(); ++streamIndex)
     {
@@ -37,6 +41,7 @@ InputFile::InputFile(const std::string& filename)
 
 InputFile::~InputFile()
 {
+    delete _properties;
     for(std::vector<InputStream*>::iterator it = _inputStreams.begin(); it != _inputStreams.end(); ++it)
     {
         delete(*it);
@@ -45,7 +50,7 @@ InputFile::~InputFile()
 
 void InputFile::analyse(IProgress& progress, const EAnalyseLevel level)
 {
-    _properties.extractStreamProperties(progress, level);
+    _properties->extractStreamProperties(progress, level);
 }
 
 FileProperties InputFile::analyseFile(const std::string& filename, IProgress& progress, const EAnalyseLevel level)
@@ -160,8 +165,8 @@ std::string InputFile::getFormatMimeType() const
 double InputFile::getFps()
 {
     double fps = 1;
-    if(_properties.getNbVideoStreams())
-        fps = _properties.getVideoProperties().at(0).getFps();
+    if(_properties->getNbVideoStreams())
+        fps = _properties->getVideoProperties().at(0).getFps();
     return fps;
 }
 

diff --git a/src/AvTranscoder/file/InputFile.hpp b/src/AvTranscoder/file/InputFile.hpp
@@ -68,7 +68,7 @@ class AvExport InputFile
      * @note require to launch analyse() before to fill the property struture
      * @return structure of media metadatas
      **/
-    const FileProperties& getProperties() const { return _properties; }
+    const FileProperties& getProperties() const { return *_properties; }
 
     /**
      * @brief Get stream type: video, audio, subtitle, etc.
@@ -121,7 +121,7 @@ class AvExport InputFile
 
 protected:
     FormatContext _formatContext;
-    FileProperties _properties;
+    FileProperties* _properties;
     std::string _filename;
     std::vector<InputStream*> _inputStreams; ///< Has ownership
 };

diff --git a/src/AvTranscoder/stat/AudioStat.hpp b/src/AvTranscoder/stat/AudioStat.hpp
@@ -19,6 +19,10 @@ class AvExport AudioStat
     }
 
 public:
+    float getDuration() const { return _duration; }
+    size_t getNbPackets() const { return _nbPackets; }
+
+private:
     float _duration;
     size_t _nbPackets;
 };

diff --git a/src/AvTranscoder/stat/VideoStat.cpp b/src/AvTranscoder/stat/VideoStat.cpp
@@ -5,8 +5,8 @@
 namespace avtranscoder
 {
 
-double VideoStat::psnr(const double d)
+double VideoStat::toPSNR(const double mse)
 {
-    return -10.0 * log10(d);
+    return -10.0 * log10(mse);
 }
 }
diff --git a/src/AvTranscoder/stat/VideoStat.hpp b/src/AvTranscoder/stat/VideoStat.hpp
@@ -21,9 +21,18 @@ class AvExport VideoStat
     }
 
 public:
-    static double psnr(const double d);
+    float getDuration() const { return _duration; }
+    size_t getNbFrames() const { return _nbFrames; }
+    size_t getQuality() const { return _quality; }
+    double getPSNR() const { return _psnr; }
 
-public:
+    void setQuality(const size_t quality) { _quality = quality; }
+    void setPSNR(const double mse) { _psnr = VideoStat::toPSNR(mse); }
+
+private:
+    static double toPSNR(const double mse);
+
+private:
     float _duration;
     size_t _nbFrames;
     size_t _quality; ///< Between 1 (good) and FF_LAMBDA_MAX (bad). 0 if unknown.

diff --git a/src/AvTranscoder/stat/stat.i b/src/AvTranscoder/stat/stat.i
@@ -1,9 +1,9 @@
 %{
-#include <AvTranscoder/stat/ProcessStat.hpp>
 #include <AvTranscoder/stat/VideoStat.hpp>
 #include <AvTranscoder/stat/AudioStat.hpp>
+#include <AvTranscoder/stat/ProcessStat.hpp>
 %}
 
-%include <AvTranscoder/stat/ProcessStat.hpp>
 %include <AvTranscoder/stat/VideoStat.hpp>
 %include <AvTranscoder/stat/AudioStat.hpp>
+%include <AvTranscoder/stat/ProcessStat.hpp>
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -580,9 +580,9 @@ void Transcoder::fillProcessStat(ProcessStat& processStat)
                     const AVCodecContext& encoderContext = encoder->getCodec().getAVCodecContext();
                     if(encoderContext.coded_frame && (encoderContext.flags & CODEC_FLAG_PSNR))
                     {
-                        videoStat._quality = encoderContext.coded_frame->quality;
-                        videoStat._psnr = VideoStat::psnr(encoderContext.coded_frame->error[0] /
-                                                          (encoderContext.width * encoderContext.height * 255.0 * 255.0));
+                        videoStat.setQuality(encoderContext.coded_frame->quality);
+                        videoStat.setPSNR(encoderContext.coded_frame->error[0] /
+                                          (encoderContext.width * encoderContext.height * 255.0 * 255.0));
                     }
                 }
                 processStat.addVideoStat(streamIndex, videoStat);

diff --git a/test/pyTest/testInputFile.py b/test/pyTest/testInputFile.py
@@ -0,0 +1,42 @@
+import os
+
+# Check if environment is setup to run the tests
+if os.environ.get('AVTRANSCODER_TEST_VIDEO_MOV_FILE') is None:
+    from nose.plugins.skip import SkipTest
+    raise SkipTest("Need to define environment variables "
+        "AVTRANSCODER_TEST_VIDEO_MOV_FILE")
+
+from nose.tools import *
+
+from pyAvTranscoder import avtranscoder as av
+
+
+@raises(IOError)
+def testCreateInputFileFromUnexistingFilename():
+    """
+    Create an InputFile from an unexisting filename.
+    """
+    inputFileName = "testCreateInputFileFromUnexistingFilename"
+    av.InputFile( inputFileName )
+
+
+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 )
+
+    # 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.getGopStructure(), ())
+
+    # Analyse first GOP
+    progress = av.NoDisplayProgress()
+    inputFile.analyse( progress, av.eAnalyseLevelFirstGop )
+
+    # Check properties after GOP analysis
+    videoProperties = inputFile.getProperties().getVideoProperties()[0]
+    assert_not_equals(videoProperties.getGopStructure(), ())
diff --git a/test/pyTest/testProcessStat.py b/test/pyTest/testProcessStat.py
@@ -0,0 +1,46 @@
+import os
+
+# Check if environment is setup to run the tests
+if os.environ.get('AVTRANSCODER_TEST_VIDEO_AVI_FILE') is None:
+    from nose.plugins.skip import SkipTest
+    raise SkipTest("Need to define environment variables "
+        "AVTRANSCODER_TEST_VIDEO_AVI_FILE")
+
+from nose.tools import *
+
+from pyAvTranscoder import avtranscoder as av
+
+
+def testProcessWithStatistics():
+    """
+    Process one video stream with a custom profile of encoding to activate statistics.
+    """
+    inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_AVI_FILE']
+    outputFileName = "testProcessWithStatistics.mov"
+
+    ouputFile = av.OutputFile( outputFileName )
+    transcoder = av.Transcoder( ouputFile )
+
+    # create custom profile
+    customProfile = av.ProfileMap()
+    customProfile[av.avProfileIdentificator] = "customProfile"
+    customProfile[av.avProfileIdentificatorHuman] = "custom profile"
+    customProfile[av.avProfileType] = av.avProfileTypeVideo
+    customProfile[av.avProfileCodec] = "mpeg2video"
+    customProfile[av.avProfileProcessStat] = "processStat"
+
+    src_inputFile = av.InputFile( inputFileName )
+    src_properties = src_inputFile.getProperties()
+    src_videoStream = src_properties.getVideoProperties()[0]
+    videoStreamIndex = src_videoStream.getStreamIndex()
+    transcoder.add( inputFileName, videoStreamIndex, customProfile )
+
+    progress = av.ConsoleProgress()
+    processStat = transcoder.process( progress )
+
+    # check process stat returned
+    videoStat = processStat.getVideoStat(0)
+    assert_equals(videoStat.getDuration(), src_videoStream.getDuration())
+    assert_equals(videoStat.getNbFrames(), int(src_videoStream.getDuration() * src_videoStream.getFps()))
+    assert_not_equals(videoStat.getQuality(), 0)
+    assert_not_equals(videoStat.getPSNR(), 0)
diff --git a/test/pyTest/testTranscoderRewrap.py b/test/pyTest/testTranscoderRewrap.py
@@ -45,6 +45,16 @@ def checkStream(src_stream, dst_stream):
             continue
         assert_equals( src_propertiesMap[key], dst_propertiesMap[key] )
 
+def checkVideoStat(src_videoStream, dst_videoStat):
+    """
+    Check the values of the video process stats returned after a process.
+    @note Because the process does not include a profile with "processStat", output quality and PSNR are not set.
+    """
+    assert_equals(dst_videoStat.getDuration(), src_videoStream.getDuration())
+    assert_equals(dst_videoStat.getNbFrames(), int(src_videoStream.getDuration() * src_videoStream.getFps()))
+    assert_equals(dst_videoStat.getQuality(), 0)
+    assert_equals(dst_videoStat.getPSNR(), 0)
+
 
 def testRewrapAudioStream():
     """
@@ -53,8 +63,6 @@ def testRewrapAudioStream():
     # get src file of wrap
     inputFileName = os.environ['AVTRANSCODER_TEST_AUDIO_WAVE_FILE']
     src_inputFile = av.InputFile( inputFileName )
-    progress = av.NoDisplayProgress()
-    src_inputFile.analyse( progress )
     src_properties = src_inputFile.getProperties()
     src_audioStream = src_properties.getAudioProperties()[0]
 
@@ -64,11 +72,15 @@ def testRewrapAudioStream():
 
     transcoder = av.Transcoder( ouputFile )
     transcoder.add( inputFileName, 0 )
-    transcoder.process( progress )
+    progress = av.NoDisplayProgress()
+    processStat = transcoder.process( progress )
+
+    # check process stat returned
+    audioStat = processStat.getAudioStat(0)
+    assert_equals(src_audioStream.getDuration(), audioStat.getDuration())
 
     # get dst file of wrap
     dst_inputFile = av.InputFile( outputFileName )
-    dst_inputFile.analyse( progress, av.eAnalyseLevelHeader )
     dst_properties = dst_inputFile.getProperties()
     dst_audioStream = dst_properties.getAudioProperties()[0]
 
@@ -86,8 +98,6 @@ def testRewrapAVIVideoStream():
     # get src file of wrap
     inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_AVI_FILE']
     src_inputFile = av.InputFile( inputFileName )
-    progress = av.NoDisplayProgress()
-    src_inputFile.analyse( progress )
     src_properties = src_inputFile.getProperties()
     src_videoStream = src_properties.getVideoProperties()[0]
 
@@ -97,11 +107,14 @@ def testRewrapAVIVideoStream():
 
     transcoder = av.Transcoder( ouputFile )
     transcoder.add( inputFileName, 0 )
-    transcoder.process( progress )
+    progress = av.NoDisplayProgress()
+    processStat = transcoder.process( progress )
+
+    # check process stat returned
+    checkVideoStat(src_videoStream, processStat.getVideoStat(0))
 
     # get dst file of wrap
     dst_inputFile = av.InputFile( outputFileName )
-    dst_inputFile.analyse( progress )
     dst_properties = dst_inputFile.getProperties()
     dst_videoStream = dst_properties.getVideoProperties()[0]
 
@@ -119,8 +132,6 @@ def testRewrapMOVVideoStream():
     # get src file of wrap
     inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_MOV_FILE']
     src_inputFile = av.InputFile( inputFileName )
-    progress = av.NoDisplayProgress()
-    src_inputFile.analyse( progress )
     src_properties = src_inputFile.getProperties()
     src_videoStream = src_properties.getVideoProperties()[0]
 
@@ -130,11 +141,14 @@ def testRewrapMOVVideoStream():
 
     transcoder = av.Transcoder( ouputFile )
     transcoder.add( inputFileName, 1 )
-    transcoder.process( progress )
+    progress = av.NoDisplayProgress()
+    processStat = transcoder.process( progress )
+
+    # check process stat returned
+    checkVideoStat(src_videoStream, processStat.getVideoStat(0))
 
     # get dst file of wrap
     dst_inputFile = av.InputFile( outputFileName )
-    dst_inputFile.analyse( progress )
     dst_properties = dst_inputFile.getProperties()
     dst_videoStream = dst_properties.getVideoProperties()[0]
 

diff --git a/test/pyTest/testTranscoderTranscodeAudioMov.py b/test/pyTest/testTranscoderTranscodeAudioMov.py
@@ -30,11 +30,16 @@ def testTranscodeMovVariableNbSamplesPerFrame():
     customProfile[av.avProfileCodec] = "pcm_s24le"
 
     inputFile = av.InputFile( inputFileName )
-    audioStreamIndex = inputFile.getProperties().getAudioProperties()[0].getStreamIndex()
+    src_audioStream = inputFile.getProperties().getAudioProperties()[0]
+    audioStreamIndex = src_audioStream.getStreamIndex()
     transcoder.add( inputFileName, audioStreamIndex, customProfile )
 
     progress = av.ConsoleProgress()
-    transcoder.process( progress )
+    processStat = transcoder.process( progress )
+
+    # check process stat returned
+    audioStat = processStat.getAudioStat(0)
+    assert_equals(src_audioStream.getDuration(), audioStat.getDuration())
 
     # get dst file of transcode
     dst_inputFile = av.InputFile( outputFileName )
@@ -44,4 +49,3 @@ def testTranscodeMovVariableNbSamplesPerFrame():
 
     assert_equals( "pcm_s24le", dst_audioStream.getCodecName() )
     assert_equals( "PCM signed 24-bit little-endian", dst_audioStream.getCodecLongName() )
-
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,9 @@ platform: @@
       - x86
     #  - x64
+    environment:
+      FFMPEG_VERSION: 2.4.5
     matrix:
       fast_finish: true
@@ Expand Down @@