Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(732)

Unified Diff: media/video/picture.h

Issue 1534273002: Switch to standard integer types in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/video/picture.h
diff --git a/media/video/picture.h b/media/video/picture.h
index 1fb5096885fbc87a17b74c6d8c5a6497ff5bf9f0..e997dbb650cd8d85b9eadb9988ddd1c4c8fa54c4 100644
--- a/media/video/picture.h
+++ b/media/video/picture.h
@@ -5,7 +5,6 @@
#ifndef MEDIA_VIDEO_PICTURE_H_
#define MEDIA_VIDEO_PICTURE_H_
-#include "base/basictypes.h"
#include "gpu/command_buffer/common/mailbox.h"
#include "media/base/media_export.h"
#include "ui/gfx/geometry/rect.h"
@@ -17,20 +16,18 @@ namespace media {
// This is the media-namespace equivalent of PP_PictureBuffer_Dev.
class MEDIA_EXPORT PictureBuffer {
public:
- PictureBuffer(int32 id, gfx::Size size, uint32 texture_id);
- PictureBuffer(int32 id,
+ PictureBuffer(int32_t id, gfx::Size size, uint32_t texture_id);
+ PictureBuffer(int32_t id,
gfx::Size size,
- uint32 texture_id,
- uint32 internal_texture_id);
- PictureBuffer(int32 id,
+ uint32_t texture_id,
+ uint32_t internal_texture_id);
+ PictureBuffer(int32_t id,
gfx::Size size,
- uint32 texture_id,
+ uint32_t texture_id,
const gpu::Mailbox& texture_mailbox);
// Returns the client-specified id of the buffer.
- int32 id() const {
- return id_;
- }
+ int32_t id() const { return id_; }
// Returns the size of the buffer.
gfx::Size size() const {
@@ -40,21 +37,19 @@ class MEDIA_EXPORT PictureBuffer {
// Returns the id of the texture.
// NOTE: The texture id in the renderer process corresponds to a different
// texture id in the GPU process.
- uint32 texture_id() const {
- return texture_id_;
- }
+ uint32_t texture_id() const { return texture_id_; }
- uint32 internal_texture_id() const { return internal_texture_id_; }
+ uint32_t internal_texture_id() const { return internal_texture_id_; }
const gpu::Mailbox& texture_mailbox() const {
return texture_mailbox_;
}
private:
- int32 id_;
+ int32_t id_;
gfx::Size size_;
- uint32 texture_id_;
- uint32 internal_texture_id_;
+ uint32_t texture_id_;
+ uint32_t internal_texture_id_;
gpu::Mailbox texture_mailbox_;
};
@@ -62,22 +57,18 @@ class MEDIA_EXPORT PictureBuffer {
// This is the media-namespace equivalent of PP_Picture_Dev.
class MEDIA_EXPORT Picture {
public:
- Picture(int32 picture_buffer_id,
- int32 bitstream_buffer_id,
+ Picture(int32_t picture_buffer_id,
+ int32_t bitstream_buffer_id,
const gfx::Rect& visible_rect,
bool allow_overlay);
// Returns the id of the picture buffer where this picture is contained.
- int32 picture_buffer_id() const {
- return picture_buffer_id_;
- }
+ int32_t picture_buffer_id() const { return picture_buffer_id_; }
// Returns the id of the bitstream buffer from which this frame was decoded.
- int32 bitstream_buffer_id() const {
- return bitstream_buffer_id_;
- }
+ int32_t bitstream_buffer_id() const { return bitstream_buffer_id_; }
- void set_bitstream_buffer_id(int32 bitstream_buffer_id) {
+ void set_bitstream_buffer_id(int32_t bitstream_buffer_id) {
bitstream_buffer_id_ = bitstream_buffer_id;
}
@@ -89,8 +80,8 @@ class MEDIA_EXPORT Picture {
bool allow_overlay() const { return allow_overlay_; }
private:
- int32 picture_buffer_id_;
- int32 bitstream_buffer_id_;
+ int32_t picture_buffer_id_;
+ int32_t bitstream_buffer_id_;
gfx::Rect visible_rect_;
bool allow_overlay_;
};

Powered by Google App Engine
This is Rietveld 408576698