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

Side by Side Diff: include/share/endswap.h

Issue 1961133002: Update FLAC to 1.3.1 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/flac.git@master
Patch Set: build config tweaks for Windows Created 4 years, 7 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 | « include/share/compat.h ('k') | include/share/private.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* libFLAC - Free Lossless Audio Codec library 1 /* libFLAC - Free Lossless Audio Codec library
2 * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007 Josh Coalson 2 * Copyright (C) 2012-2014 Xiph.org Foundation
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * - Redistributions of source code must retain the above copyright 8 * - Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 10 *
11 * - Redistributions in binary form must reproduce the above copyright 11 * - Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the 12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution. 13 * documentation and/or other materials provided with the distribution.
14 * 14 *
15 * - Neither the name of the Xiph.org Foundation nor the names of its 15 * - Neither the name of the Xiph.org Foundation nor the names of its
16 * contributors may be used to endorse or promote products derived from 16 * contributors may be used to endorse or promote products derived from
17 * this software without specific prior written permission. 17 * this software without specific prior written permission.
18 * 18 *
19 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 19 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
21 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 21 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR 22 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
23 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 23 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
24 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 24 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
25 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 25 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
26 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 26 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
27 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 27 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
28 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 28 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
29 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32 #ifndef FLAC__ORDINALS_H 32 /* It is assumed that this header will be included after "config.h". */
33 #define FLAC__ORDINALS_H
34 33
35 #if !(defined(_MSC_VER) || defined(__BORLANDC__) || defined(__EMX__)) 34 #if HAVE_BSWAP32» » » /* GCC and Clang */
36 #include <inttypes.h> 35
36 /* GCC prior to 4.8 didn't provide bswap16 on x86_64 */
37 #if ! HAVE_BSWAP16
38 static inline unsigned short __builtin_bswap16(unsigned short a)
39 {
40 » return (a<<8)|(a>>8);
41 }
37 #endif 42 #endif
38 43
39 typedef signed char FLAC__int8; 44 #define»ENDSWAP_16(x)» » (__builtin_bswap16 (x))
40 typedef unsigned char FLAC__uint8; 45 #define»ENDSWAP_32(x)» » (__builtin_bswap32 (x))
41 46
42 #if defined(_MSC_VER) || defined(__BORLANDC__) 47 #elif defined _MSC_VER» » /* Windows. Apparently in <stdlib.h>. */
43 typedef __int16 FLAC__int16; 48
44 typedef __int32 FLAC__int32; 49 #define»ENDSWAP_16(x)» » (_byteswap_ushort (x))
45 typedef __int64 FLAC__int64; 50 #define»ENDSWAP_32(x)» » (_byteswap_ulong (x))
46 typedef unsigned __int16 FLAC__uint16; 51
47 typedef unsigned __int32 FLAC__uint32; 52 #elif defined HAVE_BYTESWAP_H» » /* Linux */
48 typedef unsigned __int64 FLAC__uint64; 53
49 #elif defined(__EMX__) 54 #include <byteswap.h>
50 typedef short FLAC__int16; 55
51 typedef long FLAC__int32; 56 #define»ENDSWAP_16(x)» » (bswap_16 (x))
52 typedef long long FLAC__int64; 57 #define»ENDSWAP_32(x)» » (bswap_32 (x))
53 typedef unsigned short FLAC__uint16; 58
54 typedef unsigned long FLAC__uint32;
55 typedef unsigned long long FLAC__uint64;
56 #else 59 #else
57 typedef int16_t FLAC__int16; 60
58 typedef int32_t FLAC__int32; 61 #define»ENDSWAP_16(x)» » ((((x) >> 8) & 0xFF) | (((x) & 0xFF) << 8))
59 typedef int64_t FLAC__int64; 62 #define»ENDSWAP_32(x)» » ((((x) >> 24) & 0xFF) | (((x) >> 8) & 0xFF00) | (((x) & 0xFF00) << 8) | (((x) & 0xFF) << 24))
60 typedef uint16_t FLAC__uint16; 63
61 typedef uint32_t FLAC__uint32;
62 typedef uint64_t FLAC__uint64;
63 #endif 64 #endif
64 65
65 typedef int FLAC__bool;
66 66
67 typedef FLAC__uint8 FLAC__byte; 67 /* Host to little-endian byte swapping. */
68 #if CPU_IS_BIG_ENDIAN
68 69
69 #ifdef true 70 #define H2LE_16(x)» » ENDSWAP_16 (x)
70 #undef true 71 #define H2LE_32(x)» » ENDSWAP_32 (x)
71 #endif 72
72 #ifdef false 73 #else
73 #undef false 74
74 #endif 75 #define H2LE_16(x)» » (x)
75 #ifndef __cplusplus 76 #define H2LE_32(x)» » (x)
76 #define true 1
77 #define false 0
78 #endif
79 77
80 #endif 78 #endif
OLDNEW
« no previous file with comments | « include/share/compat.h ('k') | include/share/private.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698