Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(300)

Side by Side Diff: chrome/renderer/media/cast_transport_sender_ipc.h

Issue 519443002: Cast: merge InsertCoded{Audio,Video}Frame into InsertFrame (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: one more missing test file fixed Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/common/cast_messages.h ('k') | chrome/renderer/media/cast_transport_sender_ipc.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_RENDERER_MEDIA_CAST_TRANSPORT_SENDER_IPC_H_ 5 #ifndef CHROME_RENDERER_MEDIA_CAST_TRANSPORT_SENDER_IPC_H_
6 #define CHROME_RENDERER_MEDIA_CAST_TRANSPORT_SENDER_IPC_H_ 6 #define CHROME_RENDERER_MEDIA_CAST_TRANSPORT_SENDER_IPC_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/message_loop/message_loop_proxy.h" 10 #include "base/message_loop/message_loop_proxy.h"
(...skipping 18 matching lines...) Expand all
29 29
30 // media::cast::CastTransportSender implementation. 30 // media::cast::CastTransportSender implementation.
31 virtual void InitializeAudio( 31 virtual void InitializeAudio(
32 const media::cast::CastTransportRtpConfig& config, 32 const media::cast::CastTransportRtpConfig& config,
33 const media::cast::RtcpCastMessageCallback& cast_message_cb, 33 const media::cast::RtcpCastMessageCallback& cast_message_cb,
34 const media::cast::RtcpRttCallback& rtt_cb) OVERRIDE; 34 const media::cast::RtcpRttCallback& rtt_cb) OVERRIDE;
35 virtual void InitializeVideo( 35 virtual void InitializeVideo(
36 const media::cast::CastTransportRtpConfig& config, 36 const media::cast::CastTransportRtpConfig& config,
37 const media::cast::RtcpCastMessageCallback& cast_message_cb, 37 const media::cast::RtcpCastMessageCallback& cast_message_cb,
38 const media::cast::RtcpRttCallback& rtt_cb) OVERRIDE; 38 const media::cast::RtcpRttCallback& rtt_cb) OVERRIDE;
39 virtual void InsertCodedAudioFrame( 39 virtual void InsertFrame(uint32 ssrc,
40 const media::cast::EncodedFrame& audio_frame) OVERRIDE; 40 const media::cast::EncodedFrame& frame) OVERRIDE;
41 virtual void InsertCodedVideoFrame(
42 const media::cast::EncodedFrame& video_frame) OVERRIDE;
43 virtual void SendSenderReport( 41 virtual void SendSenderReport(
44 uint32 ssrc, 42 uint32 ssrc,
45 base::TimeTicks current_time, 43 base::TimeTicks current_time,
46 uint32 current_time_as_rtp_timestamp) OVERRIDE; 44 uint32 current_time_as_rtp_timestamp) OVERRIDE;
47 virtual void CancelSendingFrames( 45 virtual void CancelSendingFrames(
48 uint32 ssrc, 46 uint32 ssrc,
49 const std::vector<uint32>& frame_ids) OVERRIDE; 47 const std::vector<uint32>& frame_ids) OVERRIDE;
50 virtual void ResendFrameForKickstart(uint32 ssrc, uint32 frame_id) OVERRIDE; 48 virtual void ResendFrameForKickstart(uint32 ssrc, uint32 frame_id) OVERRIDE;
51 49
52 void OnNotifyStatusChange( 50 void OnNotifyStatusChange(
(...skipping 19 matching lines...) Expand all
72 media::cast::PacketReceiverCallback packet_callback_; 70 media::cast::PacketReceiverCallback packet_callback_;
73 media::cast::CastTransportStatusCallback status_callback_; 71 media::cast::CastTransportStatusCallback status_callback_;
74 media::cast::BulkRawEventsCallback raw_events_callback_; 72 media::cast::BulkRawEventsCallback raw_events_callback_;
75 typedef std::map<uint32, ClientCallbacks> ClientMap; 73 typedef std::map<uint32, ClientCallbacks> ClientMap;
76 ClientMap clients_; 74 ClientMap clients_;
77 75
78 DISALLOW_COPY_AND_ASSIGN(CastTransportSenderIPC); 76 DISALLOW_COPY_AND_ASSIGN(CastTransportSenderIPC);
79 }; 77 };
80 78
81 #endif // CHROME_RENDERER_MEDIA_CAST_TRANSPORT_SENDER_IPC_H_ 79 #endif // CHROME_RENDERER_MEDIA_CAST_TRANSPORT_SENDER_IPC_H_
OLDNEW
« no previous file with comments | « chrome/common/cast_messages.h ('k') | chrome/renderer/media/cast_transport_sender_ipc.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698