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
b3055ec0
Commit
b3055ec0
authored
Nov 29, 2012
by
Yaowu Xu
Committed by
Gerrit Code Review
Nov 29, 2012
Browse files
Merge "more unused variables." into experimental
parents
8422ef77
cf671e27
Changes
4
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_encodeframe.c
View file @
b3055ec0
...
...
@@ -534,11 +534,12 @@ static void update_state(VP9_COMP *cpi, MACROBLOCK *x,
// Note how often each mode chosen as best
cpi
->
mode_chosen_counts
[
mb_mode_index
]
++
;
if
(
mbmi
->
mode
==
SPLITMV
||
mbmi
->
mode
==
NEWMV
)
{
static
int
testcount
=
0
;
int_mv
best_mv
,
best_second_mv
;
unsigned
int
best_index
;
MV_REFERENCE_FRAME
rf
=
mbmi
->
ref_frame
;
#if CONFIG_NEW_MVREF
unsigned
int
best_index
;
MV_REFERENCE_FRAME
sec_ref_frame
=
mbmi
->
second_ref_frame
;
#endif
best_mv
.
as_int
=
ctx
->
best_ref_mv
.
as_int
;
best_second_mv
.
as_int
=
ctx
->
second_best_ref_mv
.
as_int
;
if
(
mbmi
->
mode
==
NEWMV
)
{
...
...
vp9/encoder/vp9_encodemb.c
View file @
b3055ec0
...
...
@@ -610,7 +610,6 @@ void vp9_optimize_mby_4x4(MACROBLOCK *x) {
ENTROPY_CONTEXT_PLANES
t_above
,
t_left
;
ENTROPY_CONTEXT
*
ta
;
ENTROPY_CONTEXT
*
tl
;
MB_PREDICTION_MODE
mode
=
x
->
e_mbd
.
mode_info_context
->
mbmi
.
mode
;
if
(
!
x
->
e_mbd
.
above_context
||
!
x
->
e_mbd
.
left_context
)
return
;
...
...
vp9/encoder/vp9_encodemv.c
View file @
b3055ec0
...
...
@@ -414,7 +414,9 @@ void vp9_write_nmv_probs(VP9_COMP* const cpi, int usehp, vp9_writer* const bc) {
unsigned
int
branch_ct_fp
[
2
][
4
-
1
][
2
];
unsigned
int
branch_ct_class0_hp
[
2
][
2
];
unsigned
int
branch_ct_hp
[
2
][
2
];
#ifdef MV_GROUP_UPDATE
int
savings
=
0
;
#endif
#ifdef NMV_STATS
if
(
!
cpi
->
dummy_packing
)
...
...
vp9/encoder/vp9_firstpass.c
View file @
b3055ec0
...
...
@@ -482,7 +482,6 @@ void vp9_first_pass(VP9_COMP *cpi) {
// if( cm->current_video_frame == 0)
// if ( 0 )
{
int
flag
[
2
]
=
{
1
,
1
};
vp9_init_mv_probs
(
cm
);
vp9_initialize_rd_consts
(
cpi
,
cm
->
base_qindex
+
cm
->
y1dc_delta_q
);
}
...
...
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