Merge pull request #33 from cchampet/fix_timecode

valnoel · valnoel · commit da3b29001b33 · 2015-01-12T13:24:43.000+01:00
Fix timecode
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.cpp b/src/AvTranscoder/mediaProperty/VideoProperties.cpp
@@ -319,14 +319,19 @@ int64_t VideoProperties::getStartTimecode() const
 
 std::string VideoProperties::getStartTimecodeString() const
 {
-	int64_t stratTimeCode = getStartTimecode();
+	int64_t startTimeCode = getStartTimecode();
 	std::ostringstream os;
-	os << std::setfill( '0' );
-	os << std::setw(2) << ( stratTimeCode >> 19 & 0x1f ) << ":";   // 5-bit hours
-	os << std::setw(2) << ( stratTimeCode >> 13 & 0x3f ) << ":";   // 6-bit minutes
-	os << std::setw(2) << ( stratTimeCode >>  6 & 0x3f ) ;         // 6-bit seconds
-	os << ( stratTimeCode & 1 << 24 ? ';' : ':' ); // 1-bit drop flag
-	os << std::setw(2) << ( stratTimeCode       & 0x3f );   // 6-bit frames
+	if( startTimeCode == -1 )
+		os << "unset";
+	else
+	{
+		os << std::setfill( '0' );
+		os << std::setw(2) << ( startTimeCode >> 19 & 0x1f ) << ":";   // 5-bit hours
+		os << std::setw(2) << ( startTimeCode >> 13 & 0x3f ) << ":";   // 6-bit minutes
+		os << std::setw(2) << ( startTimeCode >>  6 & 0x3f ) ;         // 6-bit seconds
+		os << ( startTimeCode & 1 << 24 ? ';' : ':' ); // 1-bit drop flag
+		os << std::setw(2) << ( startTimeCode       & 0x3f );   // 6-bit frames
+	}
 	return os.str();
 }
 
@@ -573,7 +578,7 @@ PropertiesMap VideoProperties::getPropertiesAsMap() const
 	detail::add( dataMap, "profile", getProfile() );
 	detail::add( dataMap, "profileName", getProfileName() );
 	detail::add( dataMap, "level", getLevel() );
-	detail::add( dataMap, "startTimecode", getStartTimecode() );
+	detail::add( dataMap, "startTimecode", getStartTimecodeString() );
 	detail::add( dataMap, "width", getWidth() );
 	detail::add( dataMap, "height", getHeight() );
 	detail::add( dataMap, "pixelAspectRatio", getSar().num / getSar().den );
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.hpp b/src/AvTranscoder/mediaProperty/VideoProperties.hpp
@@ -81,7 +81,7 @@ class AvExport VideoProperties
 	const PixelProperties& getPixelProperties() const { return _pixelProperties; }
 #endif
 
-	PropertiesMap getPropertiesAsMap() const;  ///< Return all video properties as a map (name of property: value)
+	PropertiesMap getPropertiesAsMap() const;  ///< Return all video and pixel properties as a map (name of property: value)
 
 private:
 	/**
