[Avidemux-svn-commit] r5021 - in branches/avidemux_2.5_branch_gruntster/plugins/ADM_videoEncoder/ADM_vidEnc_x264: . qt4 xml

[gruntster at mail.berlios.de]

Author: gruntster
Date: 2009-07-08 23:53:44 +0200 (Wed, 08 Jul 2009)
New Revision: 5021

Modified:
   branches/avidemux_2.5_branch_gruntster/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp
   branches/avidemux_2.5_branch_gruntster/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp
   branches/avidemux_2.5_branch_gruntster/plugins/ADM_videoEncoder/ADM_vidEnc_x264/xml/Apple iPhone.xml
   branches/avidemux_2.5_branch_gruntster/plugins/ADM_videoEncoder/ADM_vidEnc_x264/xml/Apple iPod 5.5G.xml
   branches/avidemux_2.5_branch_gruntster/plugins/ADM_videoEncoder/ADM_vidEnc_x264/xml/Microsoft Zune.xml
   branches/avidemux_2.5_branch_gruntster/plugins/ADM_videoEncoder/ADM_vidEnc_x264/xml/Sony PlayStation Portable.xml
Log:
[x264] handle integer idc levels properly

Modified: branches/avidemux_2.5_branch_gruntster/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp
===================================================================
--- branches/avidemux_2.5_branch_gruntster/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp	2009-07-08 21:52:59 UTC (rev 5020)
+++ branches/avidemux_2.5_branch_gruntster/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp	2009-07-08 21:53:44 UTC (rev 5021)
@@ -42,7 +42,7 @@
 	static const int _predefinedARs[aspectRatioCount][2] = {{16, 15}, {64, 45}, {8, 9}, {32, 27}};
 
 	// Mappings for x264 array index -> UI combobox index
-	static const int8_t _idcLevel[idcLevelCount] = {-1, 1, 11, 12, 13, 2, 21, 22, 3, 31, 32, 4, 41, 42, 5, 51};
+	static const int8_t _idcLevel[idcLevelCount] = {-1, 10, 11, 12, 13, 20, 21, 22, 30, 31, 32, 40, 41, 42, 50, 51};
 	static const uint8_t _videoFormat[videoFormatCount] = {5, 0, 1, 2, 3, 4};
 	static const uint8_t _colourPrimaries[colourPrimariesCount] = {2, 1, 4, 5, 6, 7, 8};
 	static const uint8_t _transferCharacteristics[transferCharacteristicsCount] = {2, 1, 4, 5, 8, 9, 10, 6, 7};

Modified: branches/avidemux_2.5_branch_gruntster/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp
===================================================================
--- branches/avidemux_2.5_branch_gruntster/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp	2009-07-08 21:52:59 UTC (rev 5020)
+++ branches/avidemux_2.5_branch_gruntster/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp	2009-07-08 21:53:44 UTC (rev 5021)
@@ -112,20 +112,20 @@
 	switch (idcLevel)
 	{
 		case -1:
-		case 1:
+		case 10:
 		case 11:
 		case 12:
 		case 13:
-		case 2:
+		case 20:
 		case 21:
 		case 22:
-		case 3:
+		case 30:
 		case 31:
 		case 32:
-		case 4:
+		case 40:
 		case 41:
 		case 42:
-		case 5:
+		case 50:
 		case 51:
 			_param.i_level_idc = idcLevel;
 	}

Modified: branches/avidemux_2.5_branch_gruntster/plugins/ADM_videoEncoder/ADM_vidEnc_x264/xml/Apple iPhone.xml
===================================================================
--- branches/avidemux_2.5_branch_gruntster/plugins/ADM_videoEncoder/ADM_vidEnc_x264/xml/Apple iPhone.xml	2009-07-08 21:52:59 UTC (rev 5020)
+++ branches/avidemux_2.5_branch_gruntster/plugins/ADM_videoEncoder/ADM_vidEnc_x264/xml/Apple iPhone.xml	2009-07-08 21:53:44 UTC (rev 5021)
@@ -5,7 +5,7 @@
     <parameter>1000</parameter>
   </encodeOptions>
   <x264Options>
-    <idcLevel>3</idcLevel>
+    <idcLevel>30</idcLevel>
     <cabac>false</cabac>
     <analyse>
       <partitionI4x4>true</partitionI4x4>

Modified: branches/avidemux_2.5_branch_gruntster/plugins/ADM_videoEncoder/ADM_vidEnc_x264/xml/Apple iPod 5.5G.xml
===================================================================
--- branches/avidemux_2.5_branch_gruntster/plugins/ADM_videoEncoder/ADM_vidEnc_x264/xml/Apple iPod 5.5G.xml	2009-07-08 21:52:59 UTC (rev 5020)
+++ branches/avidemux_2.5_branch_gruntster/plugins/ADM_videoEncoder/ADM_vidEnc_x264/xml/Apple iPod 5.5G.xml	2009-07-08 21:53:44 UTC (rev 5021)
@@ -5,7 +5,7 @@
     <parameter>1000</parameter>
   </encodeOptions>
   <x264Options>
-    <idcLevel>3</idcLevel>
+    <idcLevel>30</idcLevel>
     <cabac>false</cabac>
     <analyse>
       <partitionI4x4>true</partitionI4x4>

Modified: branches/avidemux_2.5_branch_gruntster/plugins/ADM_videoEncoder/ADM_vidEnc_x264/xml/Microsoft Zune.xml
===================================================================
--- branches/avidemux_2.5_branch_gruntster/plugins/ADM_videoEncoder/ADM_vidEnc_x264/xml/Microsoft Zune.xml	2009-07-08 21:52:59 UTC (rev 5020)
+++ branches/avidemux_2.5_branch_gruntster/plugins/ADM_videoEncoder/ADM_vidEnc_x264/xml/Microsoft Zune.xml	2009-07-08 21:53:44 UTC (rev 5021)
@@ -5,7 +5,7 @@
     <parameter>1000</parameter>
   </encodeOptions>
   <x264Options>
-    <idcLevel>3</idcLevel>
+    <idcLevel>30</idcLevel>
     <loopFilter>false</loopFilter>
     <cabac>false</cabac>
     <analyse>

Modified: branches/avidemux_2.5_branch_gruntster/plugins/ADM_videoEncoder/ADM_vidEnc_x264/xml/Sony PlayStation Portable.xml
===================================================================
--- branches/avidemux_2.5_branch_gruntster/plugins/ADM_videoEncoder/ADM_vidEnc_x264/xml/Sony PlayStation Portable.xml	2009-07-08 21:52:59 UTC (rev 5020)
+++ branches/avidemux_2.5_branch_gruntster/plugins/ADM_videoEncoder/ADM_vidEnc_x264/xml/Sony PlayStation Portable.xml	2009-07-08 21:53:44 UTC (rev 5021)
@@ -5,7 +5,7 @@
     <parameter>1000</parameter>
   </encodeOptions>
   <x264Options>
-    <idcLevel>3</idcLevel>
+    <idcLevel>30</idcLevel>
     <referenceFrames>3</referenceFrames>
     <bFrames>3</bFrames>
     <adaptiveBframeDecision>2</adaptiveBframeDecision>