generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Update highbd convolve functions arguments to use uint16_t src/dst"

Browse Source
This commit is contained in:
Linfeng Zhang
2017-04-26 15:50:45 +00:00
committed by Gerrit Code Review
parent 004fab120a 51dc998f3a
commit 54c4e0f7a5
14 changed files with 136 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
vp9/encoder/vp9_pickmode.c
View File

@@ -2079,10 +2079,9 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, TileDataEnc *tile_data,
#if CONFIG_VP9_HIGHBITDEPTH
if (cm->use_highbitdepth)
vpx_highbd_convolve_copy(
CAST_TO_BYTEPTR(CONVERT_TO_SHORTPTR(best_pred->data)),
best_pred->stride,
CAST_TO_BYTEPTR(CONVERT_TO_SHORTPTR(this_mode_pred->data)),
this_mode_pred->stride, NULL, 0, NULL, 0, bw, bh, xd->bd);
CONVERT_TO_SHORTPTR(best_pred->data), best_pred->stride,
CONVERT_TO_SHORTPTR(this_mode_pred->data), this_mode_pred->stride,
NULL, 0, NULL, 0, bw, bh, xd->bd);
else
vpx_convolve_copy(best_pred->data, best_pred->stride,
this_mode_pred->data, this_mode_pred->stride, NULL,
@@ -2190,10 +2189,9 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, TileDataEnc *tile_data,
#if CONFIG_VP9_HIGHBITDEPTH
if (cm->use_highbitdepth)
vpx_highbd_convolve_copy(
CAST_TO_BYTEPTR(CONVERT_TO_SHORTPTR(best_pred->data)),
best_pred->stride,
CAST_TO_BYTEPTR(CONVERT_TO_SHORTPTR(pd->dst.buf)), pd->dst.stride,
NULL, 0, NULL, 0, bw, bh, xd->bd);
CONVERT_TO_SHORTPTR(best_pred->data), best_pred->stride,
CONVERT_TO_SHORTPTR(pd->dst.buf), pd->dst.stride, NULL, 0, NULL, 0,
bw, bh, xd->bd);
else
vpx_convolve_copy(best_pred->data, best_pred->stride, pd->dst.buf,
pd->dst.stride, NULL, 0, NULL, 0, bw, bh);