Switch to standard integer types in media/.

media/formats/mp4/box_definitions.h

Index: media/formats/mp4/box_definitions.h
diff --git a/media/formats/mp4/box_definitions.h b/media/formats/mp4/box_definitions.h
index e1f17293e0c8d91fd35d5dd5901ad092fdbaf825..eed65817fa35bd20c2304a4cc97fb6d47c0313d6 100644
--- a/media/formats/mp4/box_definitions.h
+++ b/media/formats/mp4/box_definitions.h
@@ -8,7 +8,6 @@
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "media/base/media_export.h"
 #include "media/base/media_log.h"
@@ -42,7 +41,7 @@ struct MEDIA_EXPORT FileType : Box {
   DECLARE_BOX_METHODS(FileType);
 
   FourCC major_brand;
-  uint32 minor_version;
+  uint32_t minor_version;
 };
 
 // If only copying the 'pssh' boxes, use ProtectionSystemSpecificHeader.
@@ -51,29 +50,29 @@ struct MEDIA_EXPORT FileType : Box {
 struct MEDIA_EXPORT ProtectionSystemSpecificHeader : Box {
   DECLARE_BOX_METHODS(ProtectionSystemSpecificHeader);
 
-  std::vector<uint8> raw_box;
+  std::vector<uint8_t> raw_box;
 };
 
 struct MEDIA_EXPORT FullProtectionSystemSpecificHeader : Box {
   DECLARE_BOX_METHODS(FullProtectionSystemSpecificHeader);
 
-  std::vector<uint8> system_id;
-  std::vector<std::vector<uint8>> key_ids;
-  std::vector<uint8> data;
+  std::vector<uint8_t> system_id;
+  std::vector<std::vector<uint8_t>> key_ids;
+  std::vector<uint8_t> data;
 };
 
 struct MEDIA_EXPORT SampleAuxiliaryInformationOffset : Box {
   DECLARE_BOX_METHODS(SampleAuxiliaryInformationOffset);
 
-  std::vector<uint64> offsets;
+  std::vector<uint64_t> offsets;
 };
 
 struct MEDIA_EXPORT SampleAuxiliaryInformationSize : Box {
   DECLARE_BOX_METHODS(SampleAuxiliaryInformationSize);
 
-  uint8 default_sample_info_size;
-  uint32 sample_count;
-  std::vector<uint8> sample_info_sizes;
+  uint8_t default_sample_info_size;
+  uint32_t sample_count;
+  std::vector<uint8_t> sample_info_sizes;
 };
 
 struct MEDIA_EXPORT OriginalFormat : Box {
@@ -86,7 +85,7 @@ struct MEDIA_EXPORT SchemeType : Box {
   DECLARE_BOX_METHODS(SchemeType);
 
   FourCC type;
-  uint32 version;
+  uint32_t version;
 };
 
 struct MEDIA_EXPORT TrackEncryption : Box {
@@ -94,8 +93,8 @@ struct MEDIA_EXPORT TrackEncryption : Box {
 
   // Note: this definition is specific to the CENC protection type.
   bool is_encrypted;
-  uint8 default_iv_size;
-  std::vector<uint8> default_kid;
+  uint8_t default_iv_size;
+  std::vector<uint8_t> default_kid;
 };
 
 struct MEDIA_EXPORT SchemeInfo : Box {
@@ -115,34 +114,34 @@ struct MEDIA_EXPORT ProtectionSchemeInfo : Box {
 struct MEDIA_EXPORT MovieHeader : Box {
   DECLARE_BOX_METHODS(MovieHeader);
 
-  uint64 creation_time;
-  uint64 modification_time;
-  uint32 timescale;
-  uint64 duration;
-  int32 rate;
-  int16 volume;
-  uint32 next_track_id;
+  uint64_t creation_time;
+  uint64_t modification_time;
+  uint32_t timescale;
+  uint64_t duration;
+  int32_t rate;
+  int16_t volume;
+  uint32_t next_track_id;
 };
 
 struct MEDIA_EXPORT TrackHeader : Box {
   DECLARE_BOX_METHODS(TrackHeader);
 
-  uint64 creation_time;
-  uint64 modification_time;
-  uint32 track_id;
-  uint64 duration;
-  int16 layer;
-  int16 alternate_group;
-  int16 volume;
-  uint32 width;
-  uint32 height;
+  uint64_t creation_time;
+  uint64_t modification_time;
+  uint32_t track_id;
+  uint64_t duration;
+  int16_t layer;
+  int16_t alternate_group;
+  int16_t volume;
+  uint32_t width;
+  uint32_t height;
 };
 
 struct MEDIA_EXPORT EditListEntry {
-  uint64 segment_duration;
-  int64 media_time;
-  int16 media_rate_integer;
-  int16 media_rate_fraction;
+  uint64_t segment_duration;
+  int64_t media_time;
+  int16_t media_rate_integer;
+  int16_t media_rate_fraction;
 };
 
 struct MEDIA_EXPORT EditList : Box {
@@ -171,16 +170,16 @@ struct MEDIA_EXPORT AVCDecoderConfigurationRecord : Box {
   //       context and therefore the box header is not expected to be present
   //       in |data|.
   // Returns true if |data| was successfully parsed.
-  bool Parse(const uint8* data, int data_size);
+  bool Parse(const uint8_t* data, int data_size);
 
-  uint8 version;
-  uint8 profile_indication;
-  uint8 profile_compatibility;
-  uint8 avc_level;
-  uint8 length_size;
+  uint8_t version;
+  uint8_t profile_indication;
+  uint8_t profile_compatibility;
+  uint8_t avc_level;
+  uint8_t length_size;
 
-  typedef std::vector<uint8> SPS;
-  typedef std::vector<uint8> PPS;
+  typedef std::vector<uint8_t> SPS;
+  typedef std::vector<uint8_t> PPS;
 
   std::vector<SPS> sps_list;
   std::vector<PPS> pps_list;
@@ -193,17 +192,17 @@ struct MEDIA_EXPORT AVCDecoderConfigurationRecord : Box {
 struct MEDIA_EXPORT PixelAspectRatioBox : Box {
   DECLARE_BOX_METHODS(PixelAspectRatioBox);
 
-  uint32 h_spacing;
-  uint32 v_spacing;
+  uint32_t h_spacing;
+  uint32_t v_spacing;
 };
 
 struct MEDIA_EXPORT VideoSampleEntry : Box {
   DECLARE_BOX_METHODS(VideoSampleEntry);
 
   FourCC format;
-  uint16 data_reference_index;
-  uint16 width;
-  uint16 height;
+  uint16_t data_reference_index;
+  uint16_t width;
+  uint16_t height;
 
   PixelAspectRatioBox pixel_aspect;
   ProtectionSchemeInfo sinf;
@@ -219,7 +218,7 @@ struct MEDIA_EXPORT VideoSampleEntry : Box {
 struct MEDIA_EXPORT ElementaryStreamDescriptor : Box {
   DECLARE_BOX_METHODS(ElementaryStreamDescriptor);
 
-  uint8 object_type;
+  uint8_t object_type;
   AAC aac;
 };
 
@@ -227,10 +226,10 @@ struct MEDIA_EXPORT AudioSampleEntry : Box {
   DECLARE_BOX_METHODS(AudioSampleEntry);
 
   FourCC format;
-  uint16 data_reference_index;
-  uint16 channelcount;
-  uint16 samplesize;
-  uint32 samplerate;
+  uint16_t data_reference_index;
+  uint16_t channelcount;
+  uint16_t samplesize;
+  uint32_t samplerate;
 
   ProtectionSchemeInfo sinf;
   ElementaryStreamDescriptor esds;
@@ -249,14 +248,14 @@ struct MEDIA_EXPORT CencSampleEncryptionInfoEntry {
   ~CencSampleEncryptionInfoEntry();
 
   bool is_encrypted;
-  uint8 iv_size;
-  std::vector<uint8> key_id;
+  uint8_t iv_size;
+  std::vector<uint8_t> key_id;
 };
 
 struct MEDIA_EXPORT SampleGroupDescription : Box {  // 'sgpd'.
   DECLARE_BOX_METHODS(SampleGroupDescription);
 
-  uint32 grouping_type;
+  uint32_t grouping_type;
   std::vector<CencSampleEncryptionInfoEntry> entries;
 };
 
@@ -274,10 +273,10 @@ struct MEDIA_EXPORT SampleTable : Box {
 struct MEDIA_EXPORT MediaHeader : Box {
   DECLARE_BOX_METHODS(MediaHeader);
 
-  uint64 creation_time;
-  uint64 modification_time;
-  uint32 timescale;
-  uint64 duration;
+  uint64_t creation_time;
+  uint64_t modification_time;
+  uint32_t timescale;
+  uint64_t duration;
 };
 
 struct MEDIA_EXPORT MediaInformation : Box {
@@ -305,17 +304,17 @@ struct MEDIA_EXPORT Track : Box {
 struct MEDIA_EXPORT MovieExtendsHeader : Box {
   DECLARE_BOX_METHODS(MovieExtendsHeader);
 
-  uint64 fragment_duration;
+  uint64_t fragment_duration;
 };
 
 struct MEDIA_EXPORT TrackExtends : Box {
   DECLARE_BOX_METHODS(TrackExtends);
 
-  uint32 track_id;
-  uint32 default_sample_description_index;
-  uint32 default_sample_duration;
-  uint32 default_sample_size;
-  uint32 default_sample_flags;
+  uint32_t track_id;
+  uint32_t default_sample_description_index;
+  uint32_t default_sample_duration;
+  uint32_t default_sample_size;
+  uint32_t default_sample_flags;
 };
 
 struct MEDIA_EXPORT MovieExtends : Box {
@@ -338,24 +337,24 @@ struct MEDIA_EXPORT Movie : Box {
 struct MEDIA_EXPORT TrackFragmentDecodeTime : Box {
   DECLARE_BOX_METHODS(TrackFragmentDecodeTime);
 
-  uint64 decode_time;
+  uint64_t decode_time;
 };
 
 struct MEDIA_EXPORT MovieFragmentHeader : Box {
   DECLARE_BOX_METHODS(MovieFragmentHeader);
 
-  uint32 sequence_number;
+  uint32_t sequence_number;
 };
 
 struct MEDIA_EXPORT TrackFragmentHeader : Box {
   DECLARE_BOX_METHODS(TrackFragmentHeader);
 
-  uint32 track_id;
+  uint32_t track_id;
 
-  uint32 sample_description_index;
-  uint32 default_sample_duration;
-  uint32 default_sample_size;
-  uint32 default_sample_flags;
+  uint32_t sample_description_index;
+  uint32_t default_sample_duration;
+  uint32_t default_sample_size;
+  uint32_t default_sample_flags;
 
   // As 'flags' might be all zero, we cannot use zeroness alone to identify
   // when default_sample_flags wasn't specified, unlike the other values.
@@ -365,12 +364,12 @@ struct MEDIA_EXPORT TrackFragmentHeader : Box {
 struct MEDIA_EXPORT TrackFragmentRun : Box {
   DECLARE_BOX_METHODS(TrackFragmentRun);
 
-  uint32 sample_count;
-  uint32 data_offset;
-  std::vector<uint32> sample_flags;
-  std::vector<uint32> sample_sizes;
-  std::vector<uint32> sample_durations;
-  std::vector<int32> sample_composition_time_offsets;
+  uint32_t sample_count;
+  uint32_t data_offset;
+  std::vector<uint32_t> sample_flags;
+  std::vector<uint32_t> sample_sizes;
+  std::vector<uint32_t> sample_durations;
+  std::vector<int32_t> sample_composition_time_offsets;
 };
 
 // sample_depends_on values in ISO/IEC 14496-12 Section 8.40.2.3.
@@ -400,15 +399,15 @@ struct MEDIA_EXPORT SampleToGroupEntry {
     kFragmentGroupDescriptionIndexBase = 0x10000,
   };
 
-  uint32 sample_count;
-  uint32 group_description_index;
+  uint32_t sample_count;
+  uint32_t group_description_index;
 };
 
 struct MEDIA_EXPORT SampleToGroup : Box {  // 'sbgp'.
   DECLARE_BOX_METHODS(SampleToGroup);
 
-  uint32 grouping_type;
-  uint32 grouping_type_parameter;  // Version 1 only.
+  uint32_t grouping_type;
+  uint32_t grouping_type_parameter;  // Version 1 only.
   std::vector<SampleToGroupEntry> entries;
 };