Video profiles can force width / height of output

Clement Champetier · Clement Champetier · commit 4331dc3f6a81 · 2015-01-14T10:20:48.000+01:00
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
@@ -147,7 +147,9 @@ 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::avProfileFrameRate ||
+			(*it).first == constants::avProfileWidth ||
+			(*it).first == constants::avProfileHeight )
 			continue;
 
 		try
@@ -167,7 +169,9 @@ 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::avProfileFrameRate ||
+			(*it).first == constants::avProfileWidth ||
+			(*it).first == constants::avProfileHeight )
 			continue;
 
 		try
diff --git a/src/AvTranscoder/frame/VideoFrame.hpp b/src/AvTranscoder/frame/VideoFrame.hpp
@@ -11,6 +11,7 @@ extern "C" {
 }
 
 #include <stdexcept>
+#include <stdlib.h>
 
 namespace avtranscoder
 {
@@ -72,6 +73,13 @@ 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.find( constants::avProfilePixelFormat ) != profile.end() )
 			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`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ extern "C" {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`#include <stdexcept>`
	`14`	`+#include <stdlib.h>`
`14`	`15`
`15`	`16`	`namespace avtranscoder`
`16`	`17`	`{`
`@@ -72,6 +73,13 @@ class AvExport VideoFrameDesc`
`72`	`73`
`73`	`74`	`void setParameters( const ProfileLoader::Profile& profile )`
`74`	`75`	`{`
	`76`	`+ // width`
	`77`	`+ if( profile.count( constants::avProfileWidth ) )`
	`78`	`+ setWidth( atoi( profile.find( constants::avProfileWidth )->second.c_str() ) );`
	`79`	`+ // height`
	`80`	`+ if( profile.count( constants::avProfileHeight ) )`
	`81`	`+ setHeight( atoi( profile.find( constants::avProfileHeight )->second.c_str() ) );`
	`82`	`+ // pixel format`
`75`	`83`	`if( profile.find( constants::avProfilePixelFormat ) != profile.end() )`
`76`	`84`	`setPixelFormat( profile.find( constants::avProfilePixelFormat )->second );`
`77`	`85`	`}`