summaryrefslogtreecommitdiffstats
path: root/thirdparties/android/common/include/libavutil/common.h
diff options
context:
space:
mode:
Diffstat (limited to 'thirdparties/android/common/include/libavutil/common.h')
-rwxr-xr-xthirdparties/android/common/include/libavutil/common.h100
1 files changed, 74 insertions, 26 deletions
diff --git a/thirdparties/android/common/include/libavutil/common.h b/thirdparties/android/common/include/libavutil/common.h
index beaf9f7..ede062e 100755
--- a/thirdparties/android/common/include/libavutil/common.h
+++ b/thirdparties/android/common/include/libavutil/common.h
@@ -97,11 +97,19 @@ av_const int av_log2_16bit(unsigned v);
static av_always_inline av_const int av_clip_c(int a, int amin, int amax)
{
#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
- if (amin > amax) abort();
+ if (amin > amax) {
+ abort();
+ }
#endif
- if (a < amin) return amin;
- else if (a > amax) return amax;
- else return a;
+ if (a < amin) {
+ return amin;
+ }
+ else if (a > amax) {
+ return amax;
+ }
+ else {
+ return a;
+ }
}
/**
@@ -114,11 +122,19 @@ static av_always_inline av_const int av_clip_c(int a, int amin, int amax)
static av_always_inline av_const int64_t av_clip64_c(int64_t a, int64_t amin, int64_t amax)
{
#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
- if (amin > amax) abort();
+ if (amin > amax) {
+ abort();
+ }
#endif
- if (a < amin) return amin;
- else if (a > amax) return amax;
- else return a;
+ if (a < amin) {
+ return amin;
+ }
+ else if (a > amax) {
+ return amax;
+ }
+ else {
+ return a;
+ }
}
/**
@@ -128,8 +144,12 @@ static av_always_inline av_const int64_t av_clip64_c(int64_t a, int64_t amin, in
*/
static av_always_inline av_const uint8_t av_clip_uint8_c(int a)
{
- if (a&(~0xFF)) return (-a)>>31;
- else return a;
+ if (a&(~0xFF)) {
+ return (-a)>>31;
+ }
+ else {
+ return a;
+ }
}
/**
@@ -139,8 +159,12 @@ static av_always_inline av_const uint8_t av_clip_uint8_c(int a)
*/
static av_always_inline av_const int8_t av_clip_int8_c(int a)
{
- if ((a+0x80) & ~0xFF) return (a>>31) ^ 0x7F;
- else return a;
+ if ((a+0x80) & ~0xFF) {
+ return (a>>31) ^ 0x7F;
+ }
+ else {
+ return a;
+ }
}
/**
@@ -150,8 +174,12 @@ static av_always_inline av_const int8_t av_clip_int8_c(int a)
*/
static av_always_inline av_const uint16_t av_clip_uint16_c(int a)
{
- if (a&(~0xFFFF)) return (-a)>>31;
- else return a;
+ if (a&(~0xFFFF)) {
+ return (-a)>>31;
+ }
+ else {
+ return a;
+ }
}
/**
@@ -161,8 +189,12 @@ static av_always_inline av_const uint16_t av_clip_uint16_c(int a)
*/
static av_always_inline av_const int16_t av_clip_int16_c(int a)
{
- if ((a+0x8000) & ~0xFFFF) return (a>>31) ^ 0x7FFF;
- else return a;
+ if ((a+0x8000) & ~0xFFFF) {
+ return (a>>31) ^ 0x7FFF;
+ }
+ else {
+ return a;
+ }
}
/**
@@ -172,8 +204,12 @@ static av_always_inline av_const int16_t av_clip_int16_c(int a)
*/
static av_always_inline av_const int32_t av_clipl_int32_c(int64_t a)
{
- if ((a+0x80000000u) & ~UINT64_C(0xFFFFFFFF)) return (a>>63) ^ 0x7FFFFFFF;
- else return (int32_t)a;
+ if ((a+0x80000000u) & ~UINT64_C(0xFFFFFFFF)) {
+ return (a>>63) ^ 0x7FFFFFFF;
+ }
+ else {
+ return (int32_t)a;
+ }
}
/**
@@ -184,8 +220,12 @@ static av_always_inline av_const int32_t av_clipl_int32_c(int64_t a)
*/
static av_always_inline av_const unsigned av_clip_uintp2_c(int a, int p)
{
- if (a & ~((1<<p) - 1)) return -a >> 31 & ((1<<p) - 1);
- else return a;
+ if (a & ~((1<<p) - 1)) {
+ return -a >> 31 & ((1<<p) - 1);
+ }
+ else {
+ return a;
+ }
}
/**
@@ -222,11 +262,19 @@ static av_always_inline int av_sat_dadd32_c(int a, int b)
static av_always_inline av_const float av_clipf_c(float a, float amin, float amax)
{
#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
- if (amin > amax) abort();
+ if (amin > amax) {
+ abort();
+ }
#endif
- if (a < amin) return amin;
- else if (a > amax) return amax;
- else return a;
+ if (a < amin) {
+ return amin;
+ }
+ else if (a > amax) {
+ return amax;
+ }
+ else {
+ return a;
+ }
}
/** Compute ceil(log2(x)).
@@ -312,7 +360,7 @@ static av_always_inline av_const int av_popcount64_c(uint64_t x)
val += (hi<<10) + 0x10000;\
}\
}\
-
+
/**
* @def PUT_UTF8(val, tmp, PUT_BYTE)
* Convert a 32-bit Unicode character to its UTF-8 encoded form (up to 4 bytes long).
@@ -376,7 +424,7 @@ static av_always_inline av_const int av_popcount64_c(uint64_t x)
PUT_16BIT\
}\
}\
-
+
#include "mem.h"
OpenPOWER on IntegriCloud