Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
4d33ab5a
Commit
4d33ab5a
authored
Apr 26, 2017
by
Urvang Joshi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
zigzag.[hc]: Dedupe DCT_DCT and ADST_ADST values.
BUG=aomedia:442 Change-Id: Ibbd7375960b964b38e97eb6ee26ecd3e8b725935
parent
91d9a79d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
75 deletions
+3
-75
av1/common/zigzag.h
av1/common/zigzag.h
+3
-3
av1/common/zigzag16.c
av1/common/zigzag16.c
+0
-51
av1/common/zigzag4.c
av1/common/zigzag4.c
+0
-6
av1/common/zigzag8.c
av1/common/zigzag8.c
+0
-15
No files found.
av1/common/zigzag.h
View file @
4d33ab5a
...
...
@@ -17,17 +17,17 @@
extern
const
unsigned
char
OD_ZIGZAG4_DCT_DCT
[
15
][
2
];
extern
const
unsigned
char
OD_ZIGZAG4_ADST_DCT
[
15
][
2
];
extern
const
unsigned
char
OD_ZIGZAG4_DCT_ADST
[
15
][
2
];
extern
const
unsigned
char
OD_ZIGZAG4_ADST_ADST
[
15
][
2
];
#define
OD_ZIGZAG4_ADST_ADST
OD_ZIGZAG4_DCT_DCT
extern
const
unsigned
char
OD_ZIGZAG8_DCT_DCT
[
48
][
2
];
extern
const
unsigned
char
OD_ZIGZAG8_ADST_DCT
[
48
][
2
];
extern
const
unsigned
char
OD_ZIGZAG8_DCT_ADST
[
48
][
2
];
extern
const
unsigned
char
OD_ZIGZAG8_ADST_ADST
[
48
][
2
];
#define
OD_ZIGZAG8_ADST_ADST
OD_ZIGZAG8_DCT_DCT
extern
const
unsigned
char
OD_ZIGZAG16_DCT_DCT
[
192
][
2
];
extern
const
unsigned
char
OD_ZIGZAG16_ADST_DCT
[
192
][
2
];
extern
const
unsigned
char
OD_ZIGZAG16_DCT_ADST
[
192
][
2
];
extern
const
unsigned
char
OD_ZIGZAG16_ADST_ADST
[
192
][
2
];
#define
OD_ZIGZAG16_ADST_ADST
OD_ZIGZAG16_DCT_DCT
extern
const
unsigned
char
OD_ZIGZAG32_DCT_DCT
[
768
][
2
];
#endif
av1/common/zigzag16.c
View file @
4d33ab5a
...
...
@@ -155,54 +155,3 @@ OD_EXTERN const unsigned char OD_ZIGZAG16_DCT_ADST[192][2] = {
{
13
,
15
},
{
14
,
13
},
{
14
,
14
},
{
15
,
12
},
{
14
,
15
},
{
15
,
13
},
{
15
,
14
},
{
15
,
15
}
};
OD_EXTERN
const
unsigned
char
OD_ZIGZAG16_ADST_ADST
[
192
][
2
]
=
{
{
8
,
0
},
{
8
,
1
},
{
8
,
2
},
{
9
,
0
},
{
8
,
3
},
{
9
,
1
},
{
9
,
2
},
{
10
,
0
},
{
9
,
3
},
{
10
,
1
},
{
10
,
2
},
{
11
,
0
},
{
10
,
3
},
{
11
,
1
},
{
11
,
2
},
{
11
,
3
},
{
12
,
0
},
{
12
,
1
},
{
13
,
0
},
{
12
,
2
},
{
12
,
3
},
{
13
,
1
},
{
13
,
2
},
{
14
,
0
},
{
13
,
3
},
{
14
,
1
},
{
15
,
0
},
{
14
,
2
},
{
14
,
3
},
{
15
,
1
},
{
15
,
2
},
{
15
,
3
},
{
0
,
8
},
{
1
,
8
},
{
0
,
9
},
{
2
,
8
},
{
1
,
9
},
{
3
,
8
},
{
0
,
10
},
{
2
,
9
},
{
1
,
10
},
{
3
,
9
},
{
0
,
11
},
{
2
,
10
},
{
1
,
11
},
{
3
,
10
},
{
0
,
12
},
{
2
,
11
},
{
1
,
12
},
{
3
,
11
},
{
0
,
13
},
{
2
,
12
},
{
1
,
13
},
{
0
,
14
},
{
3
,
12
},
{
2
,
13
},
{
1
,
14
},
{
3
,
13
},
{
0
,
15
},
{
2
,
14
},
{
1
,
15
},
{
3
,
14
},
{
2
,
15
},
{
3
,
15
},
{
4
,
8
},
{
5
,
8
},
{
4
,
9
},
{
8
,
4
},
{
8
,
5
},
{
6
,
8
},
{
5
,
9
},
{
4
,
10
},
{
9
,
4
},
{
8
,
6
},
{
7
,
8
},
{
9
,
5
},
{
5
,
10
},
{
8
,
7
},
{
6
,
9
},
{
4
,
11
},
{
10
,
4
},
{
9
,
6
},
{
7
,
9
},
{
8
,
8
},
{
10
,
5
},
{
6
,
10
},
{
5
,
11
},
{
9
,
7
},
{
8
,
9
},
{
10
,
6
},
{
7
,
10
},
{
4
,
12
},
{
11
,
4
},
{
9
,
8
},
{
6
,
11
},
{
10
,
7
},
{
11
,
5
},
{
5
,
12
},
{
8
,
10
},
{
7
,
11
},
{
9
,
9
},
{
4
,
13
},
{
10
,
8
},
{
11
,
6
},
{
11
,
7
},
{
6
,
12
},
{
8
,
11
},
{
9
,
10
},
{
12
,
4
},
{
5
,
13
},
{
10
,
9
},
{
12
,
5
},
{
7
,
12
},
{
11
,
8
},
{
4
,
14
},
{
6
,
13
},
{
10
,
10
},
{
9
,
11
},
{
12
,
6
},
{
13
,
4
},
{
11
,
9
},
{
8
,
12
},
{
5
,
14
},
{
12
,
7
},
{
7
,
13
},
{
4
,
15
},
{
13
,
5
},
{
10
,
11
},
{
11
,
10
},
{
9
,
12
},
{
13
,
6
},
{
12
,
8
},
{
6
,
14
},
{
8
,
13
},
{
5
,
15
},
{
13
,
7
},
{
14
,
4
},
{
12
,
9
},
{
7
,
14
},
{
11
,
11
},
{
10
,
12
},
{
9
,
13
},
{
14
,
5
},
{
6
,
15
},
{
13
,
8
},
{
8
,
14
},
{
12
,
10
},
{
14
,
6
},
{
7
,
15
},
{
13
,
9
},
{
15
,
4
},
{
10
,
13
},
{
11
,
12
},
{
14
,
7
},
{
9
,
14
},
{
12
,
11
},
{
8
,
15
},
{
15
,
5
},
{
13
,
10
},
{
14
,
8
},
{
11
,
13
},
{
15
,
6
},
{
9
,
15
},
{
10
,
14
},
{
14
,
9
},
{
15
,
7
},
{
13
,
11
},
{
12
,
12
},
{
10
,
15
},
{
11
,
14
},
{
15
,
8
},
{
14
,
10
},
{
12
,
13
},
{
13
,
12
},
{
15
,
9
},
{
11
,
15
},
{
14
,
11
},
{
13
,
13
},
{
15
,
10
},
{
12
,
14
},
{
13
,
14
},
{
15
,
11
},
{
14
,
12
},
{
12
,
15
},
{
14
,
13
},
{
13
,
15
},
{
15
,
12
},
{
14
,
14
},
{
15
,
13
},
{
14
,
15
},
{
15
,
14
},
{
15
,
15
}
};
av1/common/zigzag4.c
View file @
4d33ab5a
...
...
@@ -20,9 +20,3 @@ OD_EXTERN const unsigned char OD_ZIGZAG4_DCT_ADST[15][2] = {
{
1
,
1
},
{
1
,
2
},
{
2
,
0
},
{
1
,
3
},
{
2
,
1
},
{
2
,
2
},
{
3
,
0
},
{
3
,
1
},
{
2
,
3
},
{
3
,
2
},
{
3
,
3
}
};
OD_EXTERN
const
unsigned
char
OD_ZIGZAG4_ADST_ADST
[
15
][
2
]
=
{
{
0
,
1
},
{
1
,
0
},
{
1
,
1
},
{
0
,
2
},
{
2
,
0
},
{
0
,
3
},
{
1
,
2
},
{
3
,
0
},
{
2
,
1
},
{
1
,
3
},
{
2
,
2
},
{
3
,
1
},
{
2
,
3
},
{
3
,
2
},
{
3
,
3
}
};
av1/common/zigzag8.c
View file @
4d33ab5a
...
...
@@ -48,18 +48,3 @@ OD_EXTERN const unsigned char OD_ZIGZAG8_DCT_ADST[48][2] = {
{
7
,
3
},
{
5
,
7
},
{
7
,
4
},
{
6
,
6
},
{
7
,
5
},
{
6
,
7
},
{
7
,
6
},
{
7
,
7
}
};
OD_EXTERN
const
unsigned
char
OD_ZIGZAG8_ADST_ADST
[
48
][
2
]
=
{
{
4
,
0
},
{
4
,
1
},
{
5
,
0
},
{
5
,
1
},
{
6
,
0
},
{
7
,
0
},
{
6
,
1
},
{
7
,
1
},
{
0
,
4
},
{
1
,
4
},
{
0
,
5
},
{
1
,
5
},
{
0
,
6
},
{
1
,
6
},
{
0
,
7
},
{
1
,
7
},
{
2
,
4
},
{
4
,
2
},
{
3
,
4
},
{
2
,
5
},
{
4
,
3
},
{
5
,
2
},
{
4
,
4
},
{
3
,
5
},
{
5
,
3
},
{
2
,
6
},
{
4
,
5
},
{
6
,
2
},
{
5
,
4
},
{
3
,
6
},
{
2
,
7
},
{
6
,
3
},
{
5
,
5
},
{
7
,
2
},
{
4
,
6
},
{
3
,
7
},
{
6
,
4
},
{
7
,
3
},
{
4
,
7
},
{
5
,
6
},
{
6
,
5
},
{
7
,
4
},
{
5
,
7
},
{
6
,
6
},
{
7
,
5
},
{
6
,
7
},
{
7
,
6
},
{
7
,
7
}
};
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
