| 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 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 275 cm->frame_to_show = &cm->yv12_fb[cm->new_fb_idx]; | 275 cm->frame_to_show = &cm->yv12_fb[cm->new_fb_idx]; |
| 276 | 276 |
| 277 cm->fb_idx_ref_cnt[cm->new_fb_idx]--; | 277 cm->fb_idx_ref_cnt[cm->new_fb_idx]--; |
| 278 | 278 |
| 279 return err; | 279 return err; |
| 280 } | 280 } |
| 281 | 281 |
| 282 int check_fragments_for_errors(VP8D_COMP *pbi) | 282 int check_fragments_for_errors(VP8D_COMP *pbi) |
| 283 { | 283 { |
| 284 if (!pbi->ec_active && | 284 if (!pbi->ec_active && |
| 285 pbi->num_fragments <= 1 && pbi->fragment_sizes[0] == 0) | 285 pbi->fragments.count <= 1 && pbi->fragments.sizes[0] == 0) |
| 286 { | 286 { |
| 287 VP8_COMMON *cm = &pbi->common; | 287 VP8_COMMON *cm = &pbi->common; |
| 288 | 288 |
| 289 /* If error concealment is disabled we won't signal missing frames | 289 /* If error concealment is disabled we won't signal missing frames |
| 290 * to the decoder. | 290 * to the decoder. |
| 291 */ | 291 */ |
| 292 if (cm->fb_idx_ref_cnt[cm->lst_fb_idx] > 1) | 292 if (cm->fb_idx_ref_cnt[cm->lst_fb_idx] > 1) |
| 293 { | 293 { |
| 294 /* The last reference shares buffer with another reference | 294 /* The last reference shares buffer with another reference |
| 295 * buffer. Move it to its own buffer before setting it as | 295 * buffer. Move it to its own buffer before setting it as |
| (...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 483 for (mb_col = 0; mb_col < oci->mb_cols; mb_col++,mi++) | 483 for (mb_col = 0; mb_col < oci->mb_cols; mb_col++,mi++) |
| 484 { | 484 { |
| 485 if( mi->mbmi.ref_frame == ref_frame) | 485 if( mi->mbmi.ref_frame == ref_frame) |
| 486 return 1; | 486 return 1; |
| 487 } | 487 } |
| 488 mi++; | 488 mi++; |
| 489 } | 489 } |
| 490 return 0; | 490 return 0; |
| 491 | 491 |
| 492 } | 492 } |
| OLD | NEW |