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
d2095e0c
Commit
d2095e0c
authored
Feb 14, 2014
by
Adrian Grange
Committed by
Gerrit Code Review
Feb 14, 2014
Browse files
Merge "Cleanup some comments."
parents
0876302e
b7be30eb
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
vp8/encoder/firstpass.c
View file @
d2095e0c
...
...
@@ -2444,10 +2444,10 @@ void vp8_second_pass(VP8_COMP *cpi)
find_next_key_frame
(
cpi
,
&
this_frame_copy
);
/* Special case: Error error_resilient_mode mode does not make much
* sense for two pass but with its current meaning
but
this code is
* sense for two pass but with its current meaning this code is
* designed to stop outlandish behaviour if someone does set it when
* using two pass. It effectively disables GF groups. This is
* temporary code til
l
we decide what should really happen in this
* temporary code
un
til we decide what should really happen in this
* case.
*/
if
(
cpi
->
oxcf
.
error_resilient_mode
)
...
...
@@ -2773,7 +2773,7 @@ static void find_next_key_frame(VP8_COMP *cpi, FIRSTPASS_STATS *this_frame)
kf_group_intra_err
+=
this_frame
->
intra_error
;
kf_group_coded_err
+=
this_frame
->
coded_error
;
/*
l
oad
a
the next frame's stats */
/*
L
oad the next frame's stats
.
*/
vpx_memcpy
(
&
last_frame
,
this_frame
,
sizeof
(
*
this_frame
));
input_stats
(
cpi
,
this_frame
);
...
...
vp8/encoder/onyx_if.c
View file @
d2095e0c
...
...
@@ -2681,8 +2681,8 @@ static int resize_key_frame(VP8_COMP *cpi)
VP8_COMMON
*
cm
=
&
cpi
->
common
;
/* Do we need to apply resampling for one pass cbr.
* In one pass this is more limited than in two pass cbr
* The test and any change is only made one per key frame sequence
* In one pass this is more limited than in two pass cbr
.
* The test and any change is only made on
c
e per key frame sequence
.
*/
if
(
cpi
->
oxcf
.
allow_spatial_resampling
&&
(
cpi
->
oxcf
.
end_usage
==
USAGE_STREAM_FROM_SERVER
))
{
...
...
@@ -2705,7 +2705,7 @@ static int resize_key_frame(VP8_COMP *cpi)
cm
->
vert_scale
=
(
cm
->
vert_scale
>
NORMAL
)
?
cm
->
vert_scale
-
1
:
NORMAL
;
}
/* Get the new h
i
eght and width */
/* Get the new he
i
ght and width */
Scale2Ratio
(
cm
->
horiz_scale
,
&
hr
,
&
hs
);
Scale2Ratio
(
cm
->
vert_scale
,
&
vr
,
&
vs
);
new_width
=
((
hs
-
1
)
+
(
cpi
->
oxcf
.
Width
*
hr
))
/
hs
;
...
...
vp9/common/vp9_reconinter.c
View file @
d2095e0c
...
...
@@ -139,9 +139,6 @@ MV clamp_mv_to_umv_border_sb(const MACROBLOCKD *xd, const MV *src_mv,
return
clamped_mv
;
}
// TODO(jkoleszar): In principle, pred_w, pred_h are unnecessary, as we could
// calculate the subsampled BLOCK_SIZE, but that type isn't defined for
// sizes smaller than 16x16 yet.
static
void
build_inter_predictors
(
MACROBLOCKD
*
xd
,
int
plane
,
int
block
,
int
bw
,
int
bh
,
int
x
,
int
y
,
int
w
,
int
h
,
...
...
vp9/encoder/vp9_firstpass.c
View file @
d2095e0c
This diff is collapsed.
Click to expand it.
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