Use the AOMMIN macro
Change-Id: Ica4500ca06fcfd2f376973e9530649af58906c1c
diff --git a/av1/encoder/pass2_strategy.c b/av1/encoder/pass2_strategy.c
index 6b63afc..eca49c0 100644
--- a/av1/encoder/pass2_strategy.c
+++ b/av1/encoder/pass2_strategy.c
@@ -18,8 +18,10 @@
/*! @} - end defgroup gf_group_algo */
#include <assert.h>
+#include <limits.h>
#include <stdint.h>
+#include "aom_dsp/aom_dsp_common.h"
#include "aom_mem/aom_mem.h"
#include "config/aom_config.h"
#include "config/aom_scale_rtcd.h"
@@ -3408,9 +3410,7 @@
section_target_bandwidth = rc->avg_frame_bandwidth;
else {
section_target_bandwidth = twopass->bits_left / frames_left;
- section_target_bandwidth = (section_target_bandwidth < INT_MAX)
- ? section_target_bandwidth
- : INT_MAX;
+ section_target_bandwidth = AOMMIN(section_target_bandwidth, INT_MAX);
}
return (int)section_target_bandwidth;
}
diff --git a/av1/encoder/ratectrl.c b/av1/encoder/ratectrl.c
index 148334a..8060a8b 100644
--- a/av1/encoder/ratectrl.c
+++ b/av1/encoder/ratectrl.c
@@ -2641,7 +2641,7 @@
AOMMIN(fast_extra_bits,
AOMMAX(one_frame_bits / 8, p_rc->vbr_bits_off_target_fast / 8));
#endif
- fast_extra_bits = (fast_extra_bits < INT_MAX) ? fast_extra_bits : INT_MAX;
+ fast_extra_bits = AOMMIN(fast_extra_bits, INT_MAX);
if (fast_extra_bits > 0) {
// Update frame_target only if additional bits are available from
// local undershoot.
@@ -2656,7 +2656,7 @@
}
// Clamp the target for the frame to the maximum allowed for one frame.
- *this_frame_target = (int)((frame_target < INT_MAX) ? frame_target : INT_MAX);
+ *this_frame_target = (int)AOMMIN(frame_target, INT_MAX);
}
void av1_set_target_rate(AV1_COMP *cpi, int width, int height) {
