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 573 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
584 (unsigned char)(2 + vp8_read(r, x->mb_segment_tree_probs[2])); | 584 (unsigned char)(2 + vp8_read(r, x->mb_segment_tree_probs[2])); |
585 else | 585 else |
586 mi->segment_id = | 586 mi->segment_id = |
587 (unsigned char)(vp8_read(r, x->mb_segment_tree_probs[1])); | 587 (unsigned char)(vp8_read(r, x->mb_segment_tree_probs[1])); |
588 } | 588 } |
589 } | 589 } |
590 | 590 |
591 static void decode_mb_mode_mvs(VP8D_COMP *pbi, MODE_INFO *mi, | 591 static void decode_mb_mode_mvs(VP8D_COMP *pbi, MODE_INFO *mi, |
592 MB_MODE_INFO *mbmi) | 592 MB_MODE_INFO *mbmi) |
593 { | 593 { |
| 594 (void)mbmi; |
| 595 |
594 /* Read the Macroblock segmentation map if it is being updated explicitly | 596 /* Read the Macroblock segmentation map if it is being updated explicitly |
595 * this frame (reset to 0 above by default) | 597 * this frame (reset to 0 above by default) |
596 * By default on a key frame reset all MBs to segment 0 | 598 * By default on a key frame reset all MBs to segment 0 |
597 */ | 599 */ |
598 if (pbi->mb.update_mb_segmentation_map) | 600 if (pbi->mb.update_mb_segmentation_map) |
599 read_mb_features(&pbi->mbc[8], &mi->mbmi, &pbi->mb); | 601 read_mb_features(&pbi->mbc[8], &mi->mbmi, &pbi->mb); |
600 else if(pbi->common.frame_type == KEY_FRAME) | 602 else if(pbi->common.frame_type == KEY_FRAME) |
601 mi->mbmi.segment_id = 0; | 603 mi->mbmi.segment_id = 0; |
602 | 604 |
603 /* Read the macroblock coeff skip flag if this feature is in use, | 605 /* Read the macroblock coeff skip flag if this feature is in use, |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
659 pbi->mb.mb_to_left_edge -= (16 << 3); | 661 pbi->mb.mb_to_left_edge -= (16 << 3); |
660 pbi->mb.mb_to_right_edge -= (16 << 3); | 662 pbi->mb.mb_to_right_edge -= (16 << 3); |
661 mi++; /* next macroblock */ | 663 mi++; /* next macroblock */ |
662 } | 664 } |
663 pbi->mb.mb_to_top_edge -= (16 << 3); | 665 pbi->mb.mb_to_top_edge -= (16 << 3); |
664 pbi->mb.mb_to_bottom_edge -= (16 << 3); | 666 pbi->mb.mb_to_bottom_edge -= (16 << 3); |
665 | 667 |
666 mi++; /* skip left predictor each row */ | 668 mi++; /* skip left predictor each row */ |
667 } | 669 } |
668 } | 670 } |
OLD | NEW |