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_NET_CAST_TRANSPORT_CONFIG_H_ | 5 #ifndef MEDIA_CAST_NET_CAST_TRANSPORT_CONFIG_H_ |
6 #define MEDIA_CAST_NET_CAST_TRANSPORT_CONFIG_H_ | 6 #define MEDIA_CAST_NET_CAST_TRANSPORT_CONFIG_H_ |
7 | 7 |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 #include <stdint.h> | 9 #include <stdint.h> |
10 | 10 |
11 #include <memory> | 11 #include <memory> |
12 #include <string> | 12 #include <string> |
13 | 13 |
14 #include "base/callback.h" | 14 #include "base/callback.h" |
15 #include "base/stl_util.h" | 15 #include "base/stl_util.h" |
16 #include "media/cast/common/rtp_time.h" | 16 #include "media/cast/common/rtp_time.h" |
17 #include "media/cast/net/cast_transport_defines.h" | 17 #include "media/cast/net/cast_transport_defines.h" |
18 | 18 |
19 namespace media { | 19 namespace media { |
20 namespace cast { | 20 namespace cast { |
21 | 21 |
22 enum Codec { | 22 enum Codec { |
23 CODEC_UNKNOWN, | 23 CODEC_UNKNOWN, |
24 CODEC_AUDIO_OPUS, | 24 CODEC_AUDIO_OPUS, |
25 CODEC_AUDIO_PCM16, | 25 CODEC_AUDIO_PCM16, |
26 CODEC_AUDIO_AAC, | 26 CODEC_AUDIO_AAC, |
27 CODEC_AUDIO_REMOTE, | |
27 CODEC_VIDEO_FAKE, | 28 CODEC_VIDEO_FAKE, |
28 CODEC_VIDEO_VP8, | 29 CODEC_VIDEO_VP8, |
29 CODEC_VIDEO_H264, | 30 CODEC_VIDEO_H264, |
30 CODEC_LAST = CODEC_VIDEO_H264 | 31 CODEC_VIDEO_REMOTE, |
32 CODEC_LAST = CODEC_VIDEO_REMOTE | |
31 }; | 33 }; |
32 | 34 |
33 // Describes the content being transported over RTP streams. | 35 // Describes the content being transported over RTP streams. |
34 enum class RtpPayloadType { | 36 enum class RtpPayloadType { |
35 UNKNOWN = -1, | 37 UNKNOWN = -1, |
36 | 38 |
37 // Cast Streaming will encode raw audio frames using one of its available | 39 // Cast Streaming will encode raw audio frames using one of its available |
38 // codec implementations, and transport encoded data in the RTP stream. | 40 // codec implementations, and transport encoded data in the RTP stream. |
39 FIRST = 96, | 41 FIRST = 96, |
40 AUDIO_OPUS = 96, | 42 AUDIO_OPUS = 96, |
(...skipping 15 matching lines...) Expand all Loading... | |
56 // in-sequence. No assumptions about the data can be made. | 58 // in-sequence. No assumptions about the data can be made. |
57 REMOTE_VIDEO = 102, | 59 REMOTE_VIDEO = 102, |
58 | 60 |
59 LAST = REMOTE_VIDEO | 61 LAST = REMOTE_VIDEO |
60 }; | 62 }; |
61 | 63 |
62 struct CastTransportRtpConfig { | 64 struct CastTransportRtpConfig { |
63 CastTransportRtpConfig(); | 65 CastTransportRtpConfig(); |
64 ~CastTransportRtpConfig(); | 66 ~CastTransportRtpConfig(); |
65 | 67 |
68 // Identifier for the RTP stream. | |
69 int32_t rtp_stream_id; | |
Jeffrey Yasskin
2016/09/15 20:48:12
You forgot to initialize this field in the constru
| |
70 | |
66 // Identifier refering to this sender. | 71 // Identifier refering to this sender. |
67 uint32_t ssrc; | 72 uint32_t ssrc; |
68 | 73 |
69 // Identifier for incoming RTCP traffic. | 74 // Identifier for incoming RTCP traffic. |
70 uint32_t feedback_ssrc; | 75 uint32_t feedback_ssrc; |
71 | 76 |
72 // RTP payload type enum: Specifies the type/encoding of frame data. | 77 // RTP payload type enum: Specifies the type/encoding of frame data. |
73 RtpPayloadType rtp_payload_type; | 78 RtpPayloadType rtp_payload_type; |
74 | 79 |
75 // The AES crypto key and initialization vector. Each of these strings | 80 // The AES crypto key and initialization vector. Each of these strings |
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
216 lhs.ntp_fraction == rhs.ntp_fraction && | 221 lhs.ntp_fraction == rhs.ntp_fraction && |
217 lhs.rtp_timestamp == rhs.rtp_timestamp && | 222 lhs.rtp_timestamp == rhs.rtp_timestamp && |
218 lhs.send_packet_count == rhs.send_packet_count && | 223 lhs.send_packet_count == rhs.send_packet_count && |
219 lhs.send_octet_count == rhs.send_octet_count; | 224 lhs.send_octet_count == rhs.send_octet_count; |
220 } | 225 } |
221 | 226 |
222 } // namespace cast | 227 } // namespace cast |
223 } // namespace media | 228 } // namespace media |
224 | 229 |
225 #endif // MEDIA_CAST_NET_CAST_TRANSPORT_CONFIG_H_ | 230 #endif // MEDIA_CAST_NET_CAST_TRANSPORT_CONFIG_H_ |
OLD | NEW |