diff options
| author | Johann <johannkoenig@google.com> | 2016-06-22 17:33:45 -0700 |
|---|---|---|
| committer | Johann <johannkoenig@google.com> | 2016-06-22 18:29:03 -0700 |
| commit | 55f3740d7615706c2a0c96d4407977097520f30f (patch) | |
| tree | 67e05a2061495468bf2430ef7e67306f60ba45f0 /vp8/decoder | |
| parent | b2597527a5364338f997c62e874083efcbef2f8a (diff) | |
| download | libvpx-55f3740d7615706c2a0c96d4407977097520f30f.tar libvpx-55f3740d7615706c2a0c96d4407977097520f30f.tar.gz libvpx-55f3740d7615706c2a0c96d4407977097520f30f.tar.bz2 libvpx-55f3740d7615706c2a0c96d4407977097520f30f.zip | |
vp8 error concealment: remove unused variables
vp8_conceal_corrupt_mb is an empty function. Remove it entirely.
Cleans up -Wextra warnings:
unused parameter 'mi_stride' [-Wunused-parameter]
unused parameter 'xd' [-Wunused-parameter]
Change-Id: Idca7ef4508fae2b4b76a40d44507522a72ccc2c8
Diffstat (limited to 'vp8/decoder')
| -rw-r--r-- | vp8/decoder/decodeframe.c | 5 | ||||
| -rw-r--r-- | vp8/decoder/error_concealment.c | 13 | ||||
| -rw-r--r-- | vp8/decoder/error_concealment.h | 8 | ||||
| -rw-r--r-- | vp8/decoder/threading.c | 5 |
4 files changed, 4 insertions, 27 deletions
diff --git a/vp8/decoder/decodeframe.c b/vp8/decoder/decodeframe.c index 566972ea7..51acdbb9c 100644 --- a/vp8/decoder/decodeframe.c +++ b/vp8/decoder/decodeframe.c @@ -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 diff --git a/vp8/decoder/error_concealment.c b/vp8/decoder/error_concealment.c index fbfae61e7..a73813fc0 100644 --- a/vp8/decoder/error_concealment.c +++ b/vp8/decoder/error_concealment.c @@ -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 */ - -} diff --git a/vp8/decoder/error_concealment.h b/vp8/decoder/error_concealment.h index 9a1e02486..b6b49725b 100644 --- a/vp8/decoder/error_concealment.h +++ b/vp8/decoder/error_concealment.h @@ -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" diff --git a/vp8/decoder/threading.c b/vp8/decoder/threading.c index 97979e3b2..3c1b8387e 100644 --- a/vp8/decoder/threading.c +++ b/vp8/decoder/threading.c @@ -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 |