| Index: chrome/renderer/media/cast_transport_sender_ipc.cc
|
| diff --git a/chrome/renderer/media/cast_transport_sender_ipc.cc b/chrome/renderer/media/cast_transport_sender_ipc.cc
|
| index afa858a5eace2511e51d5611082e10607db0b7f6..99ea4c5880f86609451f5c646778b01f0d16381d 100644
|
| --- a/chrome/renderer/media/cast_transport_sender_ipc.cc
|
| +++ b/chrome/renderer/media/cast_transport_sender_ipc.cc
|
| @@ -58,15 +58,16 @@ void CastTransportSenderIPC::InitializeVideo(
|
| Send(new CastHostMsg_InitializeVideo(channel_id_, config));
|
| }
|
|
|
| -void CastTransportSenderIPC::InsertFrame(uint32 ssrc,
|
| +void CastTransportSenderIPC::InsertFrame(
|
| + uint32_t ssrc,
|
| const media::cast::EncodedFrame& frame) {
|
| Send(new CastHostMsg_InsertFrame(channel_id_, ssrc, frame));
|
| }
|
|
|
| void CastTransportSenderIPC::SendSenderReport(
|
| - uint32 ssrc,
|
| + uint32_t ssrc,
|
| base::TimeTicks current_time,
|
| - uint32 current_time_as_rtp_timestamp) {
|
| + uint32_t current_time_as_rtp_timestamp) {
|
| Send(new CastHostMsg_SendSenderReport(channel_id_,
|
| ssrc,
|
| current_time,
|
| @@ -74,32 +75,31 @@ void CastTransportSenderIPC::SendSenderReport(
|
| }
|
|
|
| void CastTransportSenderIPC::CancelSendingFrames(
|
| - uint32 ssrc, const std::vector<uint32>& frame_ids) {
|
| + uint32_t ssrc,
|
| + const std::vector<uint32_t>& frame_ids) {
|
| Send(new CastHostMsg_CancelSendingFrames(channel_id_,
|
| ssrc,
|
| frame_ids));
|
| }
|
|
|
| -void CastTransportSenderIPC::ResendFrameForKickstart(
|
| - uint32 ssrc, uint32 frame_id) {
|
| +void CastTransportSenderIPC::ResendFrameForKickstart(uint32_t ssrc,
|
| + uint32_t frame_id) {
|
| Send(new CastHostMsg_ResendFrameForKickstart(channel_id_,
|
| ssrc,
|
| frame_id));
|
| }
|
|
|
| -void CastTransportSenderIPC::AddValidSsrc(uint32 ssrc) {
|
| +void CastTransportSenderIPC::AddValidSsrc(uint32_t ssrc) {
|
| Send(new CastHostMsg_AddValidSsrc(channel_id_, ssrc));
|
| }
|
|
|
| -
|
| void CastTransportSenderIPC::SendRtcpFromRtpReceiver(
|
| - uint32 ssrc,
|
| - uint32 sender_ssrc,
|
| + uint32_t ssrc,
|
| + uint32_t sender_ssrc,
|
| const media::cast::RtcpTimeData& time_data,
|
| const media::cast::RtcpCastMessage* cast_message,
|
| base::TimeDelta target_delay,
|
| - const media::cast::ReceiverRtcpEventSubscriber::RtcpEvents*
|
| - rtcp_events,
|
| + const media::cast::ReceiverRtcpEventSubscriber::RtcpEvents* rtcp_events,
|
| const media::cast::RtpReceiverStatistics* rtp_receiver_statistics) {
|
| // To avoid copies, we put pointers to objects we don't really
|
| // own into scoped pointers and then very carefully extract them again
|
| @@ -157,7 +157,7 @@ void CastTransportSenderIPC::OnRawEvents(
|
| taken_packet_events.Pass());
|
| }
|
|
|
| -void CastTransportSenderIPC::OnRtt(uint32 ssrc, base::TimeDelta rtt) {
|
| +void CastTransportSenderIPC::OnRtt(uint32_t ssrc, base::TimeDelta rtt) {
|
| ClientMap::iterator it = clients_.find(ssrc);
|
| if (it == clients_.end()) {
|
| LOG(ERROR) << "Received RTT report from for unknown SSRC: " << ssrc;
|
| @@ -168,7 +168,7 @@ void CastTransportSenderIPC::OnRtt(uint32 ssrc, base::TimeDelta rtt) {
|
| }
|
|
|
| void CastTransportSenderIPC::OnRtcpCastMessage(
|
| - uint32 ssrc,
|
| + uint32_t ssrc,
|
| const media::cast::RtcpCastMessage& cast_message) {
|
| ClientMap::iterator it = clients_.find(ssrc);
|
| if (it == clients_.end()) {
|
|
|