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

Side by Side Diff: source/libvpx/vp8/common/onyx.h

Issue 1302353004: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: Created 5 years, 3 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
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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 58
59 typedef enum 59 typedef enum
60 { 60 {
61 FRAMEFLAGS_KEY = 1, 61 FRAMEFLAGS_KEY = 1,
62 FRAMEFLAGS_GOLDEN = 2, 62 FRAMEFLAGS_GOLDEN = 2,
63 FRAMEFLAGS_ALTREF = 4 63 FRAMEFLAGS_ALTREF = 4
64 } FRAMETYPE_FLAGS; 64 } FRAMETYPE_FLAGS;
65 65
66 66
67 #include <assert.h> 67 #include <assert.h>
68 static void Scale2Ratio(int mode, int *hr, int *hs) 68 static INLINE void Scale2Ratio(int mode, int *hr, int *hs)
69 { 69 {
70 switch (mode) 70 switch (mode)
71 { 71 {
72 case NORMAL: 72 case NORMAL:
73 *hr = 1; 73 *hr = 1;
74 *hs = 1; 74 *hs = 1;
75 break; 75 break;
76 case FOURFIVE: 76 case FOURFIVE:
77 *hr = 4; 77 *hr = 4;
78 *hs = 5; 78 *hs = 5;
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 int vp8_set_roimap(struct VP8_COMP* comp, unsigned char *map, unsigned int r ows, unsigned int cols, int delta_q[4], int delta_lf[4], unsigned int threshold[ 4]); 273 int vp8_set_roimap(struct VP8_COMP* comp, unsigned char *map, unsigned int r ows, unsigned int cols, int delta_q[4], int delta_lf[4], unsigned int threshold[ 4]);
274 int vp8_set_active_map(struct VP8_COMP* comp, unsigned char *map, unsigned i nt rows, unsigned int cols); 274 int vp8_set_active_map(struct VP8_COMP* comp, unsigned char *map, unsigned i nt rows, unsigned int cols);
275 int vp8_set_internal_size(struct VP8_COMP* comp, VPX_SCALING horiz_mode, VPX _SCALING vert_mode); 275 int vp8_set_internal_size(struct VP8_COMP* comp, VPX_SCALING horiz_mode, VPX _SCALING vert_mode);
276 int vp8_get_quantizer(struct VP8_COMP* c); 276 int vp8_get_quantizer(struct VP8_COMP* c);
277 277
278 #ifdef __cplusplus 278 #ifdef __cplusplus
279 } 279 }
280 #endif 280 #endif
281 281
282 #endif // VP8_COMMON_ONYX_H_ 282 #endif // VP8_COMMON_ONYX_H_
OLDNEW
« no previous file with comments | « source/libvpx/vp8/common/mips/dspr2/vp8_loopfilter_filters_dspr2.c ('k') | source/libvpx/vp8/common/postproc.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698