From: Jaroslav Kysela <perex@perex.cz>
Date: Fri, 16 Oct 2015 16:54:06 +0000 (+0200)
Subject: use new MINMAX macro everywhere
X-Git-Tag: v4.2.1~1892
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d7456e7a1291e418be48394b01e817e2fb3d8815;p=thirdparty%2Ftvheadend.git

use new MINMAX macro everywhere
---

diff --git a/src/input/mpegts/linuxdvb/linuxdvb_frontend.c b/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
index 16dce4d4c..10c8deedb 100644
--- a/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
+++ b/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
@@ -579,7 +579,7 @@ linuxdvb_frontend_monitor ( void *aux )
   streaming_message_t sm;
   service_t *s;
   int logit = 0, retune;
-  uint32_t period = MIN(MAX(250, lfe->lfe_status_period), 8000);
+  uint32_t period = MINMAX(lfe->lfe_status_period, 250, 8000);
 #if DVB_VER_ATLEAST(5,10)
   struct dtv_property fe_properties[6];
   struct dtv_properties dtv_prop;
@@ -1092,7 +1092,7 @@ linuxdvb_frontend_input_thread ( void *aux )
   tvhpoll_add(efd, ev, 2);
 
   /* Allocate memory */
-  sbuf_init_fixed(&sb, MIN(MAX(18800, lfe->lfe_ibuf_size), 1880000));
+  sbuf_init_fixed(&sb, MINMAX(lfe->lfe_ibuf_size, 18800, 1880000));
 
   /* Subscribe PIDs */
   linuxdvb_update_pids(lfe, name, &tuned, pids, ARRAY_SIZE(pids));
diff --git a/src/input/mpegts/satip/satip_frontend.c b/src/input/mpegts/satip/satip_frontend.c
index fb4c03749..efea4799b 100644
--- a/src/input/mpegts/satip/satip_frontend.c
+++ b/src/input/mpegts/satip/satip_frontend.c
@@ -378,7 +378,7 @@ satip_frontend_get_grace ( mpegts_input_t *mi, mpegts_mux_t *mm )
   satip_frontend_t *lfe = (satip_frontend_t*)mi;
   int r = 5;
   if (lfe->sf_positions || lfe->sf_master)
-    r = MIN(60, MAX(r, satip_satconf_get_grace(lfe, mm) ?: 10));
+    r = MINMAX(satip_satconf_get_grace(lfe, mm) ?: 10, r, 60);
   return r;
 }
 
@@ -1356,7 +1356,7 @@ new_tune:
 
   udp_multirecv_init(&um, RTP_PKTS, RTP_PKT_SIZE);
   sbuf_init_fixed(sb, RTP_PKTS * RTP_PKT_SIZE);
-  lfe->sf_skip_ts = MIN(200, MAX(0, lfe->sf_device->sd_skip_ts)) * 188;
+  lfe->sf_skip_ts = MINMAX(lfe->sf_device->sd_skip_ts, 0, 200) * 188;
   
   while ((reply || running) && !fatal) {
 
diff --git a/src/plumbing/transcoding.c b/src/plumbing/transcoding.c
index 3f3ee3cab..d6c783867 100644
--- a/src/plumbing/transcoding.c
+++ b/src/plumbing/transcoding.c
@@ -1137,7 +1137,7 @@ transcoder_stream_video(transcoder_t *t, transcoder_stream_t *ts, th_pkt_t *pkt)
         // valid values for quality are 2-31, smaller means better quality, use 5 as default
         octx->flags          |= CODEC_FLAG_QSCALE;
         octx->global_quality  = FF_QP2LAMBDA *
-            (t->t_props.tp_vbitrate == 0 ? 5 : MAX(2, MIN(31, t->t_props.tp_vbitrate)));
+            (t->t_props.tp_vbitrate == 0 ? 5 : MINMAX(t->t_props.tp_vbitrate, 2, 31));
       } else {
         // encode with specified bitrate and optimize for high compression
         octx->bit_rate        = t->t_props.tp_vbitrate * 1000;
diff --git a/src/satip/rtp.c b/src/satip/rtp.c
index 4ef99a3ed..b9e770efa 100644
--- a/src/satip/rtp.c
+++ b/src/satip/rtp.c
@@ -532,10 +532,10 @@ satip_status_build(satip_rtp_session_t *rtp, char *buf, int len)
   lock = rtp->sig_lock;
   switch (rtp->sig.signal_scale) {
   case SIGNAL_STATUS_SCALE_RELATIVE:
-    level = MIN(240, MAX(0, (rtp->sig.signal * 245) / 0xffff));
+    level = MINMAX((rtp->sig.signal * 245) / 0xffff, 0, 240);
     break;
   case SIGNAL_STATUS_SCALE_DECIBEL:
-    level = MIN(240, MAX(0, (rtp->sig.signal + 90000) / 375));
+    level = MINMAX((rtp->sig.signal + 90000) / 375, 0, 240);
     break;
   default:
     level = lock ? 10 : 0;
@@ -543,10 +543,10 @@ satip_status_build(satip_rtp_session_t *rtp, char *buf, int len)
   }
   switch (rtp->sig.snr_scale) {
   case SIGNAL_STATUS_SCALE_RELATIVE:
-    quality = MIN(15, MAX(0, (rtp->sig.snr * 16) / 0xffff));
+    quality = MINMAX((rtp->sig.snr * 16) / 0xffff, 0, 15);
     break;
   case SIGNAL_STATUS_SCALE_DECIBEL:
-    quality = MIN(15, MAX(0, (rtp->sig.snr / 2000)));
+    quality = MINMAX(rtp->sig.snr / 2000, 0, 15);
     break;
   default:
     quality = lock ? 1 : 0;
diff --git a/src/spawn.c b/src/spawn.c
index db658b266..1f7e8df39 100644
--- a/src/spawn.c
+++ b/src/spawn.c
@@ -326,7 +326,7 @@ spawn_kill(pid_t pid, int sig, int timeout)
         break;
     if (s) {
       if (!s->killed)
-        s->killed = dispatch_clock_update(NULL) + MAX(MIN(5, timeout), 3600);
+        s->killed = dispatch_clock_update(NULL) + MINMAX(timeout, 5, 3600);
       /* kill the whole process group */
       r = kill(-pid, sig);
       if (r < 0)