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
9ab6e589
Commit
9ab6e589
authored
Mar 28, 2016
by
Hui Su
Committed by
Gerrit Code Review
Mar 28, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Fixes for Palette mode" into nextgenv2
parents
80bc1d1d
8a128c2a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
4 deletions
+1
-4
vp10/decoder/decodeframe.c
vp10/decoder/decodeframe.c
+0
-3
vp10/encoder/block.h
vp10/encoder/block.h
+1
-1
No files found.
vp10/decoder/decodeframe.c
View file @
9ab6e589
...
...
@@ -1881,9 +1881,6 @@ static void decode_block(VP10Decoder *const pbi, MACROBLOCKD *const xd,
(
xd
->
mb_to_bottom_edge
>=
0
?
0
:
xd
->
mb_to_bottom_edge
>>
(
5
+
pd
->
subsampling_y
));
if
(
plane
<=
1
&&
mbmi
->
palette_mode_info
.
palette_size
[
plane
])
vp10_decode_palette_tokens
(
xd
,
plane
,
r
);
for
(
row
=
0
;
row
<
max_blocks_high
;
row
+=
step
)
for
(
col
=
0
;
col
<
max_blocks_wide
;
col
+=
step
)
predict_and_reconstruct_intra_block
(
xd
,
...
...
vp10/encoder/block.h
View file @
9ab6e589
...
...
@@ -64,7 +64,7 @@ typedef struct {
typedef
struct
{
uint8_t
best_palette_color_map
[
4096
];
double
kmeans_data_buf
[
4096
];
double
kmeans_data_buf
[
2
*
4096
];
uint8_t
kmeans_indices_buf
[
4096
];
uint8_t
kmeans_pre_indices_buf
[
4096
];
}
PALETTE_BUFFER
;
...
...
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