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

Side by Side Diff: source/libvpx/vp9/common/vp9_common.h

Issue 11974002: 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
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
12 #ifndef VP9_COMMON_VP9_COMMON_H_ 11 #ifndef VP9_COMMON_VP9_COMMON_H_
13 #define VP9_COMMON_VP9_COMMON_H_ 12 #define VP9_COMMON_VP9_COMMON_H_
14 13
15 #include <assert.h> 14 #include <assert.h>
16 #include "vpx_config.h" 15 #include "vpx_config.h"
17 /* Interface header for common constant data structures and lookup tables */ 16 /* Interface header for common constant data structures and lookup tables */
18 17
19 #include "vpx_mem/vpx_mem.h" 18 #include "vpx_mem/vpx_mem.h"
19 #include "vpx/vpx_integer.h"
20 20
21 #include "vp9/common/vp9_common_types.h" 21 #define TRUE 1
22 #define FALSE 0
23
24 #define MIN(x, y) (((x) < (y)) ? (x) : (y))
25 #define MAX(x, y) (((x) > (y)) ? (x) : (y))
22 26
23 /* Only need this for fixed-size arrays, for structs just assign. */ 27 /* Only need this for fixed-size arrays, for structs just assign. */
24 28
25 #define vp9_copy( Dest, Src) { \ 29 #define vp9_copy(Dest, Src) { \
26 assert( sizeof( Dest) == sizeof( Src)); \ 30 assert(sizeof(Dest) == sizeof(Src)); \
27 vpx_memcpy( Dest, Src, sizeof( Src)); \ 31 vpx_memcpy(Dest, Src, sizeof(Src)); \
28 } 32 }
29 33
30 /* Use this for variably-sized arrays. */ 34 /* Use this for variably-sized arrays. */
31 35
32 #define vp9_copy_array( Dest, Src, N) { \ 36 #define vp9_copy_array(Dest, Src, N) { \
33 assert( sizeof( *Dest) == sizeof( *Src)); \ 37 assert(sizeof(*Dest) == sizeof(*Src)); \
34 vpx_memcpy( Dest, Src, N * sizeof( *Src)); \ 38 vpx_memcpy(Dest, Src, N * sizeof(*Src)); \
35 } 39 }
36 40
37 #define vp9_zero( Dest) vpx_memset( &Dest, 0, sizeof( Dest)); 41 #define vp9_zero(Dest) vpx_memset(&Dest, 0, sizeof(Dest));
38 42
39 #define vp9_zero_array( Dest, N) vpx_memset( Dest, 0, N * sizeof( *Dest)); 43 #define vp9_zero_array(Dest, N) vpx_memset(Dest, 0, N * sizeof(*Dest));
40 44
41 #endif /* common_h */ 45 static __inline uint8_t clip_pixel(int val) {
46 return (val > 255) ? 255u : (val < 0) ? 0u : val;
47 }
48
49 #endif // VP9_COMMON_VP9_COMMON_H_
OLDNEW
« no previous file with comments | « source/libvpx/vp9/common/vp9_coefupdateprobs.h ('k') | source/libvpx/vp9/common/vp9_common_types.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698