Remove kuint64max.

media/formats/mp4/mp4_stream_parser.h

 // Copyright 2014 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.
 
 #ifndef MEDIA_FORMATS_MP4_MP4_STREAM_PARSER_H_
 #define MEDIA_FORMATS_MP4_MP4_STREAM_PARSER_H_
 
+#include <stdint.h>
+
 #include <set>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/media_export.h"
 #include "media/base/stream_parser.h"
 #include "media/formats/common/offset_byte_queue.h"
 #include "media/formats/mp4/track_run_iterator.h"
 
 namespace media {
 namespace mp4 {
 
 struct Movie;
 class BoxReader;
 
 class MEDIA_EXPORT MP4StreamParser : public StreamParser {
  public:
   MP4StreamParser(const std::set<int>& audio_object_types, bool has_sbr);
   ~MP4StreamParser() override;
 
   void Init(const InitCB& init_cb,
             const NewConfigCB& config_cb,
             const NewBuffersCB& new_buffers_cb,
             bool ignore_text_tracks,
             const EncryptedMediaInitDataCB& encrypted_media_init_data_cb,
             const NewMediaSegmentCB& new_segment_cb,
             const base::Closure& end_of_segment_cb,
             const scoped_refptr<MediaLog>& media_log) override;
   void Flush() override;
-  bool Parse(const uint8* buf, int size) override;
+  bool Parse(const uint8_t* buf, int size) override;
 
  private:
   enum State {
     kWaitingForInit,
     kParsingBoxes,
     kWaitingForSampleData,
     kEmittingSamples,
     kError
   };
 
   bool ParseBox(bool* err);
   bool ParseMoov(mp4::BoxReader* reader);
   bool ParseMoof(mp4::BoxReader* reader);
 
   void OnEncryptedMediaInitData(
       const std::vector<ProtectionSystemSpecificHeader>& headers);
 
   // To retain proper framing, each 'mdat' atom must be read; to limit memory
   // usage, the atom's data needs to be discarded incrementally as frames are
   // extracted from the stream. This function discards data from the stream up
   // to |max_clear_offset|, updating the |mdat_tail_| value so that framing can
   // be retained after all 'mdat' information has been read. |max_clear_offset|
   // is the upper bound on what can be removed from |queue_|. Anything below
   // this offset is no longer needed by the parser.
   // Returns 'true' on success, 'false' if there was an error.
-  bool ReadAndDiscardMDATsUntil(int64 max_clear_offset);
+  bool ReadAndDiscardMDATsUntil(int64_t max_clear_offset);
 
   void ChangeState(State new_state);
 
   bool EmitConfigs();
   bool PrepareAACBuffer(const AAC& aac_config,
-                        std::vector<uint8>* frame_buf,
+                        std::vector<uint8_t>* frame_buf,
                         std::vector<SubsampleEntry>* subsamples) const;
   bool EnqueueSample(BufferQueue* audio_buffers,
                      BufferQueue* video_buffers,
                      bool* err);
   bool SendAndFlushSamples(BufferQueue* audio_buffers,
                            BufferQueue* video_buffers);
 
   void Reset();
 
   // Checks to see if we have enough data in |queue_| to transition to
@@ skipping 14 matching lines @@
   base::Closure end_of_segment_cb_;
   scoped_refptr<MediaLog> media_log_;
 
   OffsetByteQueue queue_;
 
   // These two parameters are only valid in the |kEmittingSegments| state.
   //
   // |moof_head_| is the offset of the start of the most recently parsed moof
   // block. All byte offsets in sample information are relative to this offset,
   // as mandated by the Media Source spec.
-  int64 moof_head_;
+  int64_t moof_head_;
   // |mdat_tail_| is the stream offset of the end of the current 'mdat' box.
   // Valid iff it is greater than the head of the queue.
-  int64 mdat_tail_;
+  int64_t mdat_tail_;
 
   // The highest end offset in the current moof. This offset is
   // relative to |moof_head_|. This value is used to make sure we have collected
   // enough bytes to parse all samples and aux_info in the current moof.
-  int64 highest_end_offset_;
+  int64_t highest_end_offset_;
 
   scoped_ptr<mp4::Movie> moov_;
   scoped_ptr<mp4::TrackRunIterator> runs_;
 
   bool has_audio_;
   bool has_video_;
-  uint32 audio_track_id_;
-  uint32 video_track_id_;
+  uint32_t audio_track_id_;
+  uint32_t video_track_id_;
   // The object types allowed for audio tracks.
   std::set<int> audio_object_types_;
   bool has_sbr_;
   bool is_audio_track_encrypted_;
   bool is_video_track_encrypted_;
 
   // Tracks the number of MEDIA_LOGs for skipping top level boxes. Useful to
   // prevent log spam.
   int num_top_level_box_skipped_;
 
   DISALLOW_COPY_AND_ASSIGN(MP4StreamParser);
 };
 
 }  // namespace mp4
 }  // namespace media
 
 #endif  // MEDIA_FORMATS_MP4_MP4_STREAM_PARSER_H_