Additional warning message cleanup.
Change-Id: I429a97ac57db3de0bf67ce3f3fe0c6b409f77a9e
This commit is contained in:
@@ -937,6 +937,8 @@ static void read_mb_modes_mv(VP9D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi,
|
||||
|
||||
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);
|
||||
|
@@ -38,7 +38,7 @@
|
||||
#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"
|
||||
@@ -4153,7 +4153,7 @@ int vp9_get_compressed_data(VP9_PTR ptr, unsigned int *frame_flags,
|
||||
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;
|
||||
|
@@ -164,7 +164,6 @@ void vp9_choose_segmap_coding_method(VP9_COMP *cpi) {
|
||||
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;
|
||||
@@ -183,6 +182,10 @@ void vp9_choose_segmap_coding_method(VP9_COMP *cpi) {
|
||||
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
|
||||
vpx_memset(xd->mb_segment_tree_probs, 255,
|
||||
|
@@ -391,7 +391,7 @@ static void temporal_filter_iterate_c
|
||||
mbd->pre.v_buffer = v_buffer;
|
||||
}
|
||||
|
||||
void vp9_temporal_filter_prepare_c
|
||||
void vp9_temporal_filter_prepare
|
||||
(
|
||||
VP9_COMP *cpi,
|
||||
int distance
|
||||
|
16
vp9/encoder/vp9_temporal_filter.h
Normal file
16
vp9/encoder/vp9_temporal_filter.h
Normal file
@@ -0,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
|
Reference in New Issue
Block a user