| Index: chrome/browser/media/cast_transport_host_filter.h
|
| diff --git a/chrome/browser/media/cast_transport_host_filter.h b/chrome/browser/media/cast_transport_host_filter.h
|
| index 094d7e7f62c38b805752e1baf62472be06142a42..8fbf47845bbfa4c9aa389c669f2321e1467be8d6 100644
|
| --- a/chrome/browser/media/cast_transport_host_filter.h
|
| +++ b/chrome/browser/media/cast_transport_host_filter.h
|
| @@ -5,7 +5,10 @@
|
| #ifndef CHROME_BROWSER_MEDIA_CAST_TRANSPORT_HOST_FILTER_H_
|
| #define CHROME_BROWSER_MEDIA_CAST_TRANSPORT_HOST_FILTER_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include "base/id_map.h"
|
| +#include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/time/default_tick_clock.h"
|
| @@ -27,53 +30,50 @@ class CastTransportHostFilter : public content::BrowserMessageFilter {
|
| private:
|
| ~CastTransportHostFilter() override;
|
|
|
| - void NotifyStatusChange(
|
| - int32 channel_id,
|
| - media::cast::CastTransportStatus result);
|
| + void NotifyStatusChange(int32_t channel_id,
|
| + media::cast::CastTransportStatus result);
|
| void SendRawEvents(
|
| - int32 channel_id,
|
| + int32_t channel_id,
|
| scoped_ptr<std::vector<media::cast::FrameEvent>> frame_events,
|
| scoped_ptr<std::vector<media::cast::PacketEvent>> packet_events);
|
| - void SendRtt(int32 channel_id, uint32 ssrc, base::TimeDelta rtt);
|
| - void SendCastMessage(int32 channel_id,
|
| - uint32 ssrc,
|
| + void SendRtt(int32_t channel_id, uint32_t ssrc, base::TimeDelta rtt);
|
| + void SendCastMessage(int32_t channel_id,
|
| + uint32_t ssrc,
|
| const media::cast::RtcpCastMessage& cast_message);
|
| - void ReceivedPacket(int32 channel_id, scoped_ptr<media::cast::Packet> packet);
|
| + void ReceivedPacket(int32_t channel_id,
|
| + scoped_ptr<media::cast::Packet> packet);
|
|
|
| // BrowserMessageFilter implementation.
|
| bool OnMessageReceived(const IPC::Message& message) override;
|
|
|
| // Forwarding functions.
|
| - void OnInitializeAudio(
|
| - int32 channel_id,
|
| - const media::cast::CastTransportRtpConfig& config);
|
| - void OnInitializeVideo(
|
| - int32 channel_id,
|
| - const media::cast::CastTransportRtpConfig& config);
|
| - void OnInsertFrame(
|
| - int32 channel_id,
|
| - uint32 ssrc,
|
| - const media::cast::EncodedFrame& frame);
|
| - void OnSendSenderReport(
|
| - int32 channel_id,
|
| - uint32 ssrc,
|
| - base::TimeTicks current_time,
|
| - uint32 current_time_as_rtp_timestamp);
|
| - void OnCancelSendingFrames(int32 channel_id, uint32 ssrc,
|
| - const std::vector<uint32>& frame_ids);
|
| - void OnResendFrameForKickstart(int32 channel_id, uint32 ssrc,
|
| - uint32 frame_id);
|
| - void OnAddValidSsrc(int32 channel_id, uint32 ssrc);
|
| + void OnInitializeAudio(int32_t channel_id,
|
| + const media::cast::CastTransportRtpConfig& config);
|
| + void OnInitializeVideo(int32_t channel_id,
|
| + const media::cast::CastTransportRtpConfig& config);
|
| + void OnInsertFrame(int32_t channel_id,
|
| + uint32_t ssrc,
|
| + const media::cast::EncodedFrame& frame);
|
| + void OnSendSenderReport(int32_t channel_id,
|
| + uint32_t ssrc,
|
| + base::TimeTicks current_time,
|
| + uint32_t current_time_as_rtp_timestamp);
|
| + void OnCancelSendingFrames(int32_t channel_id,
|
| + uint32_t ssrc,
|
| + const std::vector<uint32_t>& frame_ids);
|
| + void OnResendFrameForKickstart(int32_t channel_id,
|
| + uint32_t ssrc,
|
| + uint32_t frame_id);
|
| + void OnAddValidSsrc(int32_t channel_id, uint32_t ssrc);
|
| void OnSendRtcpFromRtpReceiver(
|
| - int32 channel_id,
|
| + int32_t channel_id,
|
| const media::cast::SendRtcpFromRtpReceiver_Params& params);
|
|
|
| - void OnNew(
|
| - int32 channel_id,
|
| - const net::IPEndPoint& local_end_point,
|
| - const net::IPEndPoint& remote_end_point,
|
| - const base::DictionaryValue& options);
|
| - void OnDelete(int32 channel_id);
|
| + void OnNew(int32_t channel_id,
|
| + const net::IPEndPoint& local_end_point,
|
| + const net::IPEndPoint& remote_end_point,
|
| + const base::DictionaryValue& options);
|
| + void OnDelete(int32_t channel_id);
|
|
|
| IDMap<media::cast::CastTransportSender, IDMapOwnPointer> id_map_;
|
|
|
|
|