Merge "fix a bug related to gf_active_flags in multi-threaded encoder"

1bcf4e66 · Yaowu Xu · Code Review · 814532a3 · 89c6017c · 1bcf4e66
Commit 1bcf4e66 authored 13 years ago by Yaowu Xu Committed by Code Review 13 years ago
--- a/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@ -830,6 +830,7 @@ void vp8_encode_frame(VP8_COMP *cpi)
                xd->mode_info_context += xd->mode_info_stride * cpi->encoding_thread_count;
                x->partition_info  += xd->mode_info_stride * cpi->encoding_thread_count;
+                x->gf_active_ptr   += cm->mb_cols * cpi->encoding_thread_count;
            }

--- a/vp8/encoder/ethreading.c
+++ b/vp8/encoder/ethreading.c
@@ -264,6 +264,7 @@ THREAD_FUNCTION thread_encoding_proc(void *p_data)
                xd->mode_info_context += xd->mode_info_stride * cpi->encoding_thread_count;
                x->partition_info += xd->mode_info_stride * cpi->encoding_thread_count;
+                x->gf_active_ptr   += cm->mb_cols * cpi->encoding_thread_count;
                if (mb_row == cm->mb_rows - 1)
                {