ref: 385bea686b1f90789de92a5d39c61e9c68197622
parent: bbe1c9257f7e2535226cf394b58274822025e32f
parent: bc45f2319299913cce714be97db8297ca6ee639e
author: Jim Bankoski <jimbankoski@google.com>
date: Fri Jan 11 12:06:26 EST 2013
Merge "Upstream changes from Chromium Android Clang build." into experimental
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -3466,7 +3466,7 @@
/* Note that we should not throw out a key frame (especially when
* spatial resampling is enabled).
*/
- if ((cm->frame_type == KEY_FRAME))
+ if (cm->frame_type == KEY_FRAME)
{cpi->decimation_count = cpi->decimation_factor;
}
--- a/vp8/vp8_cx_iface.c
+++ b/vp8/vp8_cx_iface.c
@@ -1178,7 +1178,9 @@
{int res;
vpx_scaling_mode_t scalemode = *(vpx_scaling_mode_t *)data ;
- res = vp8_set_internal_size(ctx->cpi, scalemode.h_scaling_mode, scalemode.v_scaling_mode);
+ res = vp8_set_internal_size(ctx->cpi,
+ (VPX_SCALING)scalemode.h_scaling_mode,
+ (VPX_SCALING)scalemode.v_scaling_mode);
if (!res)
{--- a/vp9/vp9_dx_iface.c
+++ b/vp9/vp9_dx_iface.c
@@ -573,7 +573,8 @@
image2yuvconfig(&frame->img, &sd);
- return vp9_set_reference_dec(ctx->pbi, frame->frame_type, &sd);
+ return vp9_set_reference_dec(ctx->pbi,
+ (VP9_REFFRAME)frame->frame_type, &sd);
} else
return VPX_CODEC_INVALID_PARAM;
@@ -591,7 +592,8 @@
image2yuvconfig(&frame->img, &sd);
- return vp9_get_reference_dec(ctx->pbi, frame->frame_type, &sd);
+ return vp9_get_reference_dec(ctx->pbi,
+ (VP9_REFFRAME)frame->frame_type, &sd);
} else
return VPX_CODEC_INVALID_PARAM;
--
⑨