Switch to standard integer types in media/.

media/base/decoder_buffer.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_DECODER_BUFFER_H_
 #define MEDIA_BASE_DECODER_BUFFER_H_
 
 #include <string>
 #include <utility>
 
@@ skipping 30 matching lines @@
 #endif
   };
 
   // Allocates buffer with |size| >= 0.  Buffer will be padded and aligned
   // as necessary, and |is_key_frame_| will default to false.
   explicit DecoderBuffer(int size);
 
   // Create a DecoderBuffer whose |data_| is copied from |data|.  Buffer will be
   // padded and aligned as necessary.  |data| must not be NULL and |size| >= 0.
   // The buffer's |is_key_frame_| will default to false.
-  static scoped_refptr<DecoderBuffer> CopyFrom(const uint8* data, int size);
+  static scoped_refptr<DecoderBuffer> CopyFrom(const uint8_t* data, int size);
 
   // Create a DecoderBuffer whose |data_| is copied from |data| and |side_data_|
   // is copied from |side_data|. Buffers will be padded and aligned as necessary
   // Data pointers must not be NULL and sizes must be >= 0. The buffer's
   // |is_key_frame_| will default to false.
-  static scoped_refptr<DecoderBuffer> CopyFrom(const uint8* data, int size,
-                                               const uint8* side_data,
+  static scoped_refptr<DecoderBuffer> CopyFrom(const uint8_t* data,
+                                               int size,
+                                               const uint8_t* side_data,
                                                int side_data_size);
 
   // Create a DecoderBuffer indicating we've reached end of stream.
   //
   // Calling any method other than end_of_stream() on the resulting buffer
   // is disallowed.
   static scoped_refptr<DecoderBuffer> CreateEOSBuffer();
 
   base::TimeDelta timestamp() const {
     DCHECK(!end_of_stream());
@@ skipping 10 matching lines @@
   }
 
   void set_duration(base::TimeDelta duration) {
     DCHECK(!end_of_stream());
     DCHECK(duration == kNoTimestamp() ||
            (duration >= base::TimeDelta() && duration != kInfiniteDuration()))
         << duration.InSecondsF();
     duration_ = duration;
   }
 
-  const uint8* data() const {
+  const uint8_t* data() const {
     DCHECK(!end_of_stream());
     return data_.get();
   }
 
-  uint8* writable_data() const {
+  uint8_t* writable_data() const {
     DCHECK(!end_of_stream());
     return data_.get();
   }
 
   // TODO(servolk): data_size should return size_t instead of int
   int data_size() const {
     DCHECK(!end_of_stream());
     return size_;
   }
 
-  const uint8* side_data() const {
+  const uint8_t* side_data() const {
     DCHECK(!end_of_stream());
     return side_data_.get();
   }
 
   // TODO(servolk): side_data_size should return size_t instead of int
   int side_data_size() const {
     DCHECK(!end_of_stream());
     return side_data_size_;
   }
 
@@ skipping 49 matching lines @@
 
   void set_is_key_frame(bool is_key_frame) {
     DCHECK(!end_of_stream());
     is_key_frame_ = is_key_frame;
   }
 
   // Returns a human-readable string describing |*this|.
   std::string AsHumanReadableString();
 
   // Replaces any existing side data with data copied from |side_data|.
-  void CopySideDataFrom(const uint8* side_data, int side_data_size);
+  void CopySideDataFrom(const uint8_t* side_data, int side_data_size);
 
  protected:
   friend class base::RefCountedThreadSafe<DecoderBuffer>;
 
   // Allocates a buffer of size |size| >= 0 and copies |data| into it.  Buffer
   // will be padded and aligned as necessary.  If |data| is NULL then |data_| is
   // set to NULL and |buffer_size_| to 0.  |is_key_frame_| will default to
   // false.
-  DecoderBuffer(const uint8* data, int size,
-                const uint8* side_data, int side_data_size);
+  DecoderBuffer(const uint8_t* data,
+                int size,
+                const uint8_t* side_data,
+                int side_data_size);
   virtual ~DecoderBuffer();
 
  private:
   base::TimeDelta timestamp_;
   base::TimeDelta duration_;
 
   // TODO(servolk): Consider changing size_/side_data_size_ types to size_t.
   int size_;
-  scoped_ptr<uint8, base::AlignedFreeDeleter> data_;
+  scoped_ptr<uint8_t, base::AlignedFreeDeleter> data_;
   int side_data_size_;
-  scoped_ptr<uint8, base::AlignedFreeDeleter> side_data_;
+  scoped_ptr<uint8_t, base::AlignedFreeDeleter> side_data_;
   scoped_ptr<DecryptConfig> decrypt_config_;
   DiscardPadding discard_padding_;
   base::TimeDelta splice_timestamp_;
   bool is_key_frame_;
 
   // Constructor helper method for memory allocations.
   void Initialize();
 
   DISALLOW_COPY_AND_ASSIGN(DecoderBuffer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_DECODER_BUFFER_H_