diff options
| author | Alex Converse <aconverse@google.com> | 2016-05-18 21:20:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-05-18 21:20:04 +0000 |
| commit | 284be1c9e033375affa3ff94681f63bdc88dfaf2 (patch) | |
| tree | c18216b97dc73609e606178075af553024b49f04 /vp9/decoder | |
| parent | 36b610d8c13da6a008c344ded6b7c524bfbfc91b (diff) | |
| parent | a5191f3e60a21df728414151919e6ebbf9ce37b6 (diff) | |
| download | libvpx-284be1c9e033375affa3ff94681f63bdc88dfaf2.tar libvpx-284be1c9e033375affa3ff94681f63bdc88dfaf2.tar.gz libvpx-284be1c9e033375affa3ff94681f63bdc88dfaf2.tar.bz2 libvpx-284be1c9e033375affa3ff94681f63bdc88dfaf2.zip | |
Merge "Move, rename, and inline high_inter_predictor."
Diffstat (limited to 'vp9/decoder')
| -rw-r--r-- | vp9/decoder/vp9_decodeframe.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index 2c2c0ba84..4d6f21ceb 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -525,8 +525,8 @@ static void extend_and_predict(const uint8_t *buf_ptr1, int pre_buf_stride, } if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) { - high_inter_predictor(buf_ptr, b_w, dst, dst_buf_stride, subpel_x, - subpel_y, sf, w, h, ref, kernel, xs, ys, xd->bd); + highbd_inter_predictor(buf_ptr, b_w, dst, dst_buf_stride, subpel_x, + subpel_y, sf, w, h, ref, kernel, xs, ys, xd->bd); } else { inter_predictor(buf_ptr, b_w, dst, dst_buf_stride, subpel_x, subpel_y, sf, w, h, ref, kernel, xs, ys); @@ -699,8 +699,8 @@ static void dec_build_inter_predictors(VPxWorker *const worker, MACROBLOCKD *xd, } #if CONFIG_VP9_HIGHBITDEPTH if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) { - high_inter_predictor(buf_ptr, buf_stride, dst, dst_buf->stride, subpel_x, - subpel_y, sf, w, h, ref, kernel, xs, ys, xd->bd); + highbd_inter_predictor(buf_ptr, buf_stride, dst, dst_buf->stride, subpel_x, + subpel_y, sf, w, h, ref, kernel, xs, ys, xd->bd); } else { inter_predictor(buf_ptr, buf_stride, dst, dst_buf->stride, subpel_x, subpel_y, sf, w, h, ref, kernel, xs, ys); |