Switch to standard integer types in media/.

media/base/stream_parser.h

 // Copyright (c) 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.
 
 #ifndef MEDIA_BASE_STREAM_PARSER_H_
 #define MEDIA_BASE_STREAM_PARSER_H_
 
 #include <deque>
 #include <map>
 #include <string>
@@ skipping 88 matching lines @@
                               const BufferQueue&,
                               const TextBufferQueueMap&)> NewBuffersCB;
 
   // Signals the beginning of a new media segment.
   typedef base::Callback<void()> NewMediaSegmentCB;
 
   // A new potentially encrypted stream has been parsed.
   // First parameter - The type of the initialization data associated with the
   //                   stream.
   // Second parameter - The initialization data associated with the stream.
-  typedef base::Callback<void(EmeInitDataType, const std::vector<uint8>&)>
+  typedef base::Callback<void(EmeInitDataType, const std::vector<uint8_t>&)>
       EncryptedMediaInitDataCB;
 
   StreamParser();
   virtual ~StreamParser();
 
   // Initializes the parser with necessary callbacks. Must be called before any
   // data is passed to Parse(). |init_cb| will be called once enough data has
   // been parsed to determine the initial stream configurations, presentation
   // start time, and duration. If |ignore_text_track| is true, then no text
   // buffers should be passed later by the parser to |new_buffers_cb|.
   virtual void Init(
       const InitCB& init_cb,
       const NewConfigCB& config_cb,
       const NewBuffersCB& new_buffers_cb,
       bool ignore_text_track,
       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) = 0;
 
   // Called when a seek occurs. This flushes the current parser state
   // and puts the parser in a state where it can receive data for the new seek
   // point.
   virtual void Flush() = 0;
 
   // Called when there is new data to parse.
   //
   // Returns true if the parse succeeds.
-  virtual bool Parse(const uint8* buf, int size) = 0;
+  virtual bool Parse(const uint8_t* buf, int size) = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(StreamParser);
 };
 
 // Appends to |merged_buffers| the provided buffers in decode-timestamp order.
 // Any previous contents of |merged_buffers| is assumed to have lower
 // decode timestamps versus the provided buffers. All provided buffer queues
 // are assumed to already be in decode-timestamp order.
 // Returns false if any of the provided audio/video/text buffers are found
 // to not be in decode timestamp order, or have a decode timestamp less than
 // the last buffer, if any, in |merged_buffers|. Partial results may exist
 // in |merged_buffers| in this case. Returns true on success.
 // No validation of media type within the various buffer queues is done here.
 // TODO(wolenetz/acolwell): Merge incrementally in parsers to eliminate
 // subtle issues with tie-breaking. See http://crbug.com/338484.
 MEDIA_EXPORT bool MergeBufferQueues(
     const StreamParser::BufferQueue& audio_buffers,
     const StreamParser::BufferQueue& video_buffers,
     const StreamParser::TextBufferQueueMap& text_buffers,
     StreamParser::BufferQueue* merged_buffers);
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_STREAM_PARSER_H_