Profile: remove width and height

Clement Champetier · Clement Champetier · commit 82f7af1734f8 · 2014-07-18T13:33:58.000+02:00
OuputVideo: width and height are set from the imageDesc. These informations are not in the profile.
diff --git a/src/AvTranscoder/EssenceStream/OutputVideo.cpp b/src/AvTranscoder/EssenceStream/OutputVideo.cpp
@@ -195,12 +195,6 @@ void OutputVideo::setProfile( Profile::ProfileDesc& desc, const avtranscoder::Im
 		throw std::runtime_error( "The profile " + desc[ Profile::avProfileIdentificatorHuman ] + " is invalid." );
 	}
 	
-	if( ( desc.count( Profile::avProfileWidth ) && std::strtoul( desc[ Profile::avProfileWidth ].c_str(), NULL, 0 ) != imageDesc.getWidth() ) || 
-		( desc.count( Profile::avProfileHeight ) && std::strtoul( desc[ Profile::avProfileHeight ].c_str(), NULL, 0 ) != imageDesc.getHeight() ) )
-	{
-		throw std::runtime_error( "Invalid imageDesc with the profile " + desc[ Profile::avProfileIdentificatorHuman ] + "." );
-	}
-	
 	_videoDesc.setVideoCodec( desc[ Profile::avProfileCodec ] );
 	
 	const size_t frameRate = std::strtoul( desc[ Profile::avProfileFrameRate ].c_str(), NULL, 0 );
@@ -215,8 +209,6 @@ void OutputVideo::setProfile( Profile::ProfileDesc& desc, const avtranscoder::Im
 			(*it).first == Profile::avProfileType ||
 			(*it).first == Profile::avProfileCodec ||
 			(*it).first == Profile::avProfilePixelFormat ||
-			(*it).first == Profile::avProfileWidth ||
-			(*it).first == Profile::avProfileHeight ||
 			(*it).first == Profile::avProfileFrameRate )
 			continue;
 
@@ -239,8 +231,6 @@ void OutputVideo::setProfile( Profile::ProfileDesc& desc, const avtranscoder::Im
 			(*it).first == Profile::avProfileType ||
 			(*it).first == Profile::avProfileCodec ||
 			(*it).first == Profile::avProfilePixelFormat ||
-			(*it).first == Profile::avProfileWidth ||
-			(*it).first == Profile::avProfileHeight ||
 			(*it).first == Profile::avProfileFrameRate )
 			continue;
 
diff --git a/src/AvTranscoder/Profile.cpp b/src/AvTranscoder/Profile.cpp
@@ -25,8 +25,6 @@ const std::string Profile::avProfileSampleFormat( "sample_fmt" );
 const std::string Profile::avProfileFrameRate( "r" );
 const std::string Profile::avProfileSampleRate( "ar" );
 const std::string Profile::avProfileChannel( "ac" );
-const std::string Profile::avProfileWidth( "width" );
-const std::string Profile::avProfileHeight( "height" );
 
 Profile::Profile( bool autoload )
 {
diff --git a/src/AvTranscoder/Profile.hpp b/src/AvTranscoder/Profile.hpp
@@ -25,9 +25,6 @@ class Profile
 	static const std::string avProfileFrameRate;
 	static const std::string avProfileSampleRate;
 	static const std::string avProfileChannel;
-	
-	static const std::string avProfileWidth;
-	static const std::string avProfileHeight;
 
 public:
 	// typedef std::pair< std::string, std::string > KeyDesc;

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,6 @@ const std::string Profile::avProfileSampleFormat( "sample_fmt" );`
`25`	`25`	`const std::string Profile::avProfileFrameRate( "r" );`
`26`	`26`	`const std::string Profile::avProfileSampleRate( "ar" );`
`27`	`27`	`const std::string Profile::avProfileChannel( "ac" );`
`28`		`-const std::string Profile::avProfileWidth( "width" );`
`29`		`-const std::string Profile::avProfileHeight( "height" );`
`30`	`28`
`31`	`29`	`Profile::Profile( bool autoload )`
`32`	`30`	`{`