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

Side by Side Diff: source/libvpx/vpx_dsp/vpx_dsp_common.h

Issue 1339513003: 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
« no previous file with comments | « source/libvpx/vpx_dsp/vpx_dsp.mk ('k') | source/libvpx/vpx_dsp/x86/quantize_ssse3_x86_64.asm » ('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) 2015 The WebM project authors. All Rights Reserved. 2 * Copyright (c) 2015 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 #ifndef VPX_DSP_COMMON_H_ 11 #ifndef VPX_DSP_COMMON_H_
12 #define VPX_DSP_COMMON_H_ 12 #define VPX_DSP_COMMON_H_
13 13
14 #include "./vpx_config.h" 14 #include "./vpx_config.h"
15 #include "vpx/vpx_integer.h" 15 #include "vpx/vpx_integer.h"
16 #include "vpx_dsp/vpx_dsp_common.h"
16 #include "vpx_ports/mem.h" 17 #include "vpx_ports/mem.h"
17 18
18 #ifdef __cplusplus 19 #ifdef __cplusplus
19 extern "C" { 20 extern "C" {
20 #endif 21 #endif
21 22
22 #define VPXMIN(x, y) (((x) < (y)) ? (x) : (y)) 23 #define VPXMIN(x, y) (((x) < (y)) ? (x) : (y))
23 #define VPXMAX(x, y) (((x) > (y)) ? (x) : (y)) 24 #define VPXMAX(x, y) (((x) > (y)) ? (x) : (y))
24 25
25 #if CONFIG_VP9_HIGHBITDEPTH 26 #if CONFIG_VP9_HIGHBITDEPTH
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 return (uint16_t)clamp(val, 0, 4095); 61 return (uint16_t)clamp(val, 0, 4095);
61 } 62 }
62 } 63 }
63 #endif // CONFIG_VP9_HIGHBITDEPTH 64 #endif // CONFIG_VP9_HIGHBITDEPTH
64 65
65 #ifdef __cplusplus 66 #ifdef __cplusplus
66 } // extern "C" 67 } // extern "C"
67 #endif 68 #endif
68 69
69 #endif // VPX_DSP_COMMON_H_ 70 #endif // VPX_DSP_COMMON_H_
OLDNEW
« no previous file with comments | « source/libvpx/vpx_dsp/vpx_dsp.mk ('k') | source/libvpx/vpx_dsp/x86/quantize_ssse3_x86_64.asm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698