| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved. | 2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 pbi->mt_current_mb_col[i] = -1; | 89 pbi->mt_current_mb_col[i] = -1; |
| 90 } | 90 } |
| 91 | 91 |
| 92 static void mt_decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, | 92 static void mt_decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, |
| 93 unsigned int mb_idx) | 93 unsigned int mb_idx) |
| 94 { | 94 { |
| 95 MB_PREDICTION_MODE mode; | 95 MB_PREDICTION_MODE mode; |
| 96 int i; | 96 int i; |
| 97 #if CONFIG_ERROR_CONCEALMENT | 97 #if CONFIG_ERROR_CONCEALMENT |
| 98 int corruption_detected = 0; | 98 int corruption_detected = 0; |
| 99 #else |
| 100 (void)mb_idx; |
| 99 #endif | 101 #endif |
| 100 | 102 |
| 101 if (xd->mode_info_context->mbmi.mb_skip_coeff) | 103 if (xd->mode_info_context->mbmi.mb_skip_coeff) |
| 102 { | 104 { |
| 103 vp8_reset_mb_tokens_context(xd); | 105 vp8_reset_mb_tokens_context(xd); |
| 104 } | 106 } |
| 105 else if (!vp8dx_bool_error(xd->current_bc)) | 107 else if (!vp8dx_bool_error(xd->current_bc)) |
| 106 { | 108 { |
| 107 int eobtotal; | 109 int eobtotal; |
| 108 eobtotal = vp8_decode_mb_tokens(pbi, xd); | 110 eobtotal = vp8_decode_mb_tokens(pbi, xd); |
| (...skipping 792 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 901 | 903 |
| 902 setup_decoding_thread_data(pbi, xd, pbi->mb_row_di, pbi->decoding_thread_cou
nt); | 904 setup_decoding_thread_data(pbi, xd, pbi->mb_row_di, pbi->decoding_thread_cou
nt); |
| 903 | 905 |
| 904 for (i = 0; i < pbi->decoding_thread_count; i++) | 906 for (i = 0; i < pbi->decoding_thread_count; i++) |
| 905 sem_post(&pbi->h_event_start_decoding[i]); | 907 sem_post(&pbi->h_event_start_decoding[i]); |
| 906 | 908 |
| 907 mt_decode_mb_rows(pbi, xd, 0); | 909 mt_decode_mb_rows(pbi, xd, 0); |
| 908 | 910 |
| 909 sem_wait(&pbi->h_event_end_decoding); /* add back for each frame */ | 911 sem_wait(&pbi->h_event_end_decoding); /* add back for each frame */ |
| 910 } | 912 } |
| OLD | NEW |