Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 MEDIA_CAST_TRANSPORT_CAST_TRANSPORT_CONFIG_H_ | 5 #ifndef MEDIA_CAST_NET_CAST_TRANSPORT_CONFIG_H_ |
| 6 #define MEDIA_CAST_TRANSPORT_CAST_TRANSPORT_CONFIG_H_ | 6 #define MEDIA_CAST_NET_CAST_TRANSPORT_CONFIG_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "base/basictypes.h" | 11 #include "base/basictypes.h" |
| 12 #include "base/callback.h" | 12 #include "base/callback.h" |
| 13 #include "base/memory/linked_ptr.h" | 13 #include "base/memory/linked_ptr.h" |
| 14 #include "base/memory/ref_counted.h" | 14 #include "base/memory/ref_counted.h" |
| 15 #include "base/stl_util.h" | 15 #include "base/stl_util.h" |
| 16 #include "media/cast/transport/cast_transport_defines.h" | 16 #include "media/cast/net/cast_transport_defines.h" |
| 17 #include "net/base/ip_endpoint.h" | 17 #include "net/base/ip_endpoint.h" |
|
wtc
2014/07/11 22:31:35
Remove this line. I didn't find any "net::" in thi
Alpha Left Google
2014/07/12 01:37:54
Done.
| |
| 18 | 18 |
| 19 namespace media { | 19 namespace media { |
| 20 namespace cast { | 20 namespace cast { |
| 21 namespace transport { | |
| 22 | 21 |
| 23 enum RtcpMode { | 22 enum RtcpMode { |
| 24 kRtcpCompound, // Compound RTCP mode is described by RFC 4585. | 23 kRtcpCompound, // Compound RTCP mode is described by RFC 4585. |
| 25 kRtcpReducedSize, // Reduced-size RTCP mode is described by RFC 5506. | 24 kRtcpReducedSize, // Reduced-size RTCP mode is described by RFC 5506. |
| 26 }; | 25 }; |
| 27 | 26 |
| 28 enum Codec { | 27 enum Codec { |
| 29 CODEC_UNKNOWN, | 28 CODEC_UNKNOWN, |
| 30 CODEC_AUDIO_OPUS, | 29 CODEC_AUDIO_OPUS, |
| 31 CODEC_AUDIO_PCM16, | 30 CODEC_AUDIO_PCM16, |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 188 }; | 187 }; |
| 189 | 188 |
| 190 inline bool operator==(RtcpSenderInfo lhs, RtcpSenderInfo rhs) { | 189 inline bool operator==(RtcpSenderInfo lhs, RtcpSenderInfo rhs) { |
| 191 return lhs.ntp_seconds == rhs.ntp_seconds && | 190 return lhs.ntp_seconds == rhs.ntp_seconds && |
| 192 lhs.ntp_fraction == rhs.ntp_fraction && | 191 lhs.ntp_fraction == rhs.ntp_fraction && |
| 193 lhs.rtp_timestamp == rhs.rtp_timestamp && | 192 lhs.rtp_timestamp == rhs.rtp_timestamp && |
| 194 lhs.send_packet_count == rhs.send_packet_count && | 193 lhs.send_packet_count == rhs.send_packet_count && |
| 195 lhs.send_octet_count == rhs.send_octet_count; | 194 lhs.send_octet_count == rhs.send_octet_count; |
| 196 } | 195 } |
| 197 | 196 |
| 198 } // namespace transport | |
| 199 } // namespace cast | 197 } // namespace cast |
| 200 } // namespace media | 198 } // namespace media |
| 201 | 199 |
| 202 #endif // MEDIA_CAST_TRANSPORT_CAST_TRANSPORT_CONFIG_H_ | 200 #endif // MEDIA_CAST_NET_CAST_TRANSPORT_CONFIG_H_ |
| OLD | NEW |