projects
/
nihav.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
h264: fix some tables and indices in dsp
[nihav.git]
/
nihav-itu
/
src
/
codecs
/
h264
/
dsp
/
mod.rs
diff --git
a/nihav-itu/src/codecs/h264/dsp/mod.rs
b/nihav-itu/src/codecs/h264/dsp/mod.rs
index fa091c60b5afa44baf4eb3eb8517af7ecc8e8584..df5b287f6a74900b6f38a8dbc40d43a54c159fd3 100644
(file)
--- a/
nihav-itu/src/codecs/h264/dsp/mod.rs
+++ b/
nihav-itu/src/codecs/h264/dsp/mod.rs
@@
-175,35
+175,35
@@
pub fn idct_dc(blk: &mut [i16; 16], qp: u8, quant_dc: bool) {
const QMAT_8X8: [[u8; 16]; 6] = [
[
const QMAT_8X8: [[u8; 16]; 6] = [
[
- 20, 19, 25,
24
,
+ 20, 19, 25,
19
,
19, 18, 24, 18,
25, 24, 32, 24,
19, 18, 24, 18,
25, 24, 32, 24,
-
24
, 18, 24, 18
+
19
, 18, 24, 18
], [
], [
- 22, 21, 28, 2
6
,
+ 22, 21, 28, 2
1
,
21, 19, 26, 19,
28, 26, 35, 26,
21, 19, 26, 19,
28, 26, 35, 26,
- 2
6
, 19, 26, 19
+ 2
1
, 19, 26, 19
], [
], [
- 26, 24, 33,
31
,
+ 26, 24, 33,
24
,
24, 23, 31, 23,
33, 31, 42, 31,
24, 23, 31, 23,
33, 31, 42, 31,
-
31
, 23, 31, 23
+
24
, 23, 31, 23
], [
], [
- 28, 26, 35,
33
,
+ 28, 26, 35,
26
,
26, 25, 33, 25,
35, 33, 45, 33,
26, 25, 33, 25,
35, 33, 45, 33,
-
33
, 25, 33, 25
+
26
, 25, 33, 25
], [
], [
- 32, 30, 40, 3
8
,
+ 32, 30, 40, 3
0
,
30, 28, 38, 28,
40, 38, 51, 38,
30, 28, 38, 28,
40, 38, 51, 38,
- 3
8
, 28, 38, 28
+ 3
0
, 28, 38, 28
], [
], [
- 36, 34, 46,
43
,
+ 36, 34, 46,
34
,
34, 32, 43, 32,
46, 43, 58, 43,
34, 32, 43, 32,
46, 43, 58, 43,
-
43
, 32, 43, 32
+
34
, 32, 43, 32
]
];
]
];
@@
-644,7
+644,7
@@
fn ipred_y_8x8_ver_right(buf: &mut [u8], stride: usize, ctx: &IPred8Context) {
(t[ix - 1] + 2 * t[ix] + t[ix + 1] + 2) >> 2
}
} else if zvr == -1 {
(t[ix - 1] + 2 * t[ix] + t[ix + 1] + 2) >> 2
}
} else if zvr == -1 {
- (l[1] + 2 * l[0] + t[
0
] + 2) >> 2
+ (l[1] + 2 * l[0] + t[
1
] + 2) >> 2
} else {
let ix = y - 2 * x;
(l[ix] + 2 * l[ix - 1] + l[ix - 2] + 2) >> 2
} else {
let ix = y - 2 * x;
(l[ix] + 2 * l[ix - 1] + l[ix - 2] + 2) >> 2
@@
-693,7
+693,7
@@
fn ipred_y_8x8_hor_down(buf: &mut [u8], stride: usize, ctx: &IPred8Context) {
(l[ix - 1] + 2 * l[ix] + l[ix + 1] + 2) >> 2
}
} else if zhd == -1 {
(l[ix - 1] + 2 * l[ix] + l[ix + 1] + 2) >> 2
}
} else if zhd == -1 {
- (l[1] + 2 * l[0] + t[
0
] + 2) >> 2
+ (l[1] + 2 * l[0] + t[
1
] + 2) >> 2
} else {
let ix = x - 2 * y;
(t[ix] + 2 * t[ix - 1] + t[ix - 2] + 2) >> 2
} else {
let ix = x - 2 * y;
(t[ix] + 2 * t[ix - 1] + t[ix - 2] + 2) >> 2