Chromium Code Reviews| Index: media/cast/transport/cast_transport_config.h |
| diff --git a/media/cast/transport/cast_transport_config.h b/media/cast/transport/cast_transport_config.h |
| index cddd6d11e8563ef677728496112c6045c7da5e2e..cb7eefe9508db6064929d5ec5dd51edaca047838 100644 |
| --- a/media/cast/transport/cast_transport_config.h |
| +++ b/media/cast/transport/cast_transport_config.h |
| @@ -36,27 +36,26 @@ enum AudioCodec { |
| struct RtpConfig { |
| RtpConfig(); |
| - int history_ms; // The time RTP packets are stored for retransmissions. |
| + ~RtpConfig(); |
| + uint32 ssrc; |
| int max_delay_ms; |
|
Alpha Left Google
2014/04/29 00:55:05
Can we move this to VideoSenderConfig and AudioSen
hubbe
2014/04/29 17:19:58
I'd prefer to do that in a separate CL.
I can add
|
| int payload_type; |
| -}; |
| - |
| -// TODO(mikhal): Consider combining this with the cast_sender config. |
| -struct CastTransportBaseConfig { |
| - CastTransportBaseConfig(); |
| - ~CastTransportBaseConfig(); |
| - |
| - uint32 ssrc; |
| - RtpConfig rtp_config; |
| std::string aes_key; // Binary string of size kAesKeySize. |
| std::string aes_iv_mask; // Binary string of size kAesBlockSize. |
| }; |
| +struct TransportRtpConfig { |
|
Alpha Left Google
2014/04/29 00:55:05
nit: This should be CastTransportRtpConfig to be c
hubbe
2014/04/29 17:19:58
Done.
|
| + TransportRtpConfig(); |
| + ~TransportRtpConfig(); |
| + RtpConfig config; |
| + int max_outstanding_frames; |
| +}; |
| + |
| struct CastTransportAudioConfig { |
| CastTransportAudioConfig(); |
| ~CastTransportAudioConfig(); |
| - CastTransportBaseConfig base; |
| + TransportRtpConfig rtp; |
| AudioCodec codec; |
| int frequency; |
| int channels; |
| @@ -66,7 +65,7 @@ struct CastTransportVideoConfig { |
| CastTransportVideoConfig(); |
| ~CastTransportVideoConfig(); |
| - CastTransportBaseConfig base; |
| + TransportRtpConfig rtp; |
| VideoCodec codec; |
| }; |