diff options
| author | Deb Mukherjee <debargha@google.com> | 2014-10-15 10:01:34 -0700 |
|---|---|---|
| committer | Deb Mukherjee <debargha@google.com> | 2014-10-15 10:01:34 -0700 |
| commit | 23fc1f731067c075ecb109c4faee364db8f23c2d (patch) | |
| tree | 29773170d7445ca1db235dd4a7dd503e7f81202e | |
| parent | 2040bb58fbec7d06d5bdb1f6628bb058d3132ebf (diff) | |
| download | libvpx-23fc1f731067c075ecb109c4faee364db8f23c2d.tar libvpx-23fc1f731067c075ecb109c4faee364db8f23c2d.tar.gz libvpx-23fc1f731067c075ecb109c4faee364db8f23c2d.tar.bz2 libvpx-23fc1f731067c075ecb109c4faee364db8f23c2d.zip | |
Fix in bit-shift operation for highbitdepth decode
Fixes a bug introduced in a previous refactoring patch.
Change-Id: I243e74637cfd7a997c7a1fef03b06c290dd0dee6
| -rw-r--r-- | tools_common.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tools_common.c b/tools_common.c index 30fd35205..e243a9157 100644 --- a/tools_common.c +++ b/tools_common.c @@ -276,7 +276,7 @@ static void highbd_img_upshift(vpx_image_t *dst, vpx_image_t *src, // Note the offset is 1 less than half. const int offset = input_shift > 0 ? (1 << (input_shift - 1)) - 1 : 0; int plane; - if (dst->w != src->w || dst->h != src->h || + if (dst->d_w != src->d_w || dst->d_h != src->d_h || dst->x_chroma_shift != src->x_chroma_shift || dst->y_chroma_shift != src->y_chroma_shift || dst->fmt != src->fmt || input_shift < 0) { @@ -293,12 +293,12 @@ static void highbd_img_upshift(vpx_image_t *dst, vpx_image_t *src, break; } for (plane = 0; plane < 3; plane++) { - int w = src->w; - int h = src->h; + int w = src->d_w; + int h = src->d_h; int x, y; if (plane) { - w >>= src->x_chroma_shift; - h >>= src->y_chroma_shift; + w = (w + src->x_chroma_shift) >> src->x_chroma_shift; + h = (h + src->y_chroma_shift) >> src->y_chroma_shift; } for (y = 0; y < h; y++) { uint16_t *p_src = @@ -316,7 +316,7 @@ static void lowbd_img_upshift(vpx_image_t *dst, vpx_image_t *src, // Note the offset is 1 less than half. const int offset = input_shift > 0 ? (1 << (input_shift - 1)) - 1 : 0; int plane; - if (dst->w != src->w || dst->h != src->h || + if (dst->d_w != src->d_w || dst->d_h != src->d_h || dst->x_chroma_shift != src->x_chroma_shift || dst->y_chroma_shift != src->y_chroma_shift || dst->fmt != src->fmt + VPX_IMG_FMT_HIGHBITDEPTH || @@ -334,8 +334,8 @@ static void lowbd_img_upshift(vpx_image_t *dst, vpx_image_t *src, break; } for (plane = 0; plane < 3; plane++) { - int w = src->w; - int h = src->h; + int w = src->d_w; + int h = src->d_h; int x, y; if (plane) { w = (w + src->x_chroma_shift) >> src->x_chroma_shift; @@ -384,8 +384,8 @@ void vpx_img_truncate_16_to_8(vpx_image_t *dst, vpx_image_t *src) { int h = src->d_h; int x, y; if (plane) { - w >>= src->x_chroma_shift; - h >>= src->y_chroma_shift; + w = (w + src->x_chroma_shift) >> src->x_chroma_shift; + h = (h + src->y_chroma_shift) >> src->y_chroma_shift; } for (y = 0; y < h; y++) { uint16_t *p_src = |