Cleanup some comments.
Change-Id: I568861ba1d43620865ad9a98a97eef37a51fd856
This commit is contained in:
parent
ecf392a155
commit
b7be30eb36
@ -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 till we decide what should really happen in this
|
||||
* temporary code until 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;
|
||||
|
||||
/* load a the next frame's stats */
|
||||
/* Load the next frame's stats. */
|
||||
vpx_memcpy(&last_frame, this_frame, sizeof(*this_frame));
|
||||
input_stats(cpi, this_frame);
|
||||
|
||||
|
@ -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 once 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 hieght and width */
|
||||
/* Get the new height and width */
|
||||
Scale2Ratio(cm->horiz_scale, &hr, &hs);
|
||||
Scale2Ratio(cm->vert_scale, &vr, &vs);
|
||||
new_width = ((hs - 1) + (cpi->oxcf.Width * hr)) / hs;
|
||||
|
@ -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,
|
||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user