Switch to standard integer types in media/.

media/filters/h264_bitstream_buffer.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.
 //
 // This file contains an implementation of a H264BitstreamBuffer class for
 // constructing raw bitstream buffers containing NAL units in
 // H.264 Annex-B stream format.
 // See H.264 spec Annex B and chapter 7for more details.
 
 #ifndef MEDIA_FILTERS_H264_BITSTREAM_BUFFER_H_
@@ skipping 15 matching lines @@
   H264BitstreamBuffer();
   ~H264BitstreamBuffer();
 
   // Discard all data and reset the buffer for reuse.
   void Reset();
 
   // Append |num_bits| bits to the stream from |val|.
   // |val| is interpreted in the host endianness.
   template <typename T>
   void AppendBits(size_t num_bits, T val) {
-    AppendU64(num_bits, static_cast<uint64>(val));
+    AppendU64(num_bits, static_cast<uint64_t>(val));
   }
 
   void AppendBits(size_t num_bits, bool val) {
     DCHECK_EQ(num_bits, 1ul);
     AppendBool(val);
   }
 
   // Append a one-bit bool/flag value |val| to the stream.
   void AppendBool(bool val);
 
@@ skipping 14 matching lines @@
   // returned by data() to be correct.
   void FinishNALU();
 
   // Return number of full bytes in the stream. Note that FinishNALU() has to
   // be called to flush cached bits, or the return value will not include them.
   size_t BytesInBuffer();
 
   // Return a pointer to the stream. FinishNALU() must be called before
   // accessing the stream, otherwise some bits may still be cached and not
   // in the buffer.
-  uint8* data();
+  uint8_t* data();
 
  private:
   FRIEND_TEST_ALL_PREFIXES(H264BitstreamBufferAppendBitsTest,
                            AppendAndVerifyBits);
 
   // Allocate additional memory (kGrowBytes bytes) for the buffer.
   void Grow();
 
   // Append |num_bits| bits from U64 value |val| (in host endianness).
-  void AppendU64(size_t num_bits, uint64 val);
+  void AppendU64(size_t num_bits, uint64_t val);
 
   // Flush any cached bits in the reg with byte granularity, i.e. enough
   // bytes to flush all pending bits, but not more.
   void FlushReg();
 
-  typedef uint64 RegType;
+  typedef uint64_t RegType;
   enum {
     // Sizes of reg_.
     kRegByteSize = sizeof(RegType),
     kRegBitSize = kRegByteSize * 8,
     // Amount of bytes to grow the buffer by when we run out of
     // previously-allocated memory for it.
     kGrowBytes = 4096,
   };
 
   static_assert(kGrowBytes >= kRegByteSize,
                 "kGrowBytes must be larger than kRegByteSize");
 
   // Unused bits left in reg_.
   size_t bits_left_in_reg_;
 
   // Cache for appended bits. Bits are flushed to data_ with kRegByteSize
   // granularity, i.e. when reg_ becomes full, or when an explicit FlushReg()
   // is called.
   RegType reg_;
 
   // Current capacity of data_, in bytes.
   size_t capacity_;
 
   // Current byte offset in data_ (points to the start of unwritten bits).
   size_t pos_;
 
   // Buffer for stream data.
-  uint8* data_;
+  uint8_t* data_;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_H264_BITSTREAM_BUFFER_H_