Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(295)

Side by Side Diff: source/libvpx/vp9/decoder/vp9_decodframe.c

Issue 12077018: libvpx: Pull from upstream (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « source/libvpx/vp8/vp8_dx_iface.c ('k') | source/libvpx/vp9/encoder/vp9_lookahead.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 666 matching lines...) Expand 10 before | Expand all | Expand 10 after
677 xd->dst.y_stride, xd->eobs, xd->block[24].diff, xd); 677 xd->dst.y_stride, xd->eobs, xd->block[24].diff, xd);
678 } 678 }
679 vp9_dequant_idct_add_uv_block_4x4_inplace_c( 679 vp9_dequant_idct_add_uv_block_4x4_inplace_c(
680 xd->qcoeff + 16 * 16, xd->block[16].dequant, 680 xd->qcoeff + 16 * 16, xd->block[16].dequant,
681 xd->dst.u_buffer + y_idx * 8 * xd->dst.uv_stride + x_idx * 8, 681 xd->dst.u_buffer + y_idx * 8 * xd->dst.uv_stride + x_idx * 8,
682 xd->dst.v_buffer + y_idx * 8 * xd->dst.uv_stride + x_idx * 8, 682 xd->dst.v_buffer + y_idx * 8 * xd->dst.uv_stride + x_idx * 8,
683 xd->dst.uv_stride, xd->eobs + 16, xd); 683 xd->dst.uv_stride, xd->eobs + 16, xd);
684 }; 684 };
685 685
686 static void decode_superblock64(VP9D_COMP *pbi, MACROBLOCKD *xd, 686 static void decode_superblock64(VP9D_COMP *pbi, MACROBLOCKD *xd,
687 int mb_row, unsigned int mb_col, 687 int mb_row, int mb_col,
688 BOOL_DECODER* const bc) { 688 BOOL_DECODER* const bc) {
689 int i, n, eobtotal; 689 int i, n, eobtotal;
690 TX_SIZE tx_size = xd->mode_info_context->mbmi.txfm_size; 690 TX_SIZE tx_size = xd->mode_info_context->mbmi.txfm_size;
691 VP9_COMMON *const pc = &pbi->common; 691 VP9_COMMON *const pc = &pbi->common;
692 MODE_INFO *orig_mi = xd->mode_info_context; 692 MODE_INFO *orig_mi = xd->mode_info_context;
693 const int mis = pc->mode_info_stride; 693 const int mis = pc->mode_info_stride;
694 694
695 assert(xd->mode_info_context->mbmi.sb_type == BLOCK_SIZE_SB64X64); 695 assert(xd->mode_info_context->mbmi.sb_type == BLOCK_SIZE_SB64X64);
696 696
697 if (pbi->common.frame_type != KEY_FRAME) 697 if (pbi->common.frame_type != KEY_FRAME)
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
803 } 803 }
804 } 804 }
805 } 805 }
806 806
807 xd->above_context = pc->above_context + mb_col; 807 xd->above_context = pc->above_context + mb_col;
808 xd->left_context = pc->left_context; 808 xd->left_context = pc->left_context;
809 xd->mode_info_context = orig_mi; 809 xd->mode_info_context = orig_mi;
810 } 810 }
811 811
812 static void decode_superblock32(VP9D_COMP *pbi, MACROBLOCKD *xd, 812 static void decode_superblock32(VP9D_COMP *pbi, MACROBLOCKD *xd,
813 int mb_row, unsigned int mb_col, 813 int mb_row, int mb_col,
814 BOOL_DECODER* const bc) { 814 BOOL_DECODER* const bc) {
815 int i, n, eobtotal; 815 int i, n, eobtotal;
816 TX_SIZE tx_size = xd->mode_info_context->mbmi.txfm_size; 816 TX_SIZE tx_size = xd->mode_info_context->mbmi.txfm_size;
817 VP9_COMMON *const pc = &pbi->common; 817 VP9_COMMON *const pc = &pbi->common;
818 MODE_INFO *orig_mi = xd->mode_info_context; 818 MODE_INFO *orig_mi = xd->mode_info_context;
819 const int mis = pc->mode_info_stride; 819 const int mis = pc->mode_info_stride;
820 820
821 assert(xd->mode_info_context->mbmi.sb_type == BLOCK_SIZE_SB32X32); 821 assert(xd->mode_info_context->mbmi.sb_type == BLOCK_SIZE_SB32X32);
822 822
823 if (pbi->common.frame_type != KEY_FRAME) 823 if (pbi->common.frame_type != KEY_FRAME)
(...skipping 1046 matching lines...) Expand 10 before | Expand all | Expand 10 after
1870 1870
1871 /* Find the end of the coded buffer */ 1871 /* Find the end of the coded buffer */
1872 while (residual_bc.count > CHAR_BIT 1872 while (residual_bc.count > CHAR_BIT
1873 && residual_bc.count < VP9_BD_VALUE_SIZE) { 1873 && residual_bc.count < VP9_BD_VALUE_SIZE) {
1874 residual_bc.count -= CHAR_BIT; 1874 residual_bc.count -= CHAR_BIT;
1875 residual_bc.user_buffer--; 1875 residual_bc.user_buffer--;
1876 } 1876 }
1877 *p_data_end = residual_bc.user_buffer; 1877 *p_data_end = residual_bc.user_buffer;
1878 return 0; 1878 return 0;
1879 } 1879 }
OLDNEW
« no previous file with comments | « source/libvpx/vp8/vp8_dx_iface.c ('k') | source/libvpx/vp9/encoder/vp9_lookahead.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698