| Index: chrome/renderer/media/cast_transport_sender_ipc.h
|
| diff --git a/chrome/renderer/media/cast_transport_sender_ipc.h b/chrome/renderer/media/cast_transport_sender_ipc.h
|
| index ce18964c04de0876e64e5fb2727944eaaaf85d1e..683a4584db2291ea48943754637fc1bad4275baa 100644
|
| --- a/chrome/renderer/media/cast_transport_sender_ipc.h
|
| +++ b/chrome/renderer/media/cast_transport_sender_ipc.h
|
| @@ -5,8 +5,11 @@
|
| #ifndef CHROME_RENDERER_MEDIA_CAST_TRANSPORT_SENDER_IPC_H_
|
| #define CHROME_RENDERER_MEDIA_CAST_TRANSPORT_SENDER_IPC_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <map>
|
|
|
| +#include "base/macros.h"
|
| #include "base/thread_task_runner_handle.h"
|
| #include "ipc/ipc_channel_proxy.h"
|
| #include "media/cast/logging/logging_defines.h"
|
| @@ -39,23 +42,22 @@ class CastTransportSenderIPC
|
| const media::cast::CastTransportRtpConfig& config,
|
| const media::cast::RtcpCastMessageCallback& cast_message_cb,
|
| const media::cast::RtcpRttCallback& rtt_cb) override;
|
| - void InsertFrame(uint32 ssrc,
|
| + void InsertFrame(uint32_t ssrc,
|
| const media::cast::EncodedFrame& frame) override;
|
| - void SendSenderReport(uint32 ssrc,
|
| + void SendSenderReport(uint32_t ssrc,
|
| base::TimeTicks current_time,
|
| - uint32 current_time_as_rtp_timestamp) override;
|
| - void CancelSendingFrames(uint32 ssrc,
|
| - const std::vector<uint32>& frame_ids) override;
|
| - void ResendFrameForKickstart(uint32 ssrc, uint32 frame_id) override;
|
| - void AddValidSsrc(uint32 ssrc) override;
|
| + uint32_t current_time_as_rtp_timestamp) override;
|
| + void CancelSendingFrames(uint32_t ssrc,
|
| + const std::vector<uint32_t>& frame_ids) override;
|
| + void ResendFrameForKickstart(uint32_t ssrc, uint32_t frame_id) override;
|
| + void AddValidSsrc(uint32_t ssrc) override;
|
| void 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)
|
| override;
|
|
|
| @@ -63,8 +65,8 @@ class CastTransportSenderIPC
|
| media::cast::CastTransportStatus status);
|
| void OnRawEvents(const std::vector<media::cast::PacketEvent>& packet_events,
|
| const std::vector<media::cast::FrameEvent>& frame_events);
|
| - void OnRtt(uint32 ssrc, base::TimeDelta rtt);
|
| - void OnRtcpCastMessage(uint32 ssrc,
|
| + void OnRtt(uint32_t ssrc, base::TimeDelta rtt);
|
| + void OnRtcpCastMessage(uint32_t ssrc,
|
| const media::cast::RtcpCastMessage& cast_message);
|
| void OnReceivedPacket(const media::cast::Packet& packet);
|
|
|
| @@ -79,11 +81,11 @@ class CastTransportSenderIPC
|
|
|
| void Send(IPC::Message* message);
|
|
|
| - int32 channel_id_;
|
| + int32_t channel_id_;
|
| media::cast::PacketReceiverCallback packet_callback_;
|
| media::cast::CastTransportStatusCallback status_callback_;
|
| media::cast::BulkRawEventsCallback raw_events_callback_;
|
| - typedef std::map<uint32, ClientCallbacks> ClientMap;
|
| + typedef std::map<uint32_t, ClientCallbacks> ClientMap;
|
| ClientMap clients_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(CastTransportSenderIPC);
|
|
|