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
340b2b07
Commit
340b2b07
authored
Nov 01, 2013
by
Dmitry Kovalev
Committed by
Gerrit Code Review
Nov 01, 2013
Browse files
Merge "Cleanup. Adding const to function pointer arguments."
parents
5113d9c3
7c524bbe
Changes
6
Hide whitespace changes
Inline
Side-by-side
vp9/common/vp9_blockd.h
View file @
340b2b07
...
...
@@ -417,7 +417,7 @@ static void txfrm_block_to_raster_xy(BLOCK_SIZE plane_bsize,
*
y
=
(
raster_mb
>>
tx_cols_log2
)
<<
tx_size
;
}
static
void
extend_for_intra
(
MACROBLOCKD
*
const
xd
,
BLOCK_SIZE
plane_bsize
,
static
void
extend_for_intra
(
MACROBLOCKD
*
xd
,
BLOCK_SIZE
plane_bsize
,
int
plane
,
int
block
,
TX_SIZE
tx_size
)
{
struct
macroblockd_plane
*
const
pd
=
&
xd
->
plane
[
plane
];
uint8_t
*
const
buf
=
pd
->
dst
.
buf
;
...
...
@@ -457,7 +457,7 @@ static void extend_for_intra(MACROBLOCKD* const xd, BLOCK_SIZE plane_bsize,
}
}
}
static
void
set_contexts_on_border
(
MACROBLOCKD
*
xd
,
static
void
set_contexts_on_border
(
const
MACROBLOCKD
*
xd
,
struct
macroblockd_plane
*
pd
,
BLOCK_SIZE
plane_bsize
,
int
tx_size_in_blocks
,
int
has_eob
,
...
...
@@ -495,7 +495,7 @@ static void set_contexts_on_border(MACROBLOCKD *xd,
L
[
pt
]
=
0
;
}
static
void
set_contexts
(
MACROBLOCKD
*
xd
,
struct
macroblockd_plane
*
pd
,
static
void
set_contexts
(
const
MACROBLOCKD
*
xd
,
struct
macroblockd_plane
*
pd
,
BLOCK_SIZE
plane_bsize
,
TX_SIZE
tx_size
,
int
has_eob
,
int
aoff
,
int
loff
)
{
ENTROPY_CONTEXT
*
const
A
=
pd
->
above_context
+
aoff
;
...
...
vp9/common/vp9_entropy.h
View file @
340b2b07
...
...
@@ -153,8 +153,8 @@ typedef unsigned int vp9_coeff_count_model[REF_TYPES][COEF_BANDS]
void
vp9_model_to_full_probs
(
const
vp9_prob
*
model
,
vp9_prob
*
full
);
static
int
get_entropy_context
(
TX_SIZE
tx_size
,
ENTROPY_CONTEXT
*
a
,
ENTROPY_CONTEXT
*
l
)
{
static
int
get_entropy_context
(
TX_SIZE
tx_size
,
const
ENTROPY_CONTEXT
*
a
,
const
ENTROPY_CONTEXT
*
l
)
{
ENTROPY_CONTEXT
above_ec
=
0
,
left_ec
=
0
;
switch
(
tx_size
)
{
...
...
@@ -163,16 +163,16 @@ static int get_entropy_context(TX_SIZE tx_size,
left_ec
=
l
[
0
]
!=
0
;
break
;
case
TX_8X8
:
above_ec
=
!!*
(
uint16_t
*
)
a
;
left_ec
=
!!*
(
uint16_t
*
)
l
;
above_ec
=
!!*
(
const
uint16_t
*
)
a
;
left_ec
=
!!*
(
const
uint16_t
*
)
l
;
break
;
case
TX_16X16
:
above_ec
=
!!*
(
uint32_t
*
)
a
;
left_ec
=
!!*
(
uint32_t
*
)
l
;
above_ec
=
!!*
(
const
uint32_t
*
)
a
;
left_ec
=
!!*
(
const
uint32_t
*
)
l
;
break
;
case
TX_32X32
:
above_ec
=
!!*
(
uint64_t
*
)
a
;
left_ec
=
!!*
(
uint64_t
*
)
l
;
above_ec
=
!!*
(
const
uint64_t
*
)
a
;
left_ec
=
!!*
(
const
uint64_t
*
)
l
;
break
;
default:
assert
(
!
"Invalid transform size."
);
...
...
vp9/common/vp9_reconintra.c
View file @
340b2b07
...
...
@@ -369,7 +369,7 @@ static void build_intra_predictors(const uint8_t *ref, int ref_stride,
}
}
void
vp9_predict_intra_block
(
MACROBLOCKD
*
xd
,
int
block_idx
,
int
bwl_in
,
void
vp9_predict_intra_block
(
const
MACROBLOCKD
*
xd
,
int
block_idx
,
int
bwl_in
,
TX_SIZE
tx_size
,
int
mode
,
const
uint8_t
*
ref
,
int
ref_stride
,
uint8_t
*
dst
,
int
dst_stride
)
{
...
...
vp9/common/vp9_reconintra.h
View file @
340b2b07
...
...
@@ -14,8 +14,8 @@
#include
"vpx/vpx_integer.h"
#include
"vp9/common/vp9_blockd.h"
void
vp9_predict_intra_block
(
MACROBLOCKD
*
xd
,
int
block_idx
,
int
bwl_in
,
TX_SIZE
tx_size
,
int
mode
,
const
uint8_t
*
ref
,
int
ref_stride
,
uint8_t
*
dst
,
int
dst_stride
);
void
vp9_predict_intra_block
(
const
MACROBLOCKD
*
xd
,
int
block_idx
,
int
bwl_in
,
TX_SIZE
tx_size
,
int
mode
,
const
uint8_t
*
ref
,
int
ref_stride
,
uint8_t
*
dst
,
int
dst_stride
);
#endif // VP9_COMMON_VP9_RECONINTRA_H_
vp9/common/vp9_scan.h
View file @
340b2b07
...
...
@@ -191,8 +191,7 @@ static INLINE const int16_t* get_iscan_16x16(TX_TYPE tx_type) {
}
static
INLINE
int
get_coef_context
(
const
int16_t
*
neighbors
,
uint8_t
*
token_cache
,
int
c
)
{
const
uint8_t
*
token_cache
,
int
c
)
{
return
(
1
+
token_cache
[
neighbors
[
MAX_NEIGHBORS
*
c
+
0
]]
+
token_cache
[
neighbors
[
MAX_NEIGHBORS
*
c
+
1
]])
>>
1
;
}
...
...
vp9/encoder/vp9_subexp.c
View file @
340b2b07
...
...
@@ -221,7 +221,7 @@ int vp9_prob_diff_update_savings_search_model(const unsigned int *ct,
}
void
vp9_cond_prob_diff_update
(
vp9_writer
*
w
,
vp9_prob
*
oldp
,
unsigned
int
*
ct
)
{
const
unsigned
int
ct
[
2
]
)
{
const
vp9_prob
upd
=
DIFF_UPDATE_PROB
;
vp9_prob
newp
=
get_binary_prob
(
ct
[
0
],
ct
[
1
]);
const
int
savings
=
vp9_prob_diff_update_savings_search
(
ct
,
*
oldp
,
&
newp
,
...
...
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