Commit4a61763

authored

Merge pull request#306 from adoussot/develop

[fix]: correctly retrieve the fileSize on 32 bits OS

2 parents1c318c2 +086d074 commit4a61763Copy full SHA for 4a61763

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`#defineAVTRANSCODER_VERSION_MAJOR0`
`5`	`5`	`#defineAVTRANSCODER_VERSION_MINOR14`
`6`		`-#defineAVTRANSCODER_VERSION_MICRO1`
	`6`	`+#defineAVTRANSCODER_VERSION_MICRO2`
`7`	`7`
`8`	`8`	`#include<AvTranscoder/system.hpp>`
`9`	`9`

Lines changed: 1 addition & 1 deletion

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_tFileProperties::getFileSize()const`
	`213`	`+uint64_tFileProperties::getFileSize()const`
`214`	`214`	`{`
`215`	`215`	`std::ifstreamin(getFilename().c_str(), std::ios::binary \| std::ios::ate);`
`216`	`216`	`return in.tellg();`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,10 @@ class AvExport FileProperties`
`49`	`49`	`doublegetStartTime()const;`
`50`	`50`	`floatgetDuration()const;///< in seconds, 0 if not available`
`51`	`51`	`size_tgetBitRate()const;///< total stream bitrate in bit/s, 0 if not available (result of a computation by ffmpeg)`
`52`		`-size_tgetFileSize()const;///< in bytes`
	`52`	`+/**`
	`53`	`+ * @note Use uint64_t instead of size_t to ensure 64 bits size on 32-bits OS so we can manage Files > 4Go`
	`54`	`+*/`
	`55`	`+uint64_tgetFileSize()const;///< in bytes`
`53`	`56`	`size_tgetPacketSize()const;`
`54`	`57`
`55`	`58`	`const PropertyVector&getMetadatas()const {return _metadatas; }`

Comments

(0)