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

Side by Side Diff: media/cast/transport/cast_transport_config.h

Issue 144033004: Cast: Replace string+int x2 with net::IPEndPoint in CastTransportConfig. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 10 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 | « media/cast/test/sender.cc ('k') | media/cast/transport/cast_transport_config.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 MEDIA_CAST_TRANSPORT_CAST_TRANSPORT_CONFIG_H_ 5 #ifndef MEDIA_CAST_TRANSPORT_CAST_TRANSPORT_CONFIG_H_
6 #define MEDIA_CAST_TRANSPORT_CAST_TRANSPORT_CONFIG_H_ 6 #define MEDIA_CAST_TRANSPORT_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/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "media/cast/transport/cast_transport_defines.h" 14 #include "media/cast/transport/cast_transport_defines.h"
15 #include "net/base/ip_endpoint.h"
15 16
16 namespace media { 17 namespace media {
17 namespace cast { 18 namespace cast {
18 namespace transport { 19 namespace transport {
19 20
20 enum RtcpMode { 21 enum RtcpMode {
21 kRtcpCompound, // Compound RTCP mode is described by RFC 4585. 22 kRtcpCompound, // Compound RTCP mode is described by RFC 4585.
22 kRtcpReducedSize, // Reduced-size RTCP mode is described by RFC 5506. 23 kRtcpReducedSize, // Reduced-size RTCP mode is described by RFC 5506.
23 }; 24 };
24 25
25 enum VideoCodec { 26 enum VideoCodec {
26 kVp8, 27 kVp8,
27 kH264, 28 kH264,
28 }; 29 };
29 30
30 enum AudioCodec { 31 enum AudioCodec {
31 kOpus, 32 kOpus,
32 kPcm16, 33 kPcm16,
33 kExternalAudio, 34 kExternalAudio,
34 }; 35 };
35 36
36 struct CastTransportConfig { 37 struct CastTransportConfig {
37 CastTransportConfig(); 38 CastTransportConfig();
38 ~CastTransportConfig(); 39 ~CastTransportConfig();
39 40
40 // Transport: Local receiver. 41 // Transport: Local receiver.
41 std::string receiver_ip_address; 42 net::IPEndPoint receiver_endpoint;
42 std::string local_ip_address; 43 net::IPEndPoint local_endpoint;
43 int receive_port;
44 int send_port;
45 44
46 uint32 audio_ssrc; 45 uint32 audio_ssrc;
47 uint32 video_ssrc; 46 uint32 video_ssrc;
48 47
49 VideoCodec video_codec; 48 VideoCodec video_codec;
50 AudioCodec audio_codec; 49 AudioCodec audio_codec;
51 50
52 // RTP. 51 // RTP.
53 int audio_rtp_history_ms; 52 int audio_rtp_history_ms;
54 int video_rtp_history_ms; 53 int video_rtp_history_ms;
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 lhs.rtp_timestamp == rhs.rtp_timestamp && 158 lhs.rtp_timestamp == rhs.rtp_timestamp &&
160 lhs.send_packet_count == rhs.send_packet_count && 159 lhs.send_packet_count == rhs.send_packet_count &&
161 lhs.send_octet_count == rhs.send_octet_count; 160 lhs.send_octet_count == rhs.send_octet_count;
162 } 161 }
163 162
164 } // namespace transport 163 } // namespace transport
165 } // namespace cast 164 } // namespace cast
166 } // namespace media 165 } // namespace media
167 166
168 #endif // MEDIA_CAST_TRANSPORT_CAST_TRANSPORT_CONFIG_H_ 167 #endif // MEDIA_CAST_TRANSPORT_CAST_TRANSPORT_CONFIG_H_
OLDNEW
« no previous file with comments | « media/cast/test/sender.cc ('k') | media/cast/transport/cast_transport_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698