| Index: media/cast/receiver/cast_receiver_impl.cc
|
| diff --git a/media/cast/receiver/cast_receiver_impl.cc b/media/cast/receiver/cast_receiver_impl.cc
|
| index 83d8bf7928a72213e03f8f16595cf3e6efb7e9ec..c9aeefb63c6ae3480e84176a61f2f248635f947e 100644
|
| --- a/media/cast/receiver/cast_receiver_impl.cc
|
| +++ b/media/cast/receiver/cast_receiver_impl.cc
|
| @@ -46,7 +46,7 @@ void CastReceiverImpl::ReceivePacket(scoped_ptr<Packet> packet) {
|
| const uint8_t* const data = &packet->front();
|
| const size_t length = packet->size();
|
|
|
| - uint32 ssrc_of_sender;
|
| + uint32_t ssrc_of_sender;
|
| if (Rtcp::IsRtcpPacket(data, length)) {
|
| ssrc_of_sender = Rtcp::GetSsrcOfSender(data, length);
|
| } else if (!RtpParser::ParseSsrc(data, length, &ssrc_of_sender)) {
|
| @@ -123,8 +123,8 @@ void CastReceiverImpl::DecodeEncodedAudioFrame(
|
| audio_sampling_rate_,
|
| audio_codec_));
|
| }
|
| - const uint32 frame_id = encoded_frame->frame_id;
|
| - const uint32 rtp_timestamp = encoded_frame->rtp_timestamp;
|
| + const uint32_t frame_id = encoded_frame->frame_id;
|
| + const uint32_t rtp_timestamp = encoded_frame->rtp_timestamp;
|
| const base::TimeTicks playout_time = encoded_frame->reference_time;
|
| audio_decoder_->DecodeFrame(
|
| encoded_frame.Pass(),
|
| @@ -155,8 +155,8 @@ void CastReceiverImpl::DecodeEncodedVideoFrame(
|
|
|
| if (!video_decoder_)
|
| video_decoder_.reset(new VideoDecoder(cast_environment_, video_codec_));
|
| - const uint32 frame_id = encoded_frame->frame_id;
|
| - const uint32 rtp_timestamp = encoded_frame->rtp_timestamp;
|
| + const uint32_t frame_id = encoded_frame->frame_id;
|
| + const uint32_t rtp_timestamp = encoded_frame->rtp_timestamp;
|
| const base::TimeTicks playout_time = encoded_frame->reference_time;
|
| video_decoder_->DecodeFrame(
|
| encoded_frame.Pass(),
|
| @@ -172,8 +172,8 @@ void CastReceiverImpl::DecodeEncodedVideoFrame(
|
| void CastReceiverImpl::EmitDecodedAudioFrame(
|
| const scoped_refptr<CastEnvironment>& cast_environment,
|
| const AudioFrameDecodedCallback& callback,
|
| - uint32 frame_id,
|
| - uint32 rtp_timestamp,
|
| + uint32_t frame_id,
|
| + uint32_t rtp_timestamp,
|
| const base::TimeTicks& playout_time,
|
| scoped_ptr<AudioBus> audio_bus,
|
| bool is_continuous) {
|
| @@ -199,8 +199,8 @@ void CastReceiverImpl::EmitDecodedAudioFrame(
|
| void CastReceiverImpl::EmitDecodedVideoFrame(
|
| const scoped_refptr<CastEnvironment>& cast_environment,
|
| const VideoFrameDecodedCallback& callback,
|
| - uint32 frame_id,
|
| - uint32 rtp_timestamp,
|
| + uint32_t frame_id,
|
| + uint32_t rtp_timestamp,
|
| const base::TimeTicks& playout_time,
|
| const scoped_refptr<VideoFrame>& video_frame,
|
| bool is_continuous) {
|
|
|