[x265] [PATCH 1 of 2] rc: Initialize virtual qps till 69
Aarthi Thirumalai
aarthi at multicorewareinc.com
Fri Dec 13 09:54:22 CET 2013
# HG changeset patch
# User Aarthi Thirumalai
# Date 1386875195 -19800
# Fri Dec 13 00:36:35 2013 +0530
# Node ID 0b9c8b0dd9b33acb8b0a93818e4232e0a60689f8
# Parent a87f12ebb55bc565fb3fa428471c5343c0125198
rc: Initialize virtual qps till 69
diff -r a87f12ebb55b -r 0b9c8b0dd9b3 source/Lib/TLibCommon/CommonDef.h
--- a/source/Lib/TLibCommon/CommonDef.h Wed Dec 11 15:37:02 2013 -0600
+++ b/source/Lib/TLibCommon/CommonDef.h Fri Dec 13 00:36:35 2013 +0530
@@ -133,6 +133,7 @@
#define MIN_QP 0
#define MAX_QP 51
+#define MAX_MAX_QP 69
#define NOT_VALID -1
diff -r a87f12ebb55b -r 0b9c8b0dd9b3 source/Lib/TLibCommon/TComRom.cpp
--- a/source/Lib/TLibCommon/TComRom.cpp Wed Dec 11 15:37:02 2013 -0600
+++ b/source/Lib/TLibCommon/TComRom.cpp Fri Dec 13 00:36:35 2013 +0530
@@ -278,12 +278,13 @@
{ 4, -13, 22, -31, 38, -46, 54, -61, 67, -73, 78, -82, 85, -88, 90, -90, 90, -90, 88, -85, 82, -78, 73, -67, 61, -54, 46, -38, 31, -22, 13, -4 }
};
-const UChar g_chromaScale[58] =
+const UChar g_chromaScale [70] =
{
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 29, 30, 31, 32,
33, 33, 34, 34, 35, 35, 36, 36, 37, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, 47, 48, 49, 50, 51
+ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
+ 62, 63
};
// ====================================================================================================================
@@ -512,7 +513,7 @@
const int g_winUnitX[] = { 1, 2, 2, 1 };
const int g_winUnitY[] = { 1, 2, 1, 1 };
-const double x265_lambda2_tab_I[MAX_QP + 1] =
+const double x265_lambda2_tab_I[MAX_MAX_QP + 1] =
{
0.012265625, 0.022265625, 0.028052813, 0.035344375, 0.04453125, 0.056105938, 0.070689063, 0.0890625,
0.112211563, 0.141377813, 0.178125, 0.224423438, 0.282755938, 0.35625, 0.448846875,
@@ -520,10 +521,12 @@
3.590775, 4.524093125, 5.7, 7.7800125, 10.55621688, 14.25, 19.1508, 25.63652688, 34.2,
45.48315, 60.32124, 79.8, 105.3293997, 138.7388519, 182.4, 229.8095994, 289.5419519, 364.8,
459.6191991, 579.0839038, 729.6, 919.2383981, 1158.167808, 1459.2, 1838.476796, 2316.335615,
- 2918.4, 3676.953592, 4632.67123
+ 2918.4, 3676.953592, 4632.67123, 5836.799769, 7353.906601, 9265.341359, 11673.59815, 14707.81146,
+ 18530.68052, 23347.19353, 29415.61942, 37061.35663, 46694.38151, 58831.23184, 74122.70446,
+ 93388.75192, 117662.4497, 148245.3913, 186777.4817, 235324.8715, 296490.7474
};
-const double x265_lambda2_non_I[MAX_QP + 1] =
+const double x265_lambda2_non_I[MAX_MAX_QP + 1] =
{
0.05231, 0.060686, 0.07646, 0.096333333, 0.151715667, 0.15292, 0.192666667, 0.242745, 0.382299,
0.385333333, 0.485489333, 0.611678333, 0.963333333, 0.970979, 1.223356667, 1.541333333, 2.427447667,
@@ -531,7 +534,9 @@
16.57137733, 22.183542, 29.5936, 39.357022, 52.19656867, 69.05173333, 91.14257667, 150.0651347,
157.8325333, 207.1422197, 271.4221573, 443.904, 447.4271947, 563.722941, 710.2464, 1118.567987,
1127.445883, 1420.4928, 1789.70878, 2818.614706, 2840.9856, 3579.41756, 4509.78353, 7102.464,
- 7158.83512, 9019.56706, 11363.9424
+ 7158.83512, 9019.56706, 11363.9424, 14317.66967, 18039.13269, 22727.8821, 28635.33594, 36078.2611,
+ 45455.7588, 57270.66508, 72156.51362, 90911.5068, 114541.3166, 144313.0101, 181822.992, 229082.6059,
+ 288625.9859, 363645.9408, 458165.1574, 577251.9032, 727291.7952
};
const UChar g_lpsTable[64][4] =
diff -r a87f12ebb55b -r 0b9c8b0dd9b3 source/Lib/TLibCommon/TComRom.h
--- a/source/Lib/TLibCommon/TComRom.h Wed Dec 11 15:37:02 2013 -0600
+++ b/source/Lib/TLibCommon/TComRom.h Fri Dec 13 00:36:35 2013 +0530
@@ -128,7 +128,7 @@
// Luma QP to Chroma QP mapping
// ====================================================================================================================
-extern const UChar g_chromaScale[58];
+extern const UChar g_chromaScale[70];
// ====================================================================================================================
// Scanning order & context mapping table
@@ -294,8 +294,8 @@
// Map Luma samples to chroma samples
extern const int g_winUnitX[MAX_CHROMA_FORMAT_IDC + 1];
extern const int g_winUnitY[MAX_CHROMA_FORMAT_IDC + 1];
-extern const double x265_lambda2_tab_I[MAX_QP + 1];
-extern const double x265_lambda2_non_I[MAX_QP + 1];
+extern const double x265_lambda2_tab_I[MAX_MAX_QP + 1];
+extern const double x265_lambda2_non_I[MAX_MAX_QP + 1];
// CABAC tables
extern const UChar g_lpsTable[64][4];
extern const UChar g_renormTable[32];
More information about the x265-devel
mailing list