Add SafeMin() and SafeMax(), which accept args of different types

webrtc/common_video/h264/sps_vui_rewriter.cc

 /*
  *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  *
  */
 
 #include "webrtc/common_video/h264/sps_vui_rewriter.h"
 
 #include <algorithm>
 #include <memory>
 #include <vector>
 
 #include "webrtc/base/bitbuffer.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
+#include "webrtc/base/safe_minmax.h"
 
 #include "webrtc/common_video/h264/h264_common.h"
 #include "webrtc/common_video/h264/sps_parser.h"
 
 namespace webrtc {
 
 // The maximum expected growth from adding a VUI to the SPS. It's actually
 // closer to 24 or so, but better safe than sorry.
 const size_t kMaxVuiSpsIncrease = 64;
 
@@ skipping 313 matching lines @@
 
 bool CopyRemainingBits(rtc::BitBuffer* source,
                        rtc::BitBufferWriter* destination) {
   uint32_t bits_tmp;
   // Try to get at least the destination aligned.
   if (source->RemainingBitCount() > 0 && source->RemainingBitCount() % 8 != 0) {
     size_t misaligned_bits = source->RemainingBitCount() % 8;
     COPY_BITS(source, destination, bits_tmp, misaligned_bits);
   }
   while (source->RemainingBitCount() > 0) {
-    size_t count = std::min(static_cast<size_t>(32u),
-                            static_cast<size_t>(source->RemainingBitCount()));
+    auto count = rtc::SafeMin<size_t>(32u, source->RemainingBitCount());
     COPY_BITS(source, destination, bits_tmp, count);
   }
   // TODO(noahric): The last byte could be all zeroes now, which we should just
   // strip.
   return true;
 }
 
 }  // namespace webrtc