shithub: libvpx

Info  •  Files  •  Log  •  Branches

Upstream changes from Chromium Android Clang build.

See https://codereview.chromium.org/11875006/

Change-Id: Ied2a17df2b3222635f84aef120eaa9feb53750d2

--- 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;

-- 

⑨