Merge pull request #48 from cchampet/dev_videoProfiles_width_height

valnoel · valnoel · commit a0ba6314691e · 2015-01-16T12:23:36.000+01:00
Video profiles can force width / height of output
diff --git a/src/AvTranscoder/ProfileLoader.hpp b/src/AvTranscoder/ProfileLoader.hpp
@@ -24,6 +24,8 @@ namespace constants
 	const std::string avProfilePixelFormat = "pix_fmt";
 	const std::string avProfileSampleFormat = "sample_fmt";
 	const std::string avProfileFrameRate = "r";
+	const std::string avProfileWidth = "width";
+	const std::string avProfileHeight = "height";
 	const std::string avProfileSampleRate = "ar";
 	const std::string avProfileChannel = "ac";
 }
diff --git a/src/AvTranscoder/encoder/VideoEncoder.cpp b/src/AvTranscoder/encoder/VideoEncoder.cpp
@@ -140,8 +140,10 @@ void VideoEncoder::setProfile( const ProfileLoader::Profile& profile, const avtr
 			(*it).first == constants::avProfileIdentificatorHuman ||
 			(*it).first == constants::avProfileType ||
 			(*it).first == constants::avProfileCodec ||
-			(*it).first == constants::avProfileFrameRate ||
-			(*it).first == constants::avProfilePixelFormat )
+			(*it).first == constants::avProfileWidth ||
+			(*it).first == constants::avProfileHeight ||
+			(*it).first == constants::avProfilePixelFormat ||
+			(*it).first == constants::avProfileFrameRate )
 			continue;
 
 		try
@@ -161,8 +163,10 @@ void VideoEncoder::setProfile( const ProfileLoader::Profile& profile, const avtr
 			(*it).first == constants::avProfileIdentificatorHuman ||
 			(*it).first == constants::avProfileType ||
 			(*it).first == constants::avProfileCodec ||
-			(*it).first == constants::avProfileFrameRate ||
-			(*it).first == constants::avProfilePixelFormat )
+			(*it).first == constants::avProfileWidth ||
+			(*it).first == constants::avProfileHeight ||
+			(*it).first == constants::avProfilePixelFormat ||
+			(*it).first == constants::avProfileFrameRate )
 			continue;
 
 		try
diff --git a/src/AvTranscoder/frame/VideoFrame.hpp b/src/AvTranscoder/frame/VideoFrame.hpp
@@ -63,6 +63,12 @@ class AvExport VideoFrameDesc
 
 	void setParameters( const ProfileLoader::Profile& profile )
 	{
+		// width
+		if( profile.count( constants::avProfileWidth ) )
+			setWidth( atoi( profile.find( constants::avProfileWidth )->second.c_str() ) );
+		// height
+		if( profile.count( constants::avProfileHeight ) )
+			setHeight( atoi( profile.find( constants::avProfileHeight )->second.c_str() ) );
 		// pixel format	
 		if( profile.count( constants::avProfilePixelFormat ) )
 			setPixelFormat( profile.find( constants::avProfilePixelFormat )->second );

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@ namespace constants`
`24`	`24`	`const std::string avProfilePixelFormat = "pix_fmt";`
`25`	`25`	`const std::string avProfileSampleFormat = "sample_fmt";`
`26`	`26`	`const std::string avProfileFrameRate = "r";`
	`27`	`+ const std::string avProfileWidth = "width";`
	`28`	`+ const std::string avProfileHeight = "height";`
`27`	`29`	`const std::string avProfileSampleRate = "ar";`
`28`	`30`	`const std::string avProfileChannel = "ac";`
`29`	`31`	`}`