* changes: vp8 machine setup: mark unused variable vp8 realtime encoder: mark unused variable vp8 error concealment: remove unused variables
Unified · Split
| @@ -94,6 +94,8 @@ void vp8_machine_specific_config(VP8_COMMON *ctx) · 93 unmodified lines | |||
| 94 | { | 94 | { |
| 95 | #if CONFIG_MULTITHREAD | 95 | #if CONFIG_MULTITHREAD |
| 96 | ctx->processor_core_count = get_cpu_count(); | 96 | ctx->processor_core_count = get_cpu_count(); |
| 97 | #else | ||
| 98 | (void)ctx; | ||
| 97 | #endif /* CONFIG_MULTITHREAD */ | 99 | #endif /* CONFIG_MULTITHREAD */ |
| 98 | 100 | ||
| 99 | #if ARCH_ARM | 101 | #if ARCH_ARM |
| @@ -144,8 +144,6 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, · 143 unmodified lines | |||
| 144 | */ | 144 | */ |
| 145 | pbi->frame_corrupt_residual = 1; | 145 | pbi->frame_corrupt_residual = 1; |
| 146 | memset(xd->qcoeff, 0, sizeof(xd->qcoeff)); | 146 | memset(xd->qcoeff, 0, sizeof(xd->qcoeff)); |
| 147 | vp8_conceal_corrupt_mb(xd); | ||
| 148 | |||
| 149 | 147 | ||
| 150 | corruption_detected = 1; | 148 | corruption_detected = 1; |
| 151 | 149 | ||
| @@ -625,8 +623,7 @@ static void decode_mb_rows(VP8D_COMP *pbi) · 473 unmodified lines | |||
| 625 | */ | 623 | */ |
| 626 | vp8_interpolate_motion(xd, | 624 | vp8_interpolate_motion(xd, |
| 627 | mb_row, mb_col, | 625 | mb_row, mb_col, |
| 628 | pc->mb_rows, pc->mb_cols, | 626 | pc->mb_rows, pc->mb_cols); |
| 629 | pc->mode_info_stride); | ||
| 630 | } | 627 | } |
| 631 | } | 628 | } |
| 632 | #endif | 629 | #endif |
| @@ -558,8 +558,7 @@ static void interpolate_mvs(MACROBLOCKD *mb, · 557 unmodified lines | |||
| 558 | 558 | ||
| 559 | void vp8_interpolate_motion(MACROBLOCKD *mb, | 559 | void vp8_interpolate_motion(MACROBLOCKD *mb, |
| 560 | int mb_row, int mb_col, | 560 | int mb_row, int mb_col, |
| 561 | int mb_rows, int mb_cols, | 561 | int mb_rows, int mb_cols) |
| 562 | int mi_stride) | ||
| 563 | { | 562 | { |
| 564 | /* Find relevant neighboring blocks */ | 563 | /* Find relevant neighboring blocks */ |
| 565 | EC_BLOCK neighbors[NUM_NEIGHBORS]; | 564 | EC_BLOCK neighbors[NUM_NEIGHBORS]; |
| @@ -585,13 +584,3 @@ void vp8_interpolate_motion(MACROBLOCKD *mb, · 19 unmodified lines | |||
| 585 | mb->mode_info_context->mbmi.partitioning = 3; | 584 | mb->mode_info_context->mbmi.partitioning = 3; |
| 586 | mb->mode_info_context->mbmi.segment_id = 0; | 585 | mb->mode_info_context->mbmi.segment_id = 0; |
| 587 | } | 586 | } |
| 588 | |||
| 589 | void vp8_conceal_corrupt_mb(MACROBLOCKD *xd) | ||
| 590 | { | ||
| 591 | /* This macroblock has corrupt residual, use the motion compensated | ||
| 592 | image (predictor) for concealment */ | ||
| 593 | |||
| 594 | /* The build predictor functions now output directly into the dst buffer, | ||
| 595 | * so the copies are no longer necessary */ | ||
| 596 | |||
| 597 | } | ||
| @@ -34,13 +34,7 @@ void vp8_estimate_missing_mvs(VP8D_COMP *pbi); · 33 unmodified lines | |||
| 34 | * (mb_row, mb_col). */ | 34 | * (mb_row, mb_col). */ |
| 35 | void vp8_interpolate_motion(MACROBLOCKD *mb, | 35 | void vp8_interpolate_motion(MACROBLOCKD *mb, |
| 36 | int mb_row, int mb_col, | 36 | int mb_row, int mb_col, |
| 37 | int mb_rows, int mb_cols, | 37 | int mb_rows, int mb_cols); |
| 38 | int mi_stride); | ||
| 39 | |||
| 40 | /* Conceal a macroblock with corrupt residual. | ||
| 41 | * Copies the prediction signal to the reconstructed image. | ||
| 42 | */ | ||
| 43 | void vp8_conceal_corrupt_mb(MACROBLOCKD *xd); | ||
| 44 | 38 | ||
| 45 | #ifdef __cplusplus | 39 | #ifdef __cplusplus |
| 46 | } // extern "C" | 40 | } // extern "C" |
| @@ -136,8 +136,6 @@ static void mt_decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, · 135 unmodified lines | |||
| 136 | */ | 136 | */ |
| 137 | pbi->frame_corrupt_residual = 1; | 137 | pbi->frame_corrupt_residual = 1; |
| 138 | memset(xd->qcoeff, 0, sizeof(xd->qcoeff)); | 138 | memset(xd->qcoeff, 0, sizeof(xd->qcoeff)); |
| 139 | vp8_conceal_corrupt_mb(xd); | ||
| 140 | |||
| 141 | 139 | ||
| 142 | corruption_detected = 1; | 140 | corruption_detected = 1; |
| 143 | 141 | ||
| @@ -447,8 +445,7 @@ static void mt_decode_mb_rows(VP8D_COMP *pbi, MACROBLOCKD *xd, int start_mb_row) · 303 unmodified lines | |||
| 447 | */ | 445 | */ |
| 448 | vp8_interpolate_motion(xd, | 446 | vp8_interpolate_motion(xd, |
| 449 | mb_row, mb_col, | 447 | mb_row, mb_col, |
| 450 | pc->mb_rows, pc->mb_cols, | 448 | pc->mb_rows, pc->mb_cols); |
| 451 | pc->mode_info_stride); | ||
| 452 | } | 449 | } |
| 453 | } | 450 | } |
| 454 | #endif | 451 | #endif |
| @@ -783,6 +783,7 @@ static void pick_quickcompress_mode(vpx_codec_alg_priv_t *ctx, · 782 unmodified lines | |||
| 783 | } | 783 | } |
| 784 | 784 | ||
| 785 | #else | 785 | #else |
| 786 | (void)duration; | ||
| 786 | new_qc = MODE_REALTIME; | 787 | new_qc = MODE_REALTIME; |
| 787 | #endif | 788 | #endif |
| 788 | 789 | ||