Commit 5bc7b3a6 authored by Scott LaVarnway's avatar Scott LaVarnway
Browse files

Fixed encoder crash

caused by the "Removed bmi copy to/from BLOCKD" commit.

Change-Id: I9fae71bdc34c8ecc07bb81cd3ccf498b91ce3ec7
parent c4b9089b
...@@ -232,10 +232,6 @@ THREAD_FUNCTION thread_encoding_proc(void *p_data) ...@@ -232,10 +232,6 @@ THREAD_FUNCTION thread_encoding_proc(void *p_data)
// Increment the activity mask pointers. // Increment the activity mask pointers.
x->mb_activity_ptr++; x->mb_activity_ptr++;
/* save the block info */
for (i = 0; i < 16; i++)
xd->mode_info_context->bmi[i] = xd->block[i].bmi;
// adjust to the next column of macroblocks // adjust to the next column of macroblocks
x->src.y_buffer += 16; x->src.y_buffer += 16;
x->src.u_buffer += 8; x->src.u_buffer += 8;
...@@ -457,6 +453,9 @@ void vp8cx_init_mbrthread_data(VP8_COMP *cpi, ...@@ -457,6 +453,9 @@ void vp8cx_init_mbrthread_data(VP8_COMP *cpi,
setup_mbby_copy(&mbr_ei[i].mb, x); setup_mbby_copy(&mbr_ei[i].mb, x);
mbd->fullpixel_mask = 0xffffffff;
if(cm->full_pixel)
mbd->fullpixel_mask = 0xfffffff8;
} }
} }
......
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