aboutsummaryrefslogtreecommitdiff
path: root/vp9/encoder/vp9_encodemb.c
diff options
context:
space:
mode:
authorRanjit Kumar Tulabandu <ranjit.tulabandu@ittiam.com>2016-12-27 18:45:43 +0530
committerYunqing Wang <yunqingwang@google.com>2017-01-24 15:48:02 -0800
commit8b0c11c3588963fa02be0cad36a6a23cdb748cf9 (patch)
treea9dbfb4cc4adbfaea38f73ec4e73099642e58c25 /vp9/encoder/vp9_encodemb.c
parent91aa1fae2a88e0a125161dc1ec3f8f73c3508707 (diff)
downloadlibvpx-8b0c11c3588963fa02be0cad36a6a23cdb748cf9.tar.gz
Multi-threading of first pass stats collection
(yunqingwang) 1. Rebased the patch. Incorporated recent first pass changes. 2. Turned on the first pass unit test. Change-Id: Ia2f7ba8152d0b6dd6bf8efb9dfaf505ba7d8edee
Diffstat (limited to 'vp9/encoder/vp9_encodemb.c')
-rw-r--r--vp9/encoder/vp9_encodemb.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_encodemb.c b/vp9/encoder/vp9_encodemb.c
index 2cb137d8b..1dc8d34d5 100644
--- a/vp9/encoder/vp9_encodemb.c
+++ b/vp9/encoder/vp9_encodemb.c
@@ -773,9 +773,10 @@ void vp9_encode_block_intra(int plane, int block, int row, int col,
}
}
- vp9_predict_intra_block(xd, bwl, tx_size, mode, x->skip_encode ? src : dst,
- x->skip_encode ? src_stride : dst_stride, dst,
- dst_stride, col, row, plane);
+ vp9_predict_intra_block(
+ xd, bwl, tx_size, mode, (x->skip_encode || x->fp_src_pred) ? src : dst,
+ (x->skip_encode || x->fp_src_pred) ? src_stride : dst_stride, dst,
+ dst_stride, col, row, plane);
#if CONFIG_VP9_HIGHBITDEPTH
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {