ref: 815734e5fb2693f10d6e9bf53ce5d68c9707d460
parent: 1c75e77b6d58b09b59a6cd02a4e9443542f388ef
author: Paul Wilkins <paulwilkins@google.com>
date: Thu Mar 21 14:37:48 EDT 2013
Minor code clean up Change-Id: Ifa864e0acb253b238b03cdeed0fe5d6ee30a45d8
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -2090,9 +2090,11 @@
else
cpi->zbin_mode_boost = LF_ZEROMV_ZBIN_BOOST;
} else if (mbmi->mode == SPLITMV)
- cpi->zbin_mode_boost = 0;
+ cpi->zbin_mode_boost = SPLIT_MV_ZBIN_BOOST;
else
cpi->zbin_mode_boost = MV_ZBIN_BOOST;
+ } else {
+ cpi->zbin_mode_boost = INTRA_ZBIN_BOOST;
}
}
@@ -2346,9 +2348,11 @@
else
cpi->zbin_mode_boost = LF_ZEROMV_ZBIN_BOOST;
} else if (xd->mode_info_context->mbmi.mode == SPLITMV)
- cpi->zbin_mode_boost = 0;
+ cpi->zbin_mode_boost = SPLIT_MV_ZBIN_BOOST;
else
cpi->zbin_mode_boost = MV_ZBIN_BOOST;
+ } else {
+ cpi->zbin_mode_boost = INTRA_ZBIN_BOOST;
}
}
@@ -2565,10 +2569,12 @@
else
cpi->zbin_mode_boost = LF_ZEROMV_ZBIN_BOOST;
} else if (xd->mode_info_context->mbmi.mode == SPLITMV) {
- cpi->zbin_mode_boost = 0;
+ cpi->zbin_mode_boost = SPLIT_MV_ZBIN_BOOST;
} else {
cpi->zbin_mode_boost = MV_ZBIN_BOOST;
}
+ } else {
+ cpi->zbin_mode_boost = INTRA_ZBIN_BOOST;
}
}
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -342,9 +342,7 @@
vp8_yv12_de_alloc_frame_buffer(&cpi->last_frame_uf);
vp8_yv12_de_alloc_frame_buffer(&cpi->scaled_source);
-#if VP9_TEMPORAL_ALT_REF
vp8_yv12_de_alloc_frame_buffer(&cpi->alt_ref_buffer);
-#endif
vp9_lookahead_destroy(cpi->lookahead);
vpx_free(cpi->tok);
@@ -879,15 +877,11 @@
vpx_internal_error(&cpi->common.error, VPX_CODEC_MEM_ERROR,
"Failed to allocate lag buffers");
-#if VP9_TEMPORAL_ALT_REF
-
if (vp8_yv12_alloc_frame_buffer(&cpi->alt_ref_buffer,
cpi->oxcf.Width, cpi->oxcf.Height,
VP9BORDERINPIXELS))
vpx_internal_error(&cpi->common.error, VPX_CODEC_MEM_ERROR,
"Failed to allocate altref buffer");
-
-#endif
}
static int alloc_partition_data(VP9_COMP *cpi) {
@@ -1146,16 +1140,12 @@
set_tile_limits(cpi);
-#if VP9_TEMPORAL_ALT_REF
{
int i;
-
cpi->fixed_divide[0] = 0;
-
for (i = 1; i < 512; i++)
cpi->fixed_divide[i] = 0x80000 / i;
}
-#endif
}
--- a/vp9/encoder/vp9_onyx_int.h
+++ b/vp9/encoder/vp9_onyx_int.h
@@ -42,10 +42,6 @@
#define MAX_LAG_BUFFERS 25
-#define AF_THRESH 25
-#define AF_THRESH2 100
-#define ARF_DECAY_THRESH 12
-
#if CONFIG_COMP_INTERINTRA_PRED
#define MAX_MODES 54
#else
@@ -58,9 +54,9 @@
#define GF_ZEROMV_ZBIN_BOOST 12
#define LF_ZEROMV_ZBIN_BOOST 6
#define MV_ZBIN_BOOST 4
+#define SPLIT_MV_ZBIN_BOOST 0
+#define INTRA_ZBIN_BOOST 0
-#define VP9_TEMPORAL_ALT_REF 1
-
typedef struct {
nmv_context nmvc;
int nmvjointcost[MV_JOINTS];
@@ -625,11 +621,9 @@
double est_max_qcorrection_factor;
} twopass;
-#if VP9_TEMPORAL_ALT_REF
YV12_BUFFER_CONFIG alt_ref_buffer;
YV12_BUFFER_CONFIG *frames[MAX_LAG_BUFFERS];
int fixed_divide[512];
-#endif
#if CONFIG_INTERNAL_STATS
int count;
--- a/vp9/encoder/vp9_temporal_filter.c
+++ b/vp9/encoder/vp9_temporal_filter.c
@@ -32,9 +32,6 @@
#define ALT_REF_MC_ENABLED 1 // dis/enable MC in AltRef filtering
#define ALT_REF_SUBPEL_ENABLED 1 // dis/enable subpel in MC AltRef filtering
-#if VP9_TEMPORAL_ALT_REF
-
-
static void temporal_filter_predictors_mb_c(MACROBLOCKD *xd,
uint8_t *y_mb_ptr,
uint8_t *u_mb_ptr,
@@ -476,4 +473,3 @@
frames_to_blur_backward,
strength);
}
-#endif