Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
6c3b691c
Commit
6c3b691c
authored
Jun 04, 2015
by
James Zern
Committed by
Gerrit Code Review
Jun 04, 2015
Browse files
Merge "vp9_reconintra: fix d45/d63 discrepancies"
parents
7ccd7fc3
faea038f
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/common/vp9_reconintra.c
View file @
6c3b691c
...
...
@@ -418,19 +418,18 @@ void vp9_d63_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride,
const
int
E
=
above
[
4
];
const
int
F
=
above
[
5
];
const
int
G
=
above
[
6
];
const
int
H
=
above
[
7
];
(
void
)
left
;
DST
(
0
,
0
)
=
AVG2
(
A
,
B
);
DST
(
1
,
0
)
=
DST
(
0
,
2
)
=
AVG2
(
B
,
C
);
DST
(
2
,
0
)
=
DST
(
1
,
2
)
=
AVG2
(
C
,
D
);
DST
(
3
,
0
)
=
DST
(
2
,
2
)
=
AVG2
(
D
,
E
);
DST
(
3
,
2
)
=
AVG2
(
E
,
F
);
// differs from vp8
DST
(
0
,
1
)
=
AVG3
(
A
,
B
,
C
);
DST
(
1
,
1
)
=
DST
(
0
,
3
)
=
AVG3
(
B
,
C
,
D
);
DST
(
2
,
1
)
=
DST
(
1
,
3
)
=
AVG3
(
C
,
D
,
E
);
DST
(
3
,
1
)
=
DST
(
2
,
3
)
=
AVG3
(
D
,
E
,
F
);
DST
(
3
,
2
)
=
AVG3
(
E
,
F
,
G
);
DST
(
3
,
3
)
=
AVG3
(
F
,
G
,
H
);
DST
(
3
,
3
)
=
AVG3
(
E
,
F
,
G
);
// differs from vp8
}
static
INLINE
void
d63_predictor
(
uint8_t
*
dst
,
ptrdiff_t
stride
,
int
bs
,
...
...
@@ -467,7 +466,7 @@ void vp9_d45_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride,
DST
(
3
,
0
)
=
DST
(
2
,
1
)
=
DST
(
1
,
2
)
=
DST
(
0
,
3
)
=
AVG3
(
D
,
E
,
F
);
DST
(
3
,
1
)
=
DST
(
2
,
2
)
=
DST
(
1
,
3
)
=
AVG3
(
E
,
F
,
G
);
DST
(
3
,
2
)
=
DST
(
2
,
3
)
=
AVG3
(
F
,
G
,
H
);
DST
(
3
,
3
)
=
AVG3
(
G
,
H
,
H
);
DST
(
3
,
3
)
=
H
;
// differs from vp8
}
static
INLINE
void
d45_predictor
(
uint8_t
*
dst
,
ptrdiff_t
stride
,
int
bs
,
...
...
Write
Preview
Supports
Markdown
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