Skip to content
GitLab
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
96f8171d
Commit
96f8171d
authored
May 02, 2013
by
Ronald S. Bultje
Committed by
Gerrit Code Review
May 02, 2013
Browse files
Merge "Fix intra4x4 decoder reconstruction stride for sb8x8 experiment." into experimental
parents
ef600786
6c8071b4
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/decoder/vp9_decodframe.c
View file @
96f8171d
...
...
@@ -243,9 +243,10 @@ static void decode_8x8(MACROBLOCKD *xd) {
}
#endif
static
INLINE
void
dequant_add_y
(
MACROBLOCKD
*
xd
,
TX_TYPE
tx_type
,
int
idx
)
{
static
INLINE
void
dequant_add_y
(
MACROBLOCKD
*
xd
,
TX_TYPE
tx_type
,
int
idx
,
BLOCK_SIZE_TYPE
bsize
)
{
struct
macroblockd_plane
*
const
y
=
&
xd
->
plane
[
0
];
uint8_t
*
const
dst
=
raster_block_offset_uint8
(
xd
,
BLOCK_SIZE_MB16X16
,
0
,
idx
,
uint8_t
*
const
dst
=
raster_block_offset_uint8
(
xd
,
bsize
,
0
,
idx
,
xd
->
plane
[
0
].
dst
.
buf
,
xd
->
plane
[
0
].
dst
.
stride
);
if
(
tx_type
!=
DCT_DCT
)
{
...
...
@@ -276,7 +277,7 @@ static void decode_4x4(VP9D_COMP *pbi, MACROBLOCKD *xd, vp9_reader *r) {
vp9_intra8x8_predict
(
xd
,
ib
,
i8x8mode
,
dst
,
xd
->
plane
[
0
].
dst
.
stride
);
for
(
j
=
0
;
j
<
4
;
j
++
)
{
tx_type
=
get_tx_type_4x4
(
xd
,
ib
+
iblock
[
j
]);
dequant_add_y
(
xd
,
tx_type
,
ib
+
iblock
[
j
]);
dequant_add_y
(
xd
,
tx_type
,
ib
+
iblock
[
j
]
,
BLOCK_SIZE_MB16X16
);
}
dst
=
raster_block_offset_uint8
(
xd
,
BLOCK_SIZE_MB16X16
,
1
,
i
,
xd
->
plane
[
1
].
dst
.
buf
,
...
...
@@ -360,7 +361,7 @@ static void decode_atom_intra(VP9D_COMP *pbi, MACROBLOCKD *xd,
vp9_intra4x4_predict
(
xd
,
i
,
b_mode
,
dst
,
xd
->
plane
[
0
].
dst
.
stride
);
// TODO(jingning): refactor to use foreach_transformed_block_in_plane_
tx_type
=
get_tx_type_4x4
(
xd
,
i
);
dequant_add_y
(
xd
,
tx_type
,
i
);
dequant_add_y
(
xd
,
tx_type
,
i
,
bsize
);
}
#if CONFIG_NEWBINTRAMODES
if
(
!
xd
->
mode_info_context
->
mbmi
.
mb_skip_coeff
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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