Commit 689b775b authored by Fabrice Bellard's avatar Fabrice Bellard
Browse files

updated scans


Originally committed as revision 50 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 60832448
......@@ -2,7 +2,7 @@
* MPEG1/2 tables
*/
const UINT8 default_intra_matrix[64] = {
INT16 default_intra_matrix[64] = {
8, 16, 19, 22, 26, 27, 29, 34,
16, 16, 22, 24, 27, 29, 34, 37,
19, 22, 26, 27, 29, 34, 34, 38,
......@@ -13,7 +13,7 @@ const UINT8 default_intra_matrix[64] = {
27, 29, 35, 38, 46, 56, 69, 83
};
const UINT8 default_non_intra_matrix[64] = {
INT16 default_non_intra_matrix[64] = {
16, 16, 16, 16, 16, 16, 16, 16,
16, 16, 16, 16, 16, 16, 16, 16,
16, 16, 16, 16, 16, 16, 16, 16,
......@@ -331,18 +331,6 @@ static const UINT8 mbMotionVectorTable[17][2] = {
{ 0xc, 10 },
};
//const
UINT8 zigzag_direct[64] = {
0, 1, 8, 16, 9, 2, 3, 10,
17, 24, 32, 25, 18, 11, 4, 5,
12, 19, 26, 33, 40, 48, 41, 34,
27, 20, 13, 6, 7, 14, 21, 28,
35, 42, 49, 56, 57, 50, 43, 36,
29, 22, 15, 23, 30, 37, 44, 51,
58, 59, 52, 45, 38, 31, 39, 46,
53, 60, 61, 54, 47, 55, 62, 63
};
static const int frame_rate_tab[9] = {
0,
(int)(23.976 * FRAME_RATE_BASE),
......
......@@ -81,26 +81,3 @@ static RLTable rl_intra = {
intra_run,
intra_level,
};
/* alternate scan orders used when doing AC prediction */
UINT8 ff_alternate_horizontal_scan[64] = {
0, 1, 2, 3, 8, 9, 16, 17,
10, 11, 4, 5, 6, 7, 15, 14,
13, 12, 19, 18, 24, 25, 32, 33,
26, 27, 20, 21, 22, 23, 28, 29,
30, 31, 34, 35, 40, 41, 48, 49,
42, 43, 36, 37, 38, 39, 44, 45,
46, 47, 50, 51, 56, 57, 58, 59,
52, 53, 54, 55, 60, 61, 62, 63,
};
UINT8 ff_alternate_vertical_scan[64] = {
0, 8, 16, 24, 1, 9, 2, 10,
17, 25, 32, 40, 48, 56, 57, 49,
41, 33, 26, 18, 3, 11, 4, 12,
19, 27, 34, 42, 50, 58, 35, 43,
51, 59, 20, 28, 5, 13, 6, 14,
21, 29, 36, 44, 52, 60, 37, 45,
53, 61, 22, 30, 7, 15, 23, 31,
38, 46, 54, 62, 39, 47, 55, 63,
};
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment