generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge changes Ifddff89d,I827dfe59,Idca7ef45

Browse Source 
* changes:
  vp8 machine setup: mark unused variable
  vp8 realtime encoder: mark unused variable
  vp8 error concealment: remove unused variables
This commit is contained in:
Johann Koenig
2016-06-23 17:55:34 +00:00
committed by Gerrit Code Review
parent 6e4b73125b 6c6eb16bb9
commit 5e9c5dfdf0
6 changed files with 7 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vp8/common/generic/systemdependent.c
View File

@@ -94,6 +94,8 @@ void vp8_machine_specific_config(VP8_COMMON *ctx)
{
#if CONFIG_MULTITHREAD
ctx->processor_core_count = get_cpu_count();
#else
(void)ctx;
#endif /* CONFIG_MULTITHREAD */
#if ARCH_ARM

5
vp8/decoder/decodeframe.c
View File

@@ -144,8 +144,6 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd,
*/
pbi->frame_corrupt_residual = 1;
memset(xd->qcoeff, 0, sizeof(xd->qcoeff));
vp8_conceal_corrupt_mb(xd);
corruption_detected = 1;
@@ -625,8 +623,7 @@ static void decode_mb_rows(VP8D_COMP *pbi)
*/
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

13
vp8/decoder/error_concealment.c
View File

@@ -558,8 +558,7 @@ static void interpolate_mvs(MACROBLOCKD *mb,
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];
@@ -585,13 +584,3 @@ void vp8_interpolate_motion(MACROBLOCKD *mb,
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 */
}

8
vp8/decoder/error_concealment.h
View File

@@ -34,13 +34,7 @@ void vp8_estimate_missing_mvs(VP8D_COMP *pbi);
* (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"

5
vp8/decoder/threading.c
View File

@@ -136,8 +136,6 @@ static void mt_decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd,
*/
pbi->frame_corrupt_residual = 1;
memset(xd->qcoeff, 0, sizeof(xd->qcoeff));
vp8_conceal_corrupt_mb(xd);
corruption_detected = 1;
@@ -447,8 +445,7 @@ static void mt_decode_mb_rows(VP8D_COMP *pbi, MACROBLOCKD *xd, int start_mb_row)
*/
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

1
vp8/vp8_cx_iface.c
View File

@@ -783,6 +783,7 @@ static void pick_quickcompress_mode(vpx_codec_alg_priv_t *ctx,
}
#else
(void)duration;
new_qc = MODE_REALTIME;
#endif