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

Side by Side Diff: source/libvpx/vp9/common/vp9_reconintra.c

Issue 54923004: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 7 years, 1 month 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/vp9/common/vp9_reconinter.c ('k') | source/libvpx/vp9/common/vp9_rtcd.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
11 #include "./vpx_config.h" 11 #include "./vpx_config.h"
12 12
13 #include "vpx_mem/vpx_mem.h" 13 #include "vpx_mem/vpx_mem.h"
14 #include "vpx_ports/vpx_once.h" 14 #include "vpx_ports/vpx_once.h"
15 15
16 #include "vp9_rtcd.h" 16 #include "./vp9_rtcd.h"
17 17
18 #include "vp9/common/vp9_reconintra.h" 18 #include "vp9/common/vp9_reconintra.h"
19 #include "vp9/common/vp9_onyxc_int.h" 19 #include "vp9/common/vp9_onyxc_int.h"
20 20
21 const TX_TYPE mode2txfm_map[MB_MODE_COUNT] = { 21 const TX_TYPE mode2txfm_map[MB_MODE_COUNT] = {
22 DCT_DCT, // DC 22 DCT_DCT, // DC
23 ADST_DCT, // V 23 ADST_DCT, // V
24 DCT_ADST, // H 24 DCT_ADST, // H
25 DCT_DCT, // D45 25 DCT_DCT, // D45
26 ADST_ADST, // D135 26 ADST_ADST, // D135
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 const int bwl = bwl_in - tx_size; 376 const int bwl = bwl_in - tx_size;
377 const int wmask = (1 << bwl) - 1; 377 const int wmask = (1 << bwl) - 1;
378 const int have_top = (block_idx >> bwl) || xd->up_available; 378 const int have_top = (block_idx >> bwl) || xd->up_available;
379 const int have_left = (block_idx & wmask) || xd->left_available; 379 const int have_left = (block_idx & wmask) || xd->left_available;
380 const int have_right = ((block_idx & wmask) != wmask); 380 const int have_right = ((block_idx & wmask) != wmask);
381 381
382 assert(bwl >= 0); 382 assert(bwl >= 0);
383 build_intra_predictors(ref, ref_stride, dst, dst_stride, mode, tx_size, 383 build_intra_predictors(ref, ref_stride, dst, dst_stride, mode, tx_size,
384 have_top, have_left, have_right); 384 have_top, have_left, have_right);
385 } 385 }
OLDNEW
« no previous file with comments | « source/libvpx/vp9/common/vp9_reconinter.c ('k') | source/libvpx/vp9/common/vp9_rtcd.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698