diff options
author | William Wilgus <me.theuser@yahoo.com> | 2019-01-04 02:01:18 -0600 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2021-04-23 14:23:04 +0000 |
commit | 14c6bb798d6bebc80f07e863236adbaf8d156a9c (patch) | |
tree | 551a4b641906c2626af844fa3239c1b2b1ff0ad3 /lib/rbcodec/codecs/libopus/opus_types.h | |
parent | 75d93937965ec4df70d37df6d4feea04577c996b (diff) | |
download | rockbox-14c6bb798d6bebc80f07e863236adbaf8d156a9c.tar.gz rockbox-14c6bb798d6bebc80f07e863236adbaf8d156a9c.zip |
Sync opus codec to upstream git
Change-Id: I0cfcc0005c4ad7bfbb1aaf454188ce70fb043dc1
Diffstat (limited to 'lib/rbcodec/codecs/libopus/opus_types.h')
-rw-r--r-- | lib/rbcodec/codecs/libopus/opus_types.h | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/lib/rbcodec/codecs/libopus/opus_types.h b/lib/rbcodec/codecs/libopus/opus_types.h index b28e03aea2..7cf675580f 100644 --- a/lib/rbcodec/codecs/libopus/opus_types.h +++ b/lib/rbcodec/codecs/libopus/opus_types.h | |||
@@ -33,14 +33,29 @@ | |||
33 | #ifndef OPUS_TYPES_H | 33 | #ifndef OPUS_TYPES_H |
34 | #define OPUS_TYPES_H | 34 | #define OPUS_TYPES_H |
35 | 35 | ||
36 | #define opus_int int /* used for counters etc; at least 16 bits */ | ||
37 | #define opus_int64 long long | ||
38 | #define opus_int8 signed char | ||
39 | |||
40 | #define opus_uint unsigned int /* used for counters etc; at least 16 bits */ | ||
41 | #define opus_uint64 unsigned long long | ||
42 | #define opus_uint8 unsigned char | ||
43 | |||
36 | /* Use the real stdint.h if it's there (taken from Paul Hsieh's pstdint.h) */ | 44 | /* Use the real stdint.h if it's there (taken from Paul Hsieh's pstdint.h) */ |
37 | #if (defined(__STDC__) && __STDC__ && __STDC_VERSION__ >= 199901L) || (defined(__GNUC__) && (defined(_STDINT_H) || defined(_STDINT_H_)) || defined (HAVE_STDINT_H)) | 45 | #if (defined(__STDC__) && __STDC__ && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || (defined(__GNUC__) && (defined(_STDINT_H) || defined(_STDINT_H_)) || defined (HAVE_STDINT_H)) |
38 | #include <stdint.h> | 46 | #include <stdint.h> |
39 | 47 | # undef opus_int64 | |
48 | # undef opus_int8 | ||
49 | # undef opus_uint64 | ||
50 | # undef opus_uint8 | ||
51 | typedef int8_t opus_int8; | ||
52 | typedef uint8_t opus_uint8; | ||
40 | typedef int16_t opus_int16; | 53 | typedef int16_t opus_int16; |
41 | typedef uint16_t opus_uint16; | 54 | typedef uint16_t opus_uint16; |
42 | typedef int32_t opus_int32; | 55 | typedef int32_t opus_int32; |
43 | typedef uint32_t opus_uint32; | 56 | typedef uint32_t opus_uint32; |
57 | typedef int64_t opus_int64; | ||
58 | typedef uint64_t opus_uint64; | ||
44 | #elif defined(_WIN32) | 59 | #elif defined(_WIN32) |
45 | 60 | ||
46 | # if defined(__CYGWIN__) | 61 | # if defined(__CYGWIN__) |
@@ -148,12 +163,4 @@ | |||
148 | 163 | ||
149 | #endif | 164 | #endif |
150 | 165 | ||
151 | #define opus_int int /* used for counters etc; at least 16 bits */ | ||
152 | #define opus_int64 long long | ||
153 | #define opus_int8 signed char | ||
154 | |||
155 | #define opus_uint unsigned int /* used for counters etc; at least 16 bits */ | ||
156 | #define opus_uint64 unsigned long long | ||
157 | #define opus_uint8 unsigned char | ||
158 | |||
159 | #endif /* OPUS_TYPES_H */ | 166 | #endif /* OPUS_TYPES_H */ |