| Index: content/renderer/pepper/video_encoder_shim.h
|
| diff --git a/content/renderer/pepper/video_encoder_shim.h b/content/renderer/pepper/video_encoder_shim.h
|
| index 44049efed6846d58f0a7135bd851dd03c54f5ae7..59b648adccd33b294123e54cc1d7d0a4524f6835 100644
|
| --- a/content/renderer/pepper/video_encoder_shim.h
|
| +++ b/content/renderer/pepper/video_encoder_shim.h
|
| @@ -5,8 +5,12 @@
|
| #ifndef CONTENT_RENDERER_PEPPER_VIDEO_ENCODER_SHIM_H_
|
| #define CONTENT_RENDERER_PEPPER_VIDEO_ENCODER_SHIM_H_
|
|
|
| +#include <stddef.h>
|
| +#include <stdint.h>
|
| +
|
| #include <vector>
|
|
|
| +#include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "media/video/video_encode_accelerator.h"
|
| @@ -38,13 +42,13 @@ class VideoEncoderShim : public media::VideoEncodeAccelerator {
|
| bool Initialize(media::VideoPixelFormat input_format,
|
| const gfx::Size& input_visible_size,
|
| media::VideoCodecProfile output_profile,
|
| - uint32 initial_bitrate,
|
| + uint32_t initial_bitrate,
|
| media::VideoEncodeAccelerator::Client* client) override;
|
| void Encode(const scoped_refptr<media::VideoFrame>& frame,
|
| bool force_keyframe) override;
|
| void UseOutputBitstreamBuffer(const media::BitstreamBuffer& buffer) override;
|
| - void RequestEncodingParametersChange(uint32 bitrate,
|
| - uint32 framerate) override;
|
| + void RequestEncodingParametersChange(uint32_t bitrate,
|
| + uint32_t framerate) override;
|
| void Destroy() override;
|
|
|
| private:
|
| @@ -54,7 +58,7 @@ class VideoEncoderShim : public media::VideoEncodeAccelerator {
|
| const gfx::Size& input_coded_size,
|
| size_t output_buffer_size);
|
| void OnBitstreamBufferReady(scoped_refptr<media::VideoFrame> frame,
|
| - int32 bitstream_buffer_id,
|
| + int32_t bitstream_buffer_id,
|
| size_t payload_size,
|
| bool key_frame);
|
| void OnNotifyError(media::VideoEncodeAccelerator::Error error);
|
|
|