ref: 5e9c5dfdf04adef6b42abeff2ff2a902600dfbaf
parent: 6e4b73125b6be8d6b935f2390994c38e6a818d1c
parent: 6c6eb16bb9979eb00b293713524c317facda1e80
author: Johann Koenig <johannkoenig@google.com>
date: Thu Jun 23 13:55:34 EDT 2016
Merge changes Ifddff89d,I827dfe59,Idca7ef45 * changes: vp8 machine setup: mark unused variable vp8 realtime encoder: mark unused variable vp8 error concealment: remove unused variables
--- a/vp8/common/generic/systemdependent.c
+++ b/vp8/common/generic/systemdependent.c
@@ -94,6 +94,8 @@
{#if CONFIG_MULTITHREAD
ctx->processor_core_count = get_cpu_count();
+#else
+ (void)ctx;
#endif /* CONFIG_MULTITHREAD */
#if ARCH_ARM
--- a/vp8/decoder/decodeframe.c
+++ b/vp8/decoder/decodeframe.c
@@ -144,9 +144,7 @@
*/
pbi->frame_corrupt_residual = 1;
memset(xd->qcoeff, 0, sizeof(xd->qcoeff));
- vp8_conceal_corrupt_mb(xd);
-
corruption_detected = 1;
/* force idct to be skipped for B_PRED and use the
@@ -625,8 +623,7 @@
*/
vp8_interpolate_motion(xd,
mb_row, mb_col,
- pc->mb_rows, pc->mb_cols,
- pc->mode_info_stride);
+ pc->mb_rows, pc->mb_cols);
}
}
#endif
--- a/vp8/decoder/error_concealment.c
+++ b/vp8/decoder/error_concealment.c
@@ -558,8 +558,7 @@
void vp8_interpolate_motion(MACROBLOCKD *mb,
int mb_row, int mb_col,
- int mb_rows, int mb_cols,
- int mi_stride)
+ int mb_rows, int mb_cols)
{/* Find relevant neighboring blocks */
EC_BLOCK neighbors[NUM_NEIGHBORS];
@@ -584,14 +583,4 @@
mb->mode_info_context->mbmi.uv_mode = DC_PRED;
mb->mode_info_context->mbmi.partitioning = 3;
mb->mode_info_context->mbmi.segment_id = 0;
-}
-
-void vp8_conceal_corrupt_mb(MACROBLOCKD *xd)
-{- /* This macroblock has corrupt residual, use the motion compensated
- image (predictor) for concealment */
-
- /* The build predictor functions now output directly into the dst buffer,
- * so the copies are no longer necessary */
-
}
--- a/vp8/decoder/error_concealment.h
+++ b/vp8/decoder/error_concealment.h
@@ -34,13 +34,7 @@
* (mb_row, mb_col). */
void vp8_interpolate_motion(MACROBLOCKD *mb,
int mb_row, int mb_col,
- int mb_rows, int mb_cols,
- int mi_stride);
-
-/* Conceal a macroblock with corrupt residual.
- * Copies the prediction signal to the reconstructed image.
- */
-void vp8_conceal_corrupt_mb(MACROBLOCKD *xd);
+ int mb_rows, int mb_cols);
#ifdef __cplusplus
} // extern "C"
--- a/vp8/decoder/threading.c
+++ b/vp8/decoder/threading.c
@@ -136,9 +136,7 @@
*/
pbi->frame_corrupt_residual = 1;
memset(xd->qcoeff, 0, sizeof(xd->qcoeff));
- vp8_conceal_corrupt_mb(xd);
-
corruption_detected = 1;
/* force idct to be skipped for B_PRED and use the
@@ -447,8 +445,7 @@
*/
vp8_interpolate_motion(xd,
mb_row, mb_col,
- pc->mb_rows, pc->mb_cols,
- pc->mode_info_stride);
+ pc->mb_rows, pc->mb_cols);
}
}
#endif
--- a/vp8/vp8_cx_iface.c
+++ b/vp8/vp8_cx_iface.c
@@ -783,6 +783,7 @@
}
#else
+ (void)duration;
new_qc = MODE_REALTIME;
#endif