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

Side by Side Diff: source/libvpx/vp9/encoder/vp9_encodeintra.c

Issue 17009012: libvpx: Pull from upstream (Closed) Base URL: http://src.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 7 years, 6 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
« no previous file with comments | « source/libvpx/vp9/encoder/vp9_encodeframe.c ('k') | source/libvpx/vp9/encoder/vp9_encodemb.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 #include "vp9_rtcd.h" 12 #include "vp9_rtcd.h"
13 #include "vp9/encoder/vp9_quantize.h" 13 #include "vp9/encoder/vp9_quantize.h"
14 #include "vp9/common/vp9_reconintra.h" 14 #include "vp9/common/vp9_reconintra.h"
15 #include "vp9/encoder/vp9_encodemb.h" 15 #include "vp9/encoder/vp9_encodemb.h"
16 #include "vp9/common/vp9_invtrans.h"
17 #include "vp9/encoder/vp9_encodeintra.h" 16 #include "vp9/encoder/vp9_encodeintra.h"
18 17
19 int vp9_encode_intra(VP9_COMP *cpi, MACROBLOCK *x, int use_16x16_pred) { 18 int vp9_encode_intra(VP9_COMP *cpi, MACROBLOCK *x, int use_16x16_pred) {
20 MB_MODE_INFO * mbmi = &x->e_mbd.mode_info_context->mbmi; 19 MB_MODE_INFO * mbmi = &x->e_mbd.mode_info_context->mbmi;
21 (void) cpi; 20 (void) cpi;
22 mbmi->mode = DC_PRED; 21 mbmi->mode = DC_PRED;
23 mbmi->ref_frame[0] = INTRA_FRAME; 22 mbmi->ref_frame[0] = INTRA_FRAME;
24 if (use_16x16_pred) { 23 if (use_16x16_pred) {
25 mbmi->txfm_size = mbmi->sb_type >= BLOCK_SIZE_MB16X16 ? TX_16X16 : TX_8X8; 24 mbmi->txfm_size = mbmi->sb_type >= BLOCK_SIZE_MB16X16 ? TX_16X16 : TX_8X8;
26 vp9_encode_intra_block_y(&cpi->common, x, mbmi->sb_type); 25 vp9_encode_intra_block_y(&cpi->common, x, mbmi->sb_type);
27 } else { 26 } else {
28 mbmi->txfm_size = TX_4X4; 27 mbmi->txfm_size = TX_4X4;
29 vp9_encode_intra_block_y(&cpi->common, x, mbmi->sb_type); 28 vp9_encode_intra_block_y(&cpi->common, x, mbmi->sb_type);
30 } 29 }
31 30
32 return vp9_get_mb_ss(x->plane[0].src_diff); 31 return vp9_get_mb_ss(x->plane[0].src_diff);
33 } 32 }
OLDNEW
« no previous file with comments | « source/libvpx/vp9/encoder/vp9_encodeframe.c ('k') | source/libvpx/vp9/encoder/vp9_encodemb.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698