Merge pull request #306 from adoussot/develop

adoussot · web-flow · commit 4a61763e86af · 2018-07-02T08:15:29.000+02:00
[fix]: correctly retrieve the fileSize on 32 bits OS
diff --git a/src/AvTranscoder/common.hpp b/src/AvTranscoder/common.hpp
@@ -3,7 +3,7 @@
 
 #define AVTRANSCODER_VERSION_MAJOR 0
 #define AVTRANSCODER_VERSION_MINOR 14
-#define AVTRANSCODER_VERSION_MICRO 1
+#define AVTRANSCODER_VERSION_MICRO 2
 
 #include <AvTranscoder/system.hpp>
 
diff --git a/src/AvTranscoder/properties/FileProperties.cpp b/src/AvTranscoder/properties/FileProperties.cpp
@@ -210,7 +210,7 @@ size_t FileProperties::getBitRate() const
     return _avFormatContext->bit_rate;
 }
 
-size_t FileProperties::getFileSize() const
+uint64_t FileProperties::getFileSize() const
 {
     std::ifstream in(getFilename().c_str(), std::ios::binary | std::ios::ate);
     return in.tellg();
diff --git a/src/AvTranscoder/properties/FileProperties.hpp b/src/AvTranscoder/properties/FileProperties.hpp
@@ -49,7 +49,10 @@ class AvExport FileProperties
     double getStartTime() const;
     float getDuration() const;  ///< in seconds, 0 if not available
     size_t getBitRate() const;  ///< total stream bitrate in bit/s, 0 if not available (result of a computation by ffmpeg)
-    size_t getFileSize() const; ///< in bytes
+    /**
+     * @note Use uint64_t instead of size_t to ensure 64 bits size on 32-bits OS so we can manage Files > 4Go
+     */
+    uint64_t getFileSize() const; ///< in bytes
     size_t getPacketSize() const;
 
     const PropertyVector& getMetadatas() const { return _metadatas; }

Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ size_t FileProperties::getBitRate() const`
`210`	`210`	`return _avFormatContext->bit_rate;`
`211`	`211`	`}`
`212`	`212`
`213`		`-size_t FileProperties::getFileSize() const`
	`213`	`+uint64_t FileProperties::getFileSize() const`
`214`	`214`	`{`
`215`	`215`	`std::ifstream in(getFilename().c_str(), std::ios::binary \| std::ios::ate);`
`216`	`216`	`return in.tellg();`