Use suffixed {uint,int}{8,16,32,64}_t types.

talk/media/base/streamparams.cc

 /*
  * libjingle
  * Copyright 2011 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 82 matching lines @@
 bool MediaStreams::RemoveVideoStream(
     const StreamSelector& selector) {
   return RemoveStream(&video_, selector);
 }
 
 bool MediaStreams::RemoveDataStream(
     const StreamSelector& selector) {
   return RemoveStream(&data_, selector);
 }
 
-static std::string SsrcsToString(const std::vector<uint32>& ssrcs) {
+static std::string SsrcsToString(const std::vector<uint32_t>& ssrcs) {
   std::ostringstream ost;
   ost << "ssrcs:[";
-  for (std::vector<uint32>::const_iterator it = ssrcs.begin();
+  for (std::vector<uint32_t>::const_iterator it = ssrcs.begin();
        it != ssrcs.end(); ++it) {
     if (it != ssrcs.begin()) {
       ost << ",";
     }
     ost << *it;
   }
   ost << "]";
   return ost.str();
 }
 
@@ skipping 37 matching lines @@
   }
   if (!cname.empty()) {
     ost << "cname:" << cname << ";";
   }
   if (!sync_label.empty()) {
     ost << "sync_label:" << sync_label;
   }
   ost << "}";
   return ost.str();
 }
-void StreamParams::GetPrimarySsrcs(std::vector<uint32>* ssrcs) const {
+void StreamParams::GetPrimarySsrcs(std::vector<uint32_t>* ssrcs) const {
   const SsrcGroup* sim_group = get_ssrc_group(kSimSsrcGroupSemantics);
   if (sim_group == NULL) {
     ssrcs->push_back(first_ssrc());
   } else {
     for (size_t i = 0; i < sim_group->ssrcs.size(); ++i) {
       ssrcs->push_back(sim_group->ssrcs[i]);
     }
   }
 }
 
-void StreamParams::GetFidSsrcs(const std::vector<uint32>& primary_ssrcs,
-                               std::vector<uint32>* fid_ssrcs) const {
+void StreamParams::GetFidSsrcs(const std::vector<uint32_t>& primary_ssrcs,
+                               std::vector<uint32_t>* fid_ssrcs) const {
   for (size_t i = 0; i < primary_ssrcs.size(); ++i) {
-    uint32 fid_ssrc;
+    uint32_t fid_ssrc;
     if (GetFidSsrc(primary_ssrcs[i], &fid_ssrc)) {
       fid_ssrcs->push_back(fid_ssrc);
     }
   }
 }
 
 bool StreamParams::AddSecondarySsrc(const std::string& semantics,
-                                    uint32 primary_ssrc,
-                                    uint32 secondary_ssrc) {
+                                    uint32_t primary_ssrc,
+                                    uint32_t secondary_ssrc) {
   if (!has_ssrc(primary_ssrc)) {
     return false;
   }
 
   ssrcs.push_back(secondary_ssrc);
-  std::vector<uint32> ssrc_vector;
+  std::vector<uint32_t> ssrc_vector;
   ssrc_vector.push_back(primary_ssrc);
   ssrc_vector.push_back(secondary_ssrc);
   SsrcGroup ssrc_group = SsrcGroup(semantics, ssrc_vector);
   ssrc_groups.push_back(ssrc_group);
   return true;
 }
 
 bool StreamParams::GetSecondarySsrc(const std::string& semantics,
-                                    uint32 primary_ssrc,
-                                    uint32* secondary_ssrc) const {
+                                    uint32_t primary_ssrc,
+                                    uint32_t* secondary_ssrc) const {
   for (std::vector<SsrcGroup>::const_iterator it = ssrc_groups.begin();
        it != ssrc_groups.end(); ++it) {
     if (it->has_semantics(semantics) &&
           it->ssrcs.size() >= 2 &&
           it->ssrcs[0] == primary_ssrc) {
       *secondary_ssrc = it->ssrcs[1];
       return true;
     }
   }
   return false;
 }
 
 bool IsOneSsrcStream(const StreamParams& sp) {
   if (sp.ssrcs.size() == 1 && sp.ssrc_groups.empty()) {
     return true;
   }
   if (sp.ssrcs.size() == 2) {
     const SsrcGroup* fid_group = sp.get_ssrc_group(kFidSsrcGroupSemantics);
     if (fid_group != NULL) {
       return (sp.ssrcs == fid_group->ssrcs);
     }
   }
   return false;
 }
 
-static void RemoveFirst(std::list<uint32>* ssrcs, uint32 value) {
-  std::list<uint32>::iterator it =
+static void RemoveFirst(std::list<uint32_t>* ssrcs, uint32_t value) {
+  std::list<uint32_t>::iterator it =
       std::find(ssrcs->begin(), ssrcs->end(), value);
   if (it != ssrcs->end()) {
     ssrcs->erase(it);
   }
 }
 
 bool IsSimulcastStream(const StreamParams& sp) {
   const SsrcGroup* const sg = sp.get_ssrc_group(kSimSsrcGroupSemantics);
   if (sg == NULL || sg->ssrcs.size() < 2) {
     return false;
   }
   // Start with all StreamParams SSRCs. Remove simulcast SSRCs (from sg) and
   // RTX SSRCs. If we still have SSRCs left, we don't know what they're for.
   // Also we remove first-found SSRCs only. So duplicates should lead to errors.
-  std::list<uint32> sp_ssrcs(sp.ssrcs.begin(), sp.ssrcs.end());
+  std::list<uint32_t> sp_ssrcs(sp.ssrcs.begin(), sp.ssrcs.end());
   for (size_t i = 0; i < sg->ssrcs.size(); ++i) {
     RemoveFirst(&sp_ssrcs, sg->ssrcs[i]);
   }
   for (size_t i = 0; i < sp.ssrc_groups.size(); ++i) {
     const SsrcGroup& group = sp.ssrc_groups[i];
     if (group.semantics.compare(kFidSsrcGroupSemantics) != 0 ||
         group.ssrcs.size() != 2) {
       continue;
     }
     RemoveFirst(&sp_ssrcs, group.ssrcs[1]);
   }
   // If there's SSRCs left that we don't know how to handle, we bail out.
   return sp_ssrcs.size() == 0;
 }
 
 }  // namespace cricket