shithub: libvpx

Info  •  Files  •  Log  •  Branches

Additional warning message cleanup.

Change-Id: I429a97ac57db3de0bf67ce3f3fe0c6b409f77a9e

--- a/vp9/decoder/vp9_decodemv.c

+++ b/vp9/decoder/vp9_decodemv.c

@@ -937,6 +937,8 @@

           leftmv.as_int = left_block_mv(mi, k);

           abovemv.as_int = above_block_mv(mi, k, mis);

+          second_leftmv.as_int = 0;

+          second_abovemv.as_int = 0;

           if (mbmi->second_ref_frame > 0) {

             second_leftmv.as_int = left_block_second_mv(mi, k);

             second_abovemv.as_int = above_block_second_mv(mi, k, mis);

--- a/vp9/encoder/vp9_onyx_if.c

+++ b/vp9/encoder/vp9_onyx_if.c

@@ -38,8 +38,8 @@

 #include "vp9/encoder/vp9_bitstream.h"

 #include "vp9/encoder/vp9_picklpf.h"

 #include "vp9/common/vp9_mvref_common.h"

+#include "vp9/encoder/vp9_temporal_filter.h"

-

 #if ARCH_ARM

 #include "vpx_ports/arm.h"

 #endif

@@ -4153,7 +4153,7 @@

                                           cpi->frames_till_gf_update_due))) {

       cpi->alt_ref_source = cpi->source;

       if (cpi->oxcf.arnr_max_frames > 0) {

-        vp9_temporal_filter_prepare_c(cpi, cpi->frames_till_gf_update_due);

+        vp9_temporal_filter_prepare(cpi, cpi->frames_till_gf_update_due);

         force_src_buffer = &cpi->alt_ref_buffer;

       }

       cm->frames_till_alt_ref_frame = cpi->frames_till_gf_update_due;

--- a/vp9/encoder/vp9_segmentation.c

+++ b/vp9/encoder/vp9_segmentation.c

@@ -164,7 +164,6 @@

   VP9_COMMON *const cm = &cpi->common;

   MACROBLOCKD *const xd = &cpi->mb.e_mbd;

-  const int mis = cm->mode_info_stride;

   int i;

   int tot_count;

   int no_pred_cost;

@@ -182,6 +181,10 @@

   vp9_prob no_pred_tree[MB_FEATURE_TREE_PROBS];

   vp9_prob t_pred_tree[MB_FEATURE_TREE_PROBS];

   vp9_prob t_nopred_prob[PREDICTION_PROBS];

+

+#if CONFIG_SUPERBLOCKS

+  const int mis = cm->mode_info_stride;

+#endif

   // Set default state for the segment tree probabilities and the

   // temporal coding probabilities

--- a/vp9/encoder/vp9_temporal_filter.c

+++ b/vp9/encoder/vp9_temporal_filter.c

@@ -391,7 +391,7 @@

   mbd->pre.v_buffer = v_buffer;

 }

-void vp9_temporal_filter_prepare_c

+void vp9_temporal_filter_prepare

 (

   VP9_COMP *cpi,

   int distance

--- /dev/null

+++ b/vp9/encoder/vp9_temporal_filter.h

@@ -1,0 +1,16 @@

+/*

+ *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.

+ *

+ *  Use of this source code is governed by a BSD-style license

+ *  that can be found in the LICENSE file in the root of the source

+ *  tree. An additional intellectual property rights grant can be found

+ *  in the file PATENTS.  All contributing project authors may

+ *  be found in the AUTHORS file in the root of the source tree.

+ */

+

+#ifndef __INC_VP9_TEMPORAL_FILTER_H

+#define __INC_VP9_TEMPORAL_FILTER_H

+

+extern void vp9_temporal_filter_prepare(VP9_COMP *cpi, int distance);

+

+#endif