Merge "Make new_quant bin widths to be uniform" into nextgenv2

This commit is contained in:
Sarah Parker
2016-07-08 17:40:54 +00:00
committed by Gerrit Code Review

View File

@@ -42,55 +42,55 @@ static const qprofile_type nuq_lossless[COEF_BANDS] = {
static const qprofile_type nuq[QUANT_PROFILES][QUANT_RANGES][COEF_BANDS] = {
{
{
{{91, 133, 139}, 11}, // dc, band 0
{{78, 122, 134}, 12}, // band 1
{{83, 127, 139}, 22}, // band 2
{{84, 117, 128}, 18}, // band 3
{{88, 117, 129}, 20}, // band 4
{{93, 122, 134}, 21} // band 5
{{64, 128, 128}, 0}, // dc, band 0
{{64, 128, 128}, 0}, // band 1
{{64, 128, 128}, 0}, // band 2
{{64, 128, 128}, 0}, // band 3
{{64, 128, 128}, 0}, // band 4
{{64, 128, 128}, 0} // band 5
}, {
{{91, 133, 139}, 11}, // dc, band 0
{{78, 122, 134}, 12}, // band 1
{{83, 127, 139}, 22}, // band 2
{{84, 117, 128}, 18}, // band 3
{{88, 117, 129}, 20}, // band 4
{{93, 122, 134}, 21} // band 5
{{64, 128, 128}, 0}, // dc, band 0
{{64, 128, 128}, 0}, // band 1
{{64, 128, 128}, 0}, // band 2
{{64, 128, 128}, 0}, // band 3
{{64, 128, 128}, 0}, // band 4
{{64, 128, 128}, 0} // band 5
}
},
#if QUANT_PROFILES > 1
{
{
{{86, 122, 134}, 6}, // dc, band 0
{{78, 122, 134}, 15}, // band 1
{{78, 122, 134}, 17}, // band 2
{{84, 122, 134}, 22}, // band 3
{{88, 122, 134}, 23}, // band 4
{{88, 122, 134}, 23} // band 5
{{64, 128, 128}, 0}, // dc, band 0
{{64, 128, 128}, 0}, // band 1
{{64, 128, 128}, 0}, // band 2
{{64, 128, 128}, 0}, // band 3
{{64, 128, 128}, 0}, // band 4
{{64, 128, 128}, 0} // band 5
}, {
{{86, 122, 134}, 6}, // dc, band 0
{{78, 122, 134}, 15}, // band 1
{{78, 122, 134}, 17}, // band 2
{{84, 122, 134}, 22}, // band 3
{{88, 122, 134}, 23}, // band 4
{{88, 122, 134}, 23} // band 5
{{64, 128, 128}, 0}, // dc, band 0
{{64, 128, 128}, 0}, // band 1
{{64, 128, 128}, 0}, // band 2
{{64, 128, 128}, 0}, // band 3
{{64, 128, 128}, 0}, // band 4
{{64, 128, 128}, 0} // band 5
}
},
#if QUANT_PROFILES > 2
{
{
{{86, 122, 134}, 6}, // dc, band 0
{{78, 122, 135}, 14}, // band 1
{{78, 122, 134}, 16}, // band 2
{{84, 122, 133}, 22}, // band 3
{{88, 122, 134}, 23}, // band 4
{{88, 122, 134}, 27}, // band 5
{{64, 128, 128}, 0}, // dc, band 0
{{64, 128, 128}, 0}, // band 1
{{64, 128, 128}, 0}, // band 2
{{64, 128, 128}, 0}, // band 3
{{64, 128, 128}, 0}, // band 4
{{64, 128, 128}, 0}, // band 5
}, {
{{86, 122, 134}, 6}, // dc, band 0
{{78, 122, 135}, 14}, // band 1
{{78, 122, 134}, 16}, // band 2
{{84, 122, 133}, 22}, // band 3
{{88, 122, 134}, 23}, // band 4
{{88, 122, 134}, 27}, // band 5
{{64, 128, 128}, 0}, // dc, band 0
{{64, 128, 128}, 0}, // band 1
{{64, 128, 128}, 0}, // band 2
{{64, 128, 128}, 0}, // band 3
{{64, 128, 128}, 0}, // band 4
{{64, 128, 128}, 0}, // band 5
}
}
#endif // QUANT_PROFILES > 2