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
9f937042
Commit
9f937042
authored
Nov 30, 2012
by
Jim Bankoski
Committed by
Gerrit Code Review
Nov 30, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
warnings in various experiments
Change-Id: Ib5106d4772450f8026f823dd743f162ab833b1d6
parent
2b8dc065
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
25 additions
and
22 deletions
+25
-22
vp9/common/vp9_reconintra.c
vp9/common/vp9_reconintra.c
+0
-3
vp9/common/vp9_reconintra4x4.c
vp9/common/vp9_reconintra4x4.c
+1
-1
vp9/common/vp9_rtcd_defs.sh
vp9/common/vp9_rtcd_defs.sh
+6
-0
vp9/decoder/vp9_decodframe.c
vp9/decoder/vp9_decodframe.c
+0
-6
vp9/decoder/vp9_idct_blk.c
vp9/decoder/vp9_idct_blk.c
+3
-0
vp9/encoder/vp9_bitstream.c
vp9/encoder/vp9_bitstream.c
+2
-1
vp9/encoder/vp9_encodeframe.c
vp9/encoder/vp9_encodeframe.c
+2
-1
vp9/encoder/vp9_onyx_int.h
vp9/encoder/vp9_onyx_int.h
+2
-2
vp9/encoder/vp9_rdopt.c
vp9/encoder/vp9_rdopt.c
+9
-8
No files found.
vp9/common/vp9_reconintra.c
View file @
9f937042
...
...
@@ -624,9 +624,7 @@ void vp9_build_interintra_16x16_predictors_mb(MACROBLOCKD *xd,
void
vp9_build_interintra_16x16_predictors_mby
(
MACROBLOCKD
*
xd
,
unsigned
char
*
ypred
,
int
ystride
)
{
static
const
int
scale_bits
=
6
;
unsigned
char
intrapredictor
[
256
];
int
i
,
j
;
vp9_build_intra_predictors_internal
(
xd
->
dst
.
y_buffer
,
xd
->
dst
.
y_stride
,
intrapredictor
,
16
,
...
...
@@ -640,7 +638,6 @@ void vp9_build_interintra_16x16_predictors_mbuv(MACROBLOCKD *xd,
unsigned
char
*
upred
,
unsigned
char
*
vpred
,
int
uvstride
)
{
int
i
,
j
;
unsigned
char
uintrapredictor
[
64
];
unsigned
char
vintrapredictor
[
64
];
vp9_build_intra_predictors_internal
(
...
...
vp9/common/vp9_reconintra4x4.c
View file @
9f937042
...
...
@@ -105,7 +105,7 @@ B_PREDICTION_MODE vp9_find_dominant_direction(
#elif CONTEXT_PRED_REPLACEMENTS == 0
B_PREDICTION_MODE
vp9_find_dominant_direction
(
unsigned
char
*
ptr
,
int
stride
,
int
n
)
{
int
g
[
8
],
i
,
imin
,
imin2
,
imax
;
int
g
[
8
],
i
,
imin
,
imax
;
g
[
0
]
=
find_grad_measure
(
ptr
,
stride
,
n
,
4
,
1
,
0
);
g
[
1
]
=
find_grad_measure
(
ptr
,
stride
,
n
,
4
,
2
,
1
);
g
[
2
]
=
find_grad_measure
(
ptr
,
stride
,
n
,
4
,
1
,
1
);
...
...
vp9/common/vp9_rtcd_defs.sh
View file @
9f937042
...
...
@@ -120,6 +120,12 @@ specialize vp9_recon_mb
prototype void vp9_recon_mby
"struct macroblockd *x"
specialize vp9_recon_mby
prototype void vp9_recon_mby_s
"struct macroblockd *x, unsigned char *dst"
specialize vp9_recon_mby_s
prototype void vp9_recon_mbuv_s
"struct macroblockd *x, unsigned char *udst, unsigned char *vdst"
specialize void vp9_recon_mbuv_s
prototype void vp9_build_intra_predictors_mby_s
"struct macroblockd *x"
specialize vp9_build_intra_predictors_mby_s
...
...
vp9/decoder/vp9_decodframe.c
View file @
9f937042
...
...
@@ -546,7 +546,6 @@ static void decode_4x4(VP9D_COMP *pbi, MACROBLOCKD *xd,
#if CONFIG_SUPERBLOCKS
static
void
decode_16x16_sb
(
VP9D_COMP
*
pbi
,
MACROBLOCKD
*
xd
,
BOOL_DECODER
*
const
bc
,
int
n
)
{
BLOCKD
*
b
=
&
xd
->
block
[
24
];
int
x_idx
=
n
&
1
,
y_idx
=
n
>>
1
;
TX_TYPE
tx_type
=
get_tx_type_16x16
(
xd
,
&
xd
->
block
[
0
]);
if
(
tx_type
!=
DCT_DCT
)
{
...
...
@@ -579,14 +578,9 @@ static void decode_8x8_sb(VP9D_COMP *pbi, MACROBLOCKD *xd,
int
i
;
for
(
i
=
0
;
i
<
4
;
i
++
)
{
int
ib
=
vp9_i8x8_block
[
i
];
const
int
iblock
[
4
]
=
{
0
,
1
,
4
,
5
};
const
int
ioffset
[
4
]
=
{
0
,
1
,
0
,
1
};
int
idx
=
(
ib
&
0x02
)
?
(
ib
+
2
)
:
ib
;
int
i8x8mode
=
-
1
;
short
*
q
=
xd
->
block
[
idx
].
qcoeff
;
short
*
dq
=
xd
->
block
[
0
].
dequant
;
unsigned
char
*
pre
=
xd
->
block
[
ib
].
predictor
;
unsigned
char
*
dst
=
*
(
xd
->
block
[
ib
].
base_dst
)
+
xd
->
block
[
ib
].
dst
;
int
stride
=
xd
->
dst
.
y_stride
;
BLOCKD
*
b
=
&
xd
->
block
[
ib
];
tx_type
=
get_tx_type_8x8
(
xd
,
&
xd
->
block
[
ib
]);
...
...
vp9/decoder/vp9_idct_blk.c
View file @
9f937042
...
...
@@ -10,6 +10,9 @@
#include "vp9_rtcd.h"
#include "vp9/common/vp9_blockd.h"
#if CONFIG_LOSSLESS
#include "vp9/decoder/vp9_dequantize.h"
#endif
void
vp9_dequant_dc_idct_add_y_block_c
(
short
*
q
,
const
short
*
dq
,
unsigned
char
*
pre
,
...
...
vp9/encoder/vp9_bitstream.c
View file @
9f937042
...
...
@@ -2206,7 +2206,8 @@ void vp9_pack_bitstream(VP9_COMP *cpi, unsigned char *dest,
#endif
if
(
pc
->
mcomp_filter_type
==
SWITCHABLE
)
update_switchable_interp_probs
(
cpi
,
&
header_bc
);
#if CONFIG_COMP_INTERINTRA_PRED
#if CONFIG_COMP_INTERINTRA_PRED
if
(
pc
->
use_interintra
)
{
vp9_cond_prob_update
(
&
header_bc
,
&
pc
->
fc
.
interintra_prob
,
...
...
vp9/encoder/vp9_encodeframe.c
View file @
9f937042
...
...
@@ -399,11 +399,12 @@ static unsigned int pick_best_mv_ref(MACROBLOCK *x,
for
(
i
=
1
;
i
<
4
;
++
i
)
{
// If we see a 0,0 reference vector for a second time we have reached
// the end of the list of valid candidate vectors.
if
(
!
mv_ref_list
[
i
].
as_int
)
if
(
!
mv_ref_list
[
i
].
as_int
)
{
if
(
zero_seen
)
break
;
else
zero_seen
=
TRUE
;
}
// Check for cases where the reference choice would give rise to an
// uncodable/out of range residual for row or col.
...
...
vp9/encoder/vp9_onyx_int.h
View file @
9f937042
...
...
@@ -577,8 +577,8 @@ typedef struct VP9_COMP {
int
mbsplit_count
[
VP9_NUMMBSPLITS
];
int
y_uv_mode_count
[
VP9_YMODES
][
VP9_UV_MODES
];
#if CONFIG_COMP_INTERINTRA_PRED
int
interintra_count
[
2
];
int
interintra_select_count
[
2
];
unsigned
int
interintra_count
[
2
];
unsigned
int
interintra_select_count
[
2
];
#endif
nmv_context_counts
NMVcount
;
...
...
vp9/encoder/vp9_rdopt.c
View file @
9f937042
...
...
@@ -3366,7 +3366,7 @@ static void rd_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
int
distortion_uv
=
INT_MAX
;
int64_t
best_yrd
=
INT64_MAX
;
#if CONFIG_PRED_FILTER
int
best_filter_state
;
int
best_filter_state
=
0
;
#endif
int
switchable_filter_index
=
0
;
...
...
@@ -3882,7 +3882,7 @@ static void rd_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
}
#if CONFIG_COMP_INTERINTRA_PRED
if
((
mbmi
->
ref_frame
==
INTRA_FRAME
)
&&
(
this_mode
>=
DC_PRED
&&
this_mode
<=
TM_PRED
)
&&
(
this_mode
<=
TM_PRED
)
&&
(
this_rd
<
best_intra16_rd
))
{
best_intra16_rd
=
this_rd
;
best_intra16_mode
=
this_mode
;
...
...
@@ -4179,7 +4179,7 @@ void vp9_rd_pick_intra_mode(VP9_COMP *cpi, MACROBLOCK *x,
int
rate4x4d
,
dist4x4d
;
#endif
int
rate4x4
,
rate16x16
=
0
,
rateuv
,
rateuv8x8
;
int
dist4x4
,
dist16x16
,
distuv
,
distuv8x8
;
int
dist4x4
=
0
,
dist16x16
=
0
,
distuv
=
0
,
distuv8x8
=
0
;
int
rate
;
int
rate4x4_tokenonly
=
0
;
int
rate16x16_tokenonly
=
0
;
...
...
@@ -4191,7 +4191,7 @@ void vp9_rd_pick_intra_mode(VP9_COMP *cpi, MACROBLOCK *x,
int
mode8x8
[
2
][
4
];
int
dist
;
int
modeuv
,
modeuv8x8
,
uv_intra_skippable
,
uv_intra_skippable_8x8
;
int
y_intra16x16_skippable
;
int
y_intra16x16_skippable
=
0
;
int64_t
txfm_cache
[
NB_TXFM_MODES
];
TX_SIZE
txfm_size_16x16
;
int
i
;
...
...
@@ -4356,16 +4356,17 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
int64_t
best_pred_diff
[
NB_PREDICTION_TYPES
];
int64_t
best_pred_rd
[
NB_PREDICTION_TYPES
];
MB_MODE_INFO
best_mbmode
;
int
mode_index
,
best_mode_index
;
int
mode_index
,
best_mode_index
=
0
;
unsigned
int
ref_costs
[
MAX_REF_FRAMES
];
#if CONFIG_COMP_INTERINTRA_PRED
int
is_best_interintra
=
0
;
int64_t
best_intra16_rd
=
INT64_MAX
;
int
best_intra16_mode
=
DC_PRED
,
best_intra16_uv_mode
=
DC_PRED
;
#endif
int
rate_uv_4x4
,
rate_uv_8x8
,
rate_uv_tokenonly_4x4
,
rate_uv_tokenonly_8x8
;
int
dist_uv_4x4
,
dist_uv_8x8
,
uv_skip_4x4
,
uv_skip_8x8
;
MB_PREDICTION_MODE
mode_uv_4x4
,
mode_uv_8x8
;
int
rate_uv_4x4
=
0
,
rate_uv_8x8
=
0
,
rate_uv_tokenonly_4x4
=
0
,
rate_uv_tokenonly_8x8
=
0
;
int
dist_uv_4x4
=
0
,
dist_uv_8x8
=
0
,
uv_skip_4x4
=
0
,
uv_skip_8x8
=
0
;
MB_PREDICTION_MODE
mode_uv_4x4
=
NEARESTMV
,
mode_uv_8x8
=
NEARESTMV
;
x
->
skip
=
0
;
xd
->
mode_info_context
->
mbmi
.
segment_id
=
segment_id
;
...
...
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