Commit 2fd20eb3 authored by Scott LaVarnway's avatar Scott LaVarnway Committed by Gerrit Code Review
Browse files

Merge "Eliminated prev_mip memsets/memcpys in encoder"

parents 7c134bc0 f2a6bcfb
......@@ -3460,15 +3460,24 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi,
cm->last_width = cm->width;
cm->last_height = cm->height;
// Don't increment frame counters if this was an altref buffer
// update not a real frame
// reset to normal state now that we are done.
cm->last_show_frame = cm->show_frame;
if (cm->show_frame) {
// current mip will be the prev_mip for the next frame
MODE_INFO *temp = cm->prev_mip;
cm->prev_mip = cm->mip;
cm->mip = temp;
// update the upper left visible macroblock ptrs
cm->mi = cm->mip + cm->mode_info_stride + 1;
// Don't increment frame counters if this was an altref buffer
// update not a real frame
++cm->current_video_frame;
++cpi->frames_since_key;
}
// reset to normal state now that we are done.
// restore prev_mi
cm->prev_mi = cm->prev_mip + cm->mode_info_stride + 1;
#if 0
{
......@@ -3486,17 +3495,6 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi,
vp9_write_yuv_rec_frame(cm);
#endif
if (cm->show_frame) {
vpx_memcpy(cm->prev_mip, cm->mip,
cm->mode_info_stride * (cm->mi_rows + MI_BLOCK_SIZE) *
sizeof(MODE_INFO));
} else {
vpx_memset(cm->prev_mip, 0,
cm->mode_info_stride * (cm->mi_rows + MI_BLOCK_SIZE) *
sizeof(MODE_INFO));
}
// restore prev_mi
cm->prev_mi = cm->prev_mip + cm->mode_info_stride + 1;
}
static void Pass2Encode(VP9_COMP *cpi, unsigned long *size,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment