diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-03-24 02:18:17 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-03-24 02:18:17 +0000 |
| commit | 29a0dda797b58108d148e7f25371f892f84205d4 (patch) | |
| tree | 93db20ddff9e7822901fbef37f2a352e48426a3f /include/opus_defines.h | |
| parent | 3ff27560eb001d23e76aaae0f24f80e598fa2c8e (diff) | |
| parent | 36fa2621472ebf5b859fd16bbdb749019c68cc69 (diff) | |
| download | src-29a0dda797b58108d148e7f25371f892f84205d4.tar.gz | |
Merge third_party/opus/src from https://chromium.googlesource.com/chromium/deps/opus.git at 36fa2621472ebf5b859fd16bbdb749019c68cc69
This commit was generated by merge_from_chromium.py.
Change-Id: Iddd0018e3d3bcc14f0ceb6cdb5ddbb570ea92cec
Diffstat (limited to 'include/opus_defines.h')
| -rw-r--r-- | include/opus_defines.h | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/include/opus_defines.h b/include/opus_defines.h index 3474e84..265089f 100644 --- a/include/opus_defines.h +++ b/include/opus_defines.h @@ -98,6 +98,18 @@ extern "C" { # define OPUS_RESTRICT restrict #endif +#if (!defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L) ) +# if OPUS_GNUC_PREREQ(2,7) +# define OPUS_INLINE __inline__ +# elif (defined(_MSC_VER)) +# define OPUS_INLINE __inline +# else +# define OPUS_INLINE +# endif +#else +# define OPUS_INLINE inline +#endif + /**Warning attributes for opus functions * NONNULL is not used in OPUS_BUILD to avoid the compiler optimizing out * some paranoid null checks. */ @@ -151,6 +163,8 @@ extern "C" { #define OPUS_GET_LAST_PACKET_DURATION_REQUEST 4039 #define OPUS_SET_EXPERT_FRAME_DURATION_REQUEST 4040 #define OPUS_GET_EXPERT_FRAME_DURATION_REQUEST 4041 +#define OPUS_SET_PREDICTION_DISABLED_REQUEST 4042 +#define OPUS_GET_PREDICTION_DISABLED_REQUEST 4043 /* Don't use 4045, it's already taken by OPUS_GET_GAIN_REQUEST */ @@ -194,7 +208,6 @@ extern "C" { #define OPUS_FRAMESIZE_20_MS 5004 /**< Use 20 ms frames */ #define OPUS_FRAMESIZE_40_MS 5005 /**< Use 40 ms frames */ #define OPUS_FRAMESIZE_60_MS 5006 /**< Use 60 ms frames */ -#define OPUS_FRAMESIZE_VARIABLE 5010 /**< Optimize the frame size dynamically */ /**@}*/ @@ -575,6 +588,14 @@ extern "C" { * @hideinitializer */ #define OPUS_GET_EXPERT_FRAME_DURATION(x) OPUS_GET_EXPERT_FRAME_DURATION_REQUEST, __opus_check_int_ptr(x) +/** If set to 1, disables almost all use of prediction, making frames almost + completely independent. This reduces quality. (default : 0) + * @hideinitializer */ +#define OPUS_SET_PREDICTION_DISABLED(x) OPUS_SET_PREDICTION_DISABLED_REQUEST, __opus_check_int(x) +/** Gets the encoder's configured prediction status. + * @hideinitializer */ +#define OPUS_GET_PREDICTION_DISABLED(x) OPUS_GET_PREDICTION_DISABLED_REQUEST, __opus_check_int_ptr(x) + /**@}*/ /** @defgroup opus_genericctls Generic CTLs |