Index: chrome/renderer/media/cast_send_transport.h |
diff --git a/chrome/renderer/media/cast_send_transport.h b/chrome/renderer/media/cast_send_transport.h |
index b5c670aaafa779dcc39abfd6b5b62f88745c93a9..ee0ead6ffa182dfd5ef4f48614a66027fc56d21c 100644 |
--- a/chrome/renderer/media/cast_send_transport.h |
+++ b/chrome/renderer/media/cast_send_transport.h |
@@ -19,16 +19,16 @@ class CastSession; |
class CastUdpTransport; |
// A key value pair structure for codec specific parameters. |
-struct CastCodecSpecificParam { |
+struct CastCodecSpecificParams { |
std::string key; |
std::string value; |
- CastCodecSpecificParam(); |
- ~CastCodecSpecificParam(); |
+ CastCodecSpecificParams(); |
+ ~CastCodecSpecificParams(); |
}; |
// Defines the basic properties of a payload supported by cast transport. |
-struct CastRtpPayloadParam { |
+struct CastRtpPayloadParams { |
// RTP specific field that identifies the content type. |
int payload_type; |
@@ -52,16 +52,16 @@ struct CastRtpPayloadParam { |
std::string codec_name; |
// List of codec specific parameters. |
- std::vector<CastCodecSpecificParam> codec_specific_params; |
+ std::vector<CastCodecSpecificParams> codec_specific_params; |
- CastRtpPayloadParam(); |
- ~CastRtpPayloadParam(); |
+ CastRtpPayloadParams(); |
+ ~CastRtpPayloadParams(); |
}; |
// Defines the capabilities of the transport. |
struct CastRtpCaps { |
// Defines a list of supported payloads. |
- std::vector<CastRtpPayloadParam> payloads; |
+ std::vector<CastRtpPayloadParams> payloads; |
// Names of supported RTCP features. |
std::vector<std::string> rtcp_features; |
@@ -81,7 +81,8 @@ typedef CastRtpCaps CastRtpParams; |
// stream. |
class CastSendTransport { |
public: |
- explicit CastSendTransport(CastUdpTransport* udp_transport); |
+ CastSendTransport(CastUdpTransport* udp_transport, |
+ WebKit::WebMediaStreamTrack* track); |
scherkus (not reviewing)
2013/10/29 17:38:17
considering you're passing in NULL here and not ev
Alpha Left Google
2013/10/29 19:52:18
Done.
|
~CastSendTransport(); |
// Return capabilities currently spported by this transport. |
@@ -93,13 +94,9 @@ class CastSendTransport { |
// Return the best parameters given the capabilities of remote peer. |
CastRtpParams CreateParams(CastRtpCaps remote_caps); |
scherkus (not reviewing)
2013/10/29 17:38:17
any reason to pass by value versus const-ref?
Alpha Left Google
2013/10/29 19:52:18
Changed to use const &.
|
- // Begin encoding of media stream from |audio_track| and |video_track| |
- // and then submit the encoded streams to underlying transport. |
- // Either stream can be NULL but it is invalid for both streams to be |
- // NULL. |
- void Start(WebKit::WebMediaStreamTrack* audio_track, |
- WebKit::WebMediaStreamTrack* video_track, |
- CastRtpParams params); |
+ // Begin encoding of media stream and then submit the encoded streams |
+ // to underlying transport. |
+ void Start(CastRtpParams params); |
scherkus (not reviewing)
2013/10/29 17:38:17
ditto
Alpha Left Google
2013/10/29 19:52:18
Done.
|
// Stop encoding. |
void Stop(); |