stat: split ProcessStat by adding VideoStat files

Clement Champetier · Clement Champetier · commit c496d6396e1e · 2015-06-08T16:12:08.000+02:00
diff --git a/src/AvTranscoder/stat/ProcessStat.cpp b/src/AvTranscoder/stat/ProcessStat.cpp
@@ -1,16 +1,10 @@
 #include "ProcessStat.hpp"
 
 #include <utility>
-#include <math.h>
 
 namespace avtranscoder
 {
 
-double VideoStat::psnr( const double d )
-{
-	return -10.0 * log(d) / log(10.0);
-}
-
 void ProcessStat::addVideoStat( const size_t streamIndex, const VideoStat& videoStat )
 {
 	_videoStats.insert( std::make_pair( streamIndex, videoStat ) );
diff --git a/src/AvTranscoder/stat/ProcessStat.hpp b/src/AvTranscoder/stat/ProcessStat.hpp
@@ -1,38 +1,16 @@
 #ifndef  _AV_TRANSCODER_PROCESSSTAT_HPP
-#define	 _AV_TRANSCODER_PROCESSSTAT_HPP
+#define  _AV_TRANSCODER_PROCESSSTAT_HPP
 
 #include <AvTranscoder/common.hpp>
+#include <AvTranscoder/stat/VideoStat.hpp>
 
 #include <map>
 
 namespace avtranscoder
 {
 
 /**
- * @brief Statistic related to a video stream.
- */
-class VideoStat
-{
-public:
-	VideoStat( const double duration, const size_t nbFrames )
-	: _duration( duration )
-	, _nbFrames( nbFrames )
-	, _quality( 0 )
-	, _psnr( 0 )
-	{}
-
-public:
-	static double psnr( const double d );
-
-public:
-	double _duration;
-	size_t _nbFrames;
-	size_t _quality;  ///< Between 1 (good) and FF_LAMBDA_MAX (bad). 0 if unknown.
-	double _psnr;  ///< 0 if unknown.
-};
-
-/**
- * @brief ProcessStat contains statistic results given after the process.
+ * @brief ProcessStat contains statistics given after the process.
  * @see Transcoder::process methods
  */
 class ProcessStat
diff --git a/src/AvTranscoder/stat/VideoStat.cpp b/src/AvTranscoder/stat/VideoStat.cpp
@@ -0,0 +1,13 @@
+#include "ProcessStat.hpp"
+
+#include <math.h>
+
+namespace avtranscoder
+{
+
+double VideoStat::psnr( const double d )
+{
+	return -10.0 * log(d) / log(10.0);
+}
+
+}
diff --git a/src/AvTranscoder/stat/VideoStat.hpp b/src/AvTranscoder/stat/VideoStat.hpp
@@ -0,0 +1,34 @@
+#ifndef  _AV_TRANSCODER_VIDEOSTAT_HPP
+#define  _AV_TRANSCODER_VIDEOSTAT_HPP
+
+#include <AvTranscoder/common.hpp>
+
+namespace avtranscoder
+{
+
+/**
+ * @brief Statistics related to a video stream.
+ */
+class VideoStat
+{
+public:
+	VideoStat( const double duration, const size_t nbFrames )
+	: _duration( duration )
+	, _nbFrames( nbFrames )
+	, _quality( 0 )
+	, _psnr( 0 )
+	{}
+
+public:
+	static double psnr( const double d );
+
+public:
+	double _duration;
+	size_t _nbFrames;
+	size_t _quality;  ///< Between 1 (good) and FF_LAMBDA_MAX (bad). 0 if unknown.
+	double _psnr;  ///< 0 if unknown.
+};
+
+}
+
+#endif
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -2,6 +2,7 @@
 
 #include <AvTranscoder/file/util.hpp>
 #include <AvTranscoder/progress/NoDisplayProgress.hpp>
+#include <AvTranscoder/stat/VideoStat.hpp>
 
 #include <limits>
 #include <algorithm>

Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,10 @@`
`1`	`1`	`#include "ProcessStat.hpp"`
`2`	`2`
`3`	`3`	`#include <utility>`
`4`		`-#include <math.h>`
`5`	`4`
`6`	`5`	`namespace avtranscoder`
`7`	`6`	`{`
`8`	`7`
`9`		`-double VideoStat::psnr( const double d )`
`10`		`-{`
`11`		`- return -10.0 * log(d) / log(10.0);`
`12`		`-}`
`13`		`-`
`14`	`8`	`void ProcessStat::addVideoStat( const size_t streamIndex, const VideoStat& videoStat )`
`15`	`9`	`{`
`16`	`10`	`_videoStats.insert( std::make_pair( streamIndex, videoStat ) );`