Switch to standard integer types in media/.

media/base/mime_util.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <map>
 
 #include "base/containers/hash_tables.h"
 #include "base/lazy_instance.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
@@ skipping 305 matching lines @@
   // Special handling for old, pre-RFC 6381 format avc1 strings, which are still
   // being used by some HLS apps to preserve backward compatibility with older
   // iOS devices. The old format was avc1.<profile>.<level>
   // Where <profile> is H.264 profile_idc encoded as a decimal number, i.e.
   // 66 is baseline profile (0x42)
   // 77 is main profile (0x4d)
   // 100 is high profile (0x64)
   // And <level> is H.264 level multiplied by 10, also encoded as decimal number
   // E.g. <level> 31 corresponds to H.264 level 3.1
   // See, for example, http://qtdevseed.apple.com/qadrift/testcases/tc-0133.php
-  uint32 level_start = 0;
+  uint32_t level_start = 0;
   std::string result;
   if (base::StartsWith(codec_id, "avc1.66.", base::CompareCase::SENSITIVE)) {
     level_start = 8;
     result = "avc1.4200";
   } else if (base::StartsWith(codec_id, "avc1.77.",
                               base::CompareCase::SENSITIVE)) {
     level_start = 8;
     result = "avc1.4D00";
   } else if (base::StartsWith(codec_id, "avc1.100.",
                               base::CompareCase::SENSITIVE)) {
     level_start = 9;
     result = "avc1.6400";
   }
 
-  uint32 level = 0;
+  uint32_t level = 0;
   if (level_start > 0 &&
       base::StringToUint(codec_id.substr(level_start), &level) && level < 256) {
     // This is a valid legacy avc1 codec id - return the codec id translated
     // into RFC 6381 format.
     result.push_back(IntToHex(level >> 4));
     result.push_back(IntToHex(level & 0xf));
     return result;
   }
 
   // This is not a valid legacy avc1 codec id - return the original codec id.
@@ skipping 137 matching lines @@
 }
 
 void MimeUtil::RemoveProprietaryMediaTypesAndCodecsForTests() {
   for (size_t i = 0; i < arraysize(kFormatCodecMappings); ++i)
     if (kFormatCodecMappings[i].format_type == PROPRIETARY)
       media_format_map_.erase(kFormatCodecMappings[i].mime_type);
   allow_proprietary_codecs_ = false;
 }
 
 static bool IsValidH264Level(const std::string& level_str) {
-  uint32 level;
+  uint32_t level;
   if (level_str.size() != 2 || !base::HexStringToUInt(level_str, &level))
     return false;
 
   // Valid levels taken from Table A-1 in ISO-14496-10.
   // Essentially |level_str| is toHex(10 * level).
   return ((level >= 10 && level <= 13) ||
           (level >= 20 && level <= 22) ||
           (level >= 30 && level <= 32) ||
           (level >= 40 && level <= 42) ||
           (level >= 50 && level <= 51));
@@ skipping 185 matching lines @@
                       std::vector<std::string>* codecs_out,
                       const bool strip) {
   g_media_mime_util.Get().ParseCodecString(codecs, codecs_out, strip);
 }
 
 void RemoveProprietaryMediaTypesAndCodecsForTests() {
   g_media_mime_util.Get().RemoveProprietaryMediaTypesAndCodecsForTests();
 }
 
 }  // namespace media