| Index: media/cast/receiver/video_decoder.cc
|
| diff --git a/media/cast/receiver/video_decoder.cc b/media/cast/receiver/video_decoder.cc
|
| index e94238004770666eefc8cf40e368f358c3a12488..96ec359d06cb3ffdfb9a986295e85c9394bbb6e1 100644
|
| --- a/media/cast/receiver/video_decoder.cc
|
| +++ b/media/cast/receiver/video_decoder.cc
|
| @@ -49,7 +49,7 @@ class VideoDecoder::ImplBase
|
| "size of frame_id types do not match");
|
| bool is_continuous = true;
|
| if (seen_first_frame_) {
|
| - const uint32 frames_ahead = encoded_frame->frame_id - last_frame_id_;
|
| + const uint32_t frames_ahead = encoded_frame->frame_id - last_frame_id_;
|
| if (frames_ahead > 1) {
|
| RecoverBecauseFramesWereDropped();
|
| is_continuous = false;
|
| @@ -84,7 +84,7 @@ class VideoDecoder::ImplBase
|
| virtual void RecoverBecauseFramesWereDropped() {}
|
|
|
| // Note: Implementation of Decode() is allowed to mutate |data|.
|
| - virtual scoped_refptr<VideoFrame> Decode(uint8* data, int len) = 0;
|
| + virtual scoped_refptr<VideoFrame> Decode(uint8_t* data, int len) = 0;
|
|
|
| const scoped_refptr<CastEnvironment> cast_environment_;
|
| const Codec codec_;
|
| @@ -97,7 +97,7 @@ class VideoDecoder::ImplBase
|
|
|
| private:
|
| bool seen_first_frame_;
|
| - uint32 last_frame_id_;
|
| + uint32_t last_frame_id_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ImplBase);
|
| };
|
| @@ -131,7 +131,7 @@ class VideoDecoder::Vp8Impl : public VideoDecoder::ImplBase {
|
| CHECK_EQ(VPX_CODEC_OK, vpx_codec_destroy(&context_));
|
| }
|
|
|
| - scoped_refptr<VideoFrame> Decode(uint8* data, int len) final {
|
| + scoped_refptr<VideoFrame> Decode(uint8_t* data, int len) final {
|
| if (len <= 0 || vpx_codec_decode(&context_,
|
| data,
|
| static_cast<unsigned int>(len),
|
| @@ -193,7 +193,7 @@ class VideoDecoder::FakeImpl : public VideoDecoder::ImplBase {
|
| private:
|
| ~FakeImpl() final {}
|
|
|
| - scoped_refptr<VideoFrame> Decode(uint8* data, int len) final {
|
| + scoped_refptr<VideoFrame> Decode(uint8_t* data, int len) final {
|
| // Make sure this is a JSON string.
|
| if (!len || data[0] != '{')
|
| return NULL;
|
|
|