Profiles: update existing profiles

Clement Champetier · Clement Champetier · commit 11b61130316e · 2014-07-03T13:56:04.000+02:00
* Use const name in Profile class.
* Add avProfileFrameRate for video profile.
diff --git a/src/AvTranscoder/Profiles/DNxHD.hpp b/src/AvTranscoder/Profiles/DNxHD.hpp
@@ -10,28 +10,31 @@ void loadDNxHD( Profile::ProfilesDesc& profiles )
 	dnxhd120[ Profile::avProfileIdentificator ] = "dnxhd120";
 	dnxhd120[ Profile::avProfileIdentificatorHuman ] = "DNxHD 120";
 	dnxhd120[ Profile::avProfileType ] = Profile::avProfileTypeVideo;
-	dnxhd120[ "codec" ] = "dnxhd";
+	dnxhd120[ Profile::avProfileCodec ] = "dnxhd";
 	dnxhd120[ "b" ] = "120000000";
-	dnxhd120[ "pix_fmt" ] = "yuv422p";
+	dnxhd120[ Profile::avProfilePixelFormat ] = "yuv422p";
 	dnxhd120[ "g" ] = "1";
+	dnxhd120[ Profile::avProfileFrameRate ] = "25";
 
 	Profile::ProfileDesc dnxhd185;
 	dnxhd185[ Profile::avProfileIdentificator ] = "dnxhd185";
 	dnxhd185[ Profile::avProfileIdentificatorHuman ] = "DNxHD 185";
 	dnxhd185[ Profile::avProfileType ] = Profile::avProfileTypeVideo;
-	dnxhd185[ "codec" ] = "dnxhd";
+	dnxhd185[ Profile::avProfileCodec ] = "dnxhd";
 	dnxhd185[ "b" ] = "185000000";
-	dnxhd185[ "pix_fmt" ] = "yuv422p";
+	dnxhd185[ Profile::avProfilePixelFormat ] = "yuv422p";
 	dnxhd185[ "g" ] = "1";
+	dnxhd185[ Profile::avProfileFrameRate ] = "25";
 
 	Profile::ProfileDesc dnxhd185x;
 	dnxhd185x[ Profile::avProfileIdentificator ] = "dnxhd185x";
 	dnxhd185x[ Profile::avProfileIdentificatorHuman ] = "DNxHD 185 X";
 	dnxhd185x[ Profile::avProfileType ] = Profile::avProfileTypeVideo;
-	dnxhd185x[ "codec" ] = "dnxhd";
+	dnxhd185x[ Profile::avProfileCodec ] = "dnxhd";
 	dnxhd185x[ "b" ] = "185000000";
-	dnxhd185x[ "pix_fmt" ] = "yuv422p10";
+	dnxhd185x[ Profile::avProfilePixelFormat ] = "yuv422p10";
 	dnxhd185x[ "g" ] = "1";
+	dnxhd185x[ Profile::avProfileFrameRate ] = "25";
 
 	profiles.push_back( dnxhd120 );
 	profiles.push_back( dnxhd185 );
diff --git a/src/AvTranscoder/Profiles/Wave.hpp b/src/AvTranscoder/Profiles/Wave.hpp
@@ -12,21 +12,21 @@ void loadWave( Profile::ProfilesDesc& profiles )
 	wave24b48kMono[ Profile::avProfileIdentificatorHuman ] = "Wave 24bits 48kHz mono";
 	wave24b48kMono[ Profile::avProfileType ] = Profile::avProfileTypeAudio;
 
-	wave24b48kMono[ "codec" ] = "pcm_s24le";
-	wave24b48kMono[ "sample_fmt" ] = "s32";
-	wave24b48kMono[ "sample_rate" ] = "48000";
-	wave24b48kMono[ "channels" ] = "1";
+	wave24b48kMono[ Profile::avProfileCodec ] = "pcm_s24le";
+	wave24b48kMono[ Profile::avProfileSampleFormat ] = "s32";
+	wave24b48kMono[ Profile::avProfileSampleRate ] = "48000";
+	wave24b48kMono[ Profile::avProfileChannel ] = "1";
 
 	Profile::ProfileDesc wave16b48kMono;
 
 	wave16b48kMono[ Profile::avProfileIdentificator ] = "wave16b48kMono";
 	wave16b48kMono[ Profile::avProfileIdentificatorHuman ] = "Wave 16bits 48kHz mono";
 	wave16b48kMono[ Profile::avProfileType ] = Profile::avProfileTypeAudio;
 
-	wave16b48kMono[ "codec" ] = "pcm_s16le";
-	wave16b48kMono[ "sample_fmt" ] = "s16";
-	wave16b48kMono[ "sample_rate" ] = "48000";
-	wave16b48kMono[ "channels" ] = "1";
+	wave16b48kMono[ Profile::avProfileCodec ] = "pcm_s16le";
+	wave16b48kMono[ Profile::avProfileSampleFormat ] = "s16";
+	wave16b48kMono[ Profile::avProfileSampleRate ] = "48000";
+	wave16b48kMono[ Profile::avProfileChannel ] = "1";
 
 	profiles.push_back( wave24b48kMono );
 	profiles.push_back( wave16b48kMono );
diff --git a/src/AvTranscoder/Profiles/XdCamHd422.hpp b/src/AvTranscoder/Profiles/XdCamHd422.hpp
@@ -13,7 +13,7 @@ void loadXdCamHD422( Profile::ProfilesDesc& profiles )
 	xdCamHd422[ Profile::avProfileType ] = Profile::avProfileTypeVideo;
 
 
-	xdCamHd422[ "codec" ] = "mpeg2video";
+	xdCamHd422[ Profile::avProfileCodec ] = "mpeg2video";
 	xdCamHd422[ "profile" ] = "0"; // FF_PROFILE_MPEG2_422
 	xdCamHd422[ "level" ] = "2";
 
@@ -23,8 +23,9 @@ void loadXdCamHD422( Profile::ProfilesDesc& profiles )
 	xdCamHd422[ "qmin" ] = "2";
 	xdCamHd422[ "qmax" ] = "12";
 	xdCamHd422[ "dc" ] = "2"; // 10 - 8 = 2
+	xdCamHd422[ Profile::avProfileFrameRate ] = "25";
 
-	xdCamHd422[ "pix_fmt" ] = "yuv422p";
+	xdCamHd422[ Profile::avProfilePixelFormat ] = "yuv422p";
 
 	// color informations are not used in FFmpeg/LibAV for Mpeg2
 	xdCamHd422[ "colorspace" ] = "1"; // AVCOL_SPC_BT709
