Switch to standard integer types in media/.

media/filters/gpu_video_decoder.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_FILTERS_GPU_VIDEO_DECODER_H_
 #define MEDIA_FILTERS_GPU_VIDEO_DECODER_H_
 
 #include <list>
 #include <map>
 #include <set>
@@ skipping 41 matching lines @@
                   const OutputCB& output_cb) override;
   void Decode(const scoped_refptr<DecoderBuffer>& buffer,
               const DecodeCB& decode_cb) override;
   void Reset(const base::Closure& closure) override;
   bool NeedsBitstreamConversion() const override;
   bool CanReadWithoutStalling() const override;
   int GetMaxDecodeRequests() const override;
 
   // VideoDecodeAccelerator::Client implementation.
   void NotifyCdmAttached(bool success) override;
-  void ProvidePictureBuffers(uint32 count,
+  void ProvidePictureBuffers(uint32_t count,
                              const gfx::Size& size,
-                             uint32 texture_target) override;
-  void DismissPictureBuffer(int32 id) override;
+                             uint32_t texture_target) override;
+  void DismissPictureBuffer(int32_t id) override;
   void PictureReady(const media::Picture& picture) override;
-  void NotifyEndOfBitstreamBuffer(int32 id) override;
+  void NotifyEndOfBitstreamBuffer(int32_t id) override;
   void NotifyFlushDone() override;
   void NotifyResetDone() override;
   void NotifyError(media::VideoDecodeAccelerator::Error error) override;
 
   static const char kDecoderName[];
 
  protected:
   ~GpuVideoDecoder() override;
 
  private:
@@ skipping 16 matching lines @@
   struct PendingDecoderBuffer {
     PendingDecoderBuffer(SHMBuffer* s,
                         const scoped_refptr<DecoderBuffer>& b,
                         const DecodeCB& done_cb);
     ~PendingDecoderBuffer();
     SHMBuffer* shm_buffer;
     scoped_refptr<DecoderBuffer> buffer;
     DecodeCB done_cb;
   };
 
-  typedef std::map<int32, PictureBuffer> PictureBufferMap;
+  typedef std::map<int32_t, PictureBuffer> PictureBufferMap;
 
   // Callback to set CDM. |cdm_attached_cb| is called when the decryptor in the
   // CDM has been completely attached to the pipeline.
   void SetCdm(CdmContext* cdm_context, const CdmAttachedCB& cdm_attached_cb);
 
   void DeliverFrame(const scoped_refptr<VideoFrame>& frame);
 
   // Static method is to allow it to run even after GVD is deleted.
   static void ReleaseMailbox(base::WeakPtr<GpuVideoDecoder> decoder,
                              media::GpuVideoAcceleratorFactories* factories,
-                             int64 picture_buffer_id,
-                             uint32 texture_id,
+                             int64_t picture_buffer_id,
+                             uint32_t texture_id,
                              const gpu::SyncToken& release_sync_token);
   // Indicate the picture buffer can be reused by the decoder.
-  void ReusePictureBuffer(int64 picture_buffer_id);
+  void ReusePictureBuffer(int64_t picture_buffer_id);
 
   void RecordBufferData(
       const BitstreamBuffer& bitstream_buffer, const DecoderBuffer& buffer);
-  void GetBufferData(int32 id, base::TimeDelta* timetamp,
-                     gfx::Rect* visible_rect, gfx::Size* natural_size);
+  void GetBufferData(int32_t id,
+                     base::TimeDelta* timetamp,
+                     gfx::Rect* visible_rect,
+                     gfx::Size* natural_size);
 
   void DestroyVDA();
 
   // Request a shared-memory segment of at least |min_size| bytes.  Will
   // allocate as necessary.
   scoped_ptr<SHMBuffer> GetSHM(size_t min_size);
 
   // Return a shared-memory segment to the available pool.
   void PutSHM(scoped_ptr<SHMBuffer> shm_buffer);
 
@@ skipping 32 matching lines @@
 
   // Callback to request/cancel CDM ready notification.
   SetCdmReadyCB set_cdm_ready_cb_;
   CdmAttachedCB cdm_attached_cb_;
 
   // Shared-memory buffer pool.  Since allocating SHM segments requires a
   // round-trip to the browser process, we keep allocation out of the
   // steady-state of the decoder.
   std::vector<SHMBuffer*> available_shm_segments_;
 
-  std::map<int32, PendingDecoderBuffer> bitstream_buffers_in_decoder_;
+  std::map<int32_t, PendingDecoderBuffer> bitstream_buffers_in_decoder_;
   PictureBufferMap assigned_picture_buffers_;
   // PictureBuffers given to us by VDA via PictureReady, which we sent forward
   // as VideoFrames to be rendered via decode_cb_, and which will be returned
   // to us via ReusePictureBuffer.
-  typedef std::map<int32 /* picture_buffer_id */, uint32 /* texture_id */>
+  typedef std::map<int32_t /* picture_buffer_id */, uint32_t /* texture_id */>
       PictureBufferTextureMap;
   PictureBufferTextureMap picture_buffers_at_display_;
 
   // The texture target used for decoded pictures.
-  uint32 decoder_texture_target_;
+  uint32_t decoder_texture_target_;
 
   struct BufferData {
-    BufferData(int32 bbid, base::TimeDelta ts, const gfx::Rect& visible_rect,
+    BufferData(int32_t bbid,
+               base::TimeDelta ts,
+               const gfx::Rect& visible_rect,
                const gfx::Size& natural_size);
     ~BufferData();
-    int32 bitstream_buffer_id;
+    int32_t bitstream_buffer_id;
     base::TimeDelta timestamp;
     gfx::Rect visible_rect;
     gfx::Size natural_size;
   };
   std::list<BufferData> input_buffer_data_;
 
   // picture_buffer_id and the frame wrapping the corresponding Picture, for
   // frames that have been decoded but haven't been requested by a Decode() yet.
-  int32 next_picture_buffer_id_;
-  int32 next_bitstream_buffer_id_;
+  int32_t next_picture_buffer_id_;
+  int32_t next_bitstream_buffer_id_;
 
   // Set during ProvidePictureBuffers(), used for checking and implementing
   // HasAvailableOutputFrames().
   int available_pictures_;
 
   // If true, the client cannot expect the VDA to produce any new decoded
   // frames, until it returns all PictureBuffers it may be holding back to the
   // VDA. In other words, the VDA may require all PictureBuffers to be able to
   // proceed with decoding the next frame.
   bool needs_all_picture_buffers_to_decode_;
 
   // Bound to factories_->GetMessageLoop().
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<GpuVideoDecoder> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuVideoDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_GPU_VIDEO_DECODER_H_