From dbbcd3fdc46b672b0a3ee0b72ddc07b35862cc02 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 7 Jan 2019 13:39:57 +0100 Subject: [PATCH] defs: add SPA_LIKELY to MIN/MAX/CLAMP macros --- spa/include/spa/utils/defs.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spa/include/spa/utils/defs.h b/spa/include/spa/utils/defs.h index 7bf19a6e7..715ee7867 100644 --- a/spa/include/spa/utils/defs.h +++ b/spa/include/spa/utils/defs.h @@ -90,20 +90,20 @@ struct spa_fraction { ({ \ __typeof__(a) _a = (a); \ __typeof__(b) _b = (b); \ - _a < _b ? _a : _b; \ + SPA_LIKELY(_a < _b) ? _a : _b; \ }) #define SPA_MAX(a,b) \ ({ \ __typeof__(a) _a = (a); \ __typeof__(b) _b = (b); \ - _a > _b ? _a : _b; \ + SPA_LIKELY(_a > _b) ? _a : _b; \ }) #define SPA_CLAMP(v,low,high) \ ({ \ __typeof__(v) _v = (v); \ __typeof__(low) _low = (low); \ __typeof__(high) _high = (high); \ - _v > _high ? _high : ( _v < _low ? _low : _v); \ + SPA_MIN(SPA_MAX(_v, _low), _high); \ }) #define SPA_MEMBER(b,o,t) ((t*)((uint8_t*)(b) + (int)(o)))