| Index: content/renderer/pepper/pepper_video_decoder_host.h
|
| diff --git a/content/renderer/pepper/pepper_video_decoder_host.h b/content/renderer/pepper/pepper_video_decoder_host.h
|
| index b82a0cc4ed90fb3b4835c85d41656fe24e6153de..7a63d4f59e7d6d4bbc36131e8b460aa67841df6b 100644
|
| --- a/content/renderer/pepper/pepper_video_decoder_host.h
|
| +++ b/content/renderer/pepper/pepper_video_decoder_host.h
|
| @@ -5,13 +5,15 @@
|
| #ifndef CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_DECODER_HOST_H_
|
| #define CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_DECODER_HOST_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <list>
|
| #include <map>
|
| #include <set>
|
| #include <vector>
|
|
|
| -#include "base/basictypes.h"
|
| #include "base/containers/hash_tables.h"
|
| +#include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/scoped_vector.h"
|
| #include "content/common/content_export.h"
|
| @@ -70,12 +72,12 @@ class CONTENT_EXPORT PepperVideoDecoderHost
|
| ppapi::host::HostMessageContext* context) override;
|
|
|
| // media::VideoDecodeAccelerator::Client implementation.
|
| - void ProvidePictureBuffers(uint32 requested_num_of_buffers,
|
| + void ProvidePictureBuffers(uint32_t requested_num_of_buffers,
|
| const gfx::Size& dimensions,
|
| - uint32 texture_target) override;
|
| - void DismissPictureBuffer(int32 picture_buffer_id) override;
|
| + uint32_t texture_target) override;
|
| + void DismissPictureBuffer(int32_t picture_buffer_id) override;
|
| void PictureReady(const media::Picture& picture) override;
|
| - void NotifyEndOfBitstreamBuffer(int32 bitstream_buffer_id) override;
|
| + void NotifyEndOfBitstreamBuffer(int32_t bitstream_buffer_id) override;
|
| void NotifyFlushDone() override;
|
| void NotifyResetDone() override;
|
| void NotifyError(media::VideoDecodeAccelerator::Error error) override;
|
| @@ -103,9 +105,9 @@ class CONTENT_EXPORT PepperVideoDecoderHost
|
| // These methods are needed by VideoDecodeShim, to look like a
|
| // VideoDecodeAccelerator.
|
| const uint8_t* DecodeIdToAddress(uint32_t decode_id);
|
| - void RequestTextures(uint32 requested_num_of_buffers,
|
| + void RequestTextures(uint32_t requested_num_of_buffers,
|
| const gfx::Size& dimensions,
|
| - uint32 texture_target,
|
| + uint32_t texture_target,
|
| const std::vector<gpu::Mailbox>& mailboxes);
|
|
|
| // Tries to initialize software decoder. Returns true on success.
|
|
|