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
4f0a381b
Commit
4f0a381b
authored
Dec 16, 2013
by
Dmitry Kovalev
Committed by
Gerrit Code Review
Dec 16, 2013
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Reusing nmv_frame_counts from FRAME_COUNTS in encoder."
parents
1a23a344
efe5b28c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
7 deletions
+5
-7
vp9/encoder/vp9_encodeframe.c
vp9/encoder/vp9_encodeframe.c
+1
-1
vp9/encoder/vp9_encodemv.c
vp9/encoder/vp9_encodemv.c
+4
-3
vp9/encoder/vp9_onyx_if.c
vp9/encoder/vp9_onyx_if.c
+0
-1
vp9/encoder/vp9_onyx_int.h
vp9/encoder/vp9_onyx_int.h
+0
-2
No files found.
vp9/encoder/vp9_encodeframe.c
View file @
4f0a381b
...
...
@@ -2074,7 +2074,7 @@ static void encode_frame_internal(VP9_COMP *cpi) {
xd
->
last_mi
=
cm
->
prev_mi
;
vp9_zero
(
cpi
->
NMV
count
);
vp9_zero
(
cpi
->
common
.
count
s
.
mv
);
vp9_zero
(
cpi
->
coef_counts
);
vp9_zero
(
cm
->
counts
.
eob_branch
);
...
...
vp9/encoder/vp9_encodemv.c
View file @
4f0a381b
...
...
@@ -166,7 +166,7 @@ static void write_mv_update(const vp9_tree_index *tree,
void
vp9_write_nmv_probs
(
VP9_COMP
*
const
cpi
,
int
usehp
,
vp9_writer
*
w
)
{
int
i
,
j
;
nmv_context
*
mvc
=
&
cpi
->
common
.
fc
.
nmvc
;
nmv_context_counts
*
counts
=
&
cpi
->
NMV
count
;
nmv_context_counts
*
counts
=
&
cpi
->
common
.
count
s
.
mv
;
write_mv_update
(
vp9_mv_joint_tree
,
mvc
->
joints
,
counts
->
joints
,
MV_JOINTS
,
w
);
...
...
@@ -252,6 +252,7 @@ void vp9_update_mv_count(VP9_COMP *cpi, MACROBLOCK *x, int_mv best_ref_mv[2]) {
MODE_INFO
*
mi
=
x
->
e_mbd
.
mi_8x8
[
0
];
MB_MODE_INFO
*
const
mbmi
=
&
mi
->
mbmi
;
const
int
is_compound
=
has_second_ref
(
mbmi
);
nmv_context_counts
*
counts
=
&
cpi
->
common
.
counts
.
mv
;
if
(
mbmi
->
sb_type
<
BLOCK_8X8
)
{
const
int
num_4x4_w
=
num_4x4_blocks_wide_lookup
[
mbmi
->
sb_type
];
...
...
@@ -262,11 +263,11 @@ void vp9_update_mv_count(VP9_COMP *cpi, MACROBLOCK *x, int_mv best_ref_mv[2]) {
for
(
idx
=
0
;
idx
<
2
;
idx
+=
num_4x4_w
)
{
const
int
i
=
idy
*
2
+
idx
;
if
(
mi
->
bmi
[
i
].
as_mode
==
NEWMV
)
inc_mvs
(
mi
->
bmi
[
i
].
as_mv
,
best_ref_mv
,
is_compound
,
&
cpi
->
NMV
count
);
inc_mvs
(
mi
->
bmi
[
i
].
as_mv
,
best_ref_mv
,
is_compound
,
count
s
);
}
}
}
else
if
(
mbmi
->
mode
==
NEWMV
)
{
inc_mvs
(
mbmi
->
mv
,
best_ref_mv
,
is_compound
,
&
cpi
->
NMV
count
);
inc_mvs
(
mbmi
->
mv
,
best_ref_mv
,
is_compound
,
count
s
);
}
}
vp9/encoder/vp9_onyx_if.c
View file @
4f0a381b
...
...
@@ -3107,7 +3107,6 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi,
vp9_copy
(
counts
->
comp_inter
,
cpi
->
comp_inter_count
);
vp9_copy
(
counts
->
single_ref
,
cpi
->
single_ref_count
);
vp9_copy
(
counts
->
comp_ref
,
cpi
->
comp_ref_count
);
counts
->
mv
=
cpi
->
NMVcount
;
if
(
!
cpi
->
common
.
error_resilient_mode
&&
!
cpi
->
common
.
frame_parallel_decoding_mode
)
{
vp9_adapt_mode_probs
(
&
cpi
->
common
);
...
...
vp9/encoder/vp9_onyx_int.h
View file @
4f0a381b
...
...
@@ -468,8 +468,6 @@ typedef struct VP9_COMP {
int
y_mode_count
[
4
][
INTRA_MODES
];
int
y_uv_mode_count
[
INTRA_MODES
][
INTRA_MODES
];
nmv_context_counts
NMVcount
;
vp9_coeff_count
coef_counts
[
TX_SIZES
][
PLANE_TYPES
];
vp9_coeff_probs_model
frame_coef_probs
[
TX_SIZES
][
PLANE_TYPES
];
vp9_coeff_stats
frame_branch_ct
[
TX_SIZES
][
PLANE_TYPES
];
...
...
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