using variables, not strings

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit a7aa7a5ff0cf · 2014-06-23T16:30:51.000-04:00
diff --git a/src/AvTranscoder/OutputStreamVideo.cpp b/src/AvTranscoder/OutputStreamVideo.cpp
@@ -181,19 +181,20 @@ bool OutputStreamVideo::encodeFrame( DataStream& codedFrame )
 void OutputStreamVideo::setProfile( const std::string& profile )
 {
 	Profile p;
+
 	p.loadProfiles();
 
 	Profile::ProfileDesc prof = p.getProfile( profile );
 
-	_videoDesc.setVideoCodec( prof["codec"] );
+	_videoDesc.setVideoCodec( prof[ "codec" ] );
 	_videoDesc.setTimeBase( 1, 25 ); // 25 fps
-	_videoDesc.setImageParameters( 1920, 1080, av_get_pix_fmt( prof["pix_fmt"].c_str() ) );
+	_videoDesc.setImageParameters( 1920, 1080, av_get_pix_fmt( prof[ "pix_fmt" ].c_str() ) );
 
 	for( Profile::ProfileDesc::iterator it = prof.begin(); it != prof.end(); ++it )
 	{
-		if( (*it).first == "avProfile" )
+		if( (*it).first == Profile::avProfileIdentificator )
 			continue;
-		if( (*it).first == "avProfileLong" )
+		if( (*it).first == Profile::avProfileIdentificatorHuman )
 			continue;
 		if( (*it).first == Profile::avProfileType )
 			continue;
@@ -220,9 +221,9 @@ void OutputStreamVideo::setProfile( const std::string& profile )
 
 	for( Profile::ProfileDesc::iterator it = prof.begin(); it != prof.end(); ++it )
 	{
-		if( (*it).first == "avProfile" )
+		if( (*it).first == Profile::avProfileIdentificator )
 			continue;
-		if( (*it).first == "avProfileLong" )
+		if( (*it).first == Profile::avProfileIdentificatorHuman )
 			continue;
 		if( (*it).first == Profile::avProfileType )
 			continue;
@@ -244,7 +245,6 @@ void OutputStreamVideo::setProfile( const std::string& profile )
 			std::cout << "2.warning: " << e.what() << std::endl;
 		}
 	}
-
 }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -181,19 +181,20 @@ bool OutputStreamVideo::encodeFrame( DataStream& codedFrame )`
`181`	`181`	`void OutputStreamVideo::setProfile( const std::string& profile )`
`182`	`182`	`{`
`183`	`183`	`Profile p;`
	`184`	`+`
`184`	`185`	`p.loadProfiles();`
`185`	`186`
`186`	`187`	`Profile::ProfileDesc prof = p.getProfile( profile );`
`187`	`188`
`188`		`- _videoDesc.setVideoCodec( prof["codec"] );`
	`189`	`+ _videoDesc.setVideoCodec( prof[ "codec" ] );`
`189`	`190`	`_videoDesc.setTimeBase( 1, 25 ); // 25 fps`
`190`		`- _videoDesc.setImageParameters( 1920, 1080, av_get_pix_fmt( prof["pix_fmt"].c_str() ) );`
	`191`	`+ _videoDesc.setImageParameters( 1920, 1080, av_get_pix_fmt( prof[ "pix_fmt" ].c_str() ) );`
`191`	`192`
`192`	`193`	`for( Profile::ProfileDesc::iterator it = prof.begin(); it != prof.end(); ++it )`
`193`	`194`	`{`
`194`		`- if( (*it).first == "avProfile" )`
	`195`	`+ if( (*it).first == Profile::avProfileIdentificator )`
`195`	`196`	`continue;`
`196`		`- if( (*it).first == "avProfileLong" )`
	`197`	`+ if( (*it).first == Profile::avProfileIdentificatorHuman )`
`197`	`198`	`continue;`
`198`	`199`	`if( (*it).first == Profile::avProfileType )`
`199`	`200`	`continue;`
`@@ -220,9 +221,9 @@ void OutputStreamVideo::setProfile( const std::string& profile )`
`220`	`221`
`221`	`222`	`for( Profile::ProfileDesc::iterator it = prof.begin(); it != prof.end(); ++it )`
`222`	`223`	`{`
`223`		`- if( (*it).first == "avProfile" )`
	`224`	`+ if( (*it).first == Profile::avProfileIdentificator )`
`224`	`225`	`continue;`
`225`		`- if( (*it).first == "avProfileLong" )`
	`226`	`+ if( (*it).first == Profile::avProfileIdentificatorHuman )`
`226`	`227`	`continue;`
`227`	`228`	`if( (*it).first == Profile::avProfileType )`
`228`	`229`	`continue;`
`@@ -244,7 +245,6 @@ void OutputStreamVideo::setProfile( const std::string& profile )`
`244`	`245`	`std::cout << "2.warning: " << e.what() << std::endl;`
`245`	`246`	`}`
`246`	`247`	`}`
`247`		`-`
`248`	`248`	`}`
`249`	`249`
`250`	`250`	`}`