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

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

Issue 174183003: Cast:Transport: Dividing A/V Initialization pipeline (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Responding to review + rebasing 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 | Annotate | Revision Log
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
(...skipping 25 matching lines...) Expand all
36 kAudioCodecLast = kExternalAudio 36 kAudioCodecLast = kExternalAudio
37 }; 37 };
38 38
39 struct RtpConfig { 39 struct RtpConfig {
40 RtpConfig(); 40 RtpConfig();
41 int history_ms; // The time RTP packets are stored for retransmissions. 41 int history_ms; // The time RTP packets are stored for retransmissions.
42 int max_delay_ms; 42 int max_delay_ms;
43 int payload_type; 43 int payload_type;
44 }; 44 };
45 45
46 struct CastTransportConfig { 46 // TODO(mikhal): Consider combining this with the cast_sender config.
47 CastTransportConfig(); 47 struct CastTransportBaseConfig {
48 ~CastTransportConfig(); 48 CastTransportBaseConfig();
49 ~CastTransportBaseConfig();
49 50
50 // Transport: Local receiver. 51 uint32 ssrc;
Ami GONE FROM CHROMIUM 2014/02/25 18:35:08 I don't understand this sentence. Are you saying
mikhal1 2014/02/25 22:33:33 True. Will update that in a separate cl, as this h
51 net::IPEndPoint receiver_endpoint; 52 RtpConfig rtp_config;
52 net::IPEndPoint local_endpoint;
53
54 uint32 audio_ssrc;
55 uint32 video_ssrc;
56
57 VideoCodec video_codec;
58 AudioCodec audio_codec;
59
60 // RTP.
61 RtpConfig audio_rtp_config;
62 RtpConfig video_rtp_config;
63
64 int audio_frequency;
65 int audio_channels;
66
67 std::string aes_key; // Binary string of size kAesKeySize. 53 std::string aes_key; // Binary string of size kAesKeySize.
68 std::string aes_iv_mask; // Binary string of size kAesBlockSize. 54 std::string aes_iv_mask; // Binary string of size kAesBlockSize.
69 }; 55 };
70 56
57 struct CastTransportAudioConfig {
58 CastTransportAudioConfig();
59 ~CastTransportAudioConfig();
60
61 CastTransportBaseConfig base;
62 AudioCodec codec;
63 int frequency;
64 int channels;
65 };
66
67 struct CastTransportVideoConfig {
68 CastTransportVideoConfig();
69 ~CastTransportVideoConfig();
70
71 CastTransportBaseConfig base;
72 VideoCodec codec;
73 };
74
71 struct EncodedVideoFrame { 75 struct EncodedVideoFrame {
72 EncodedVideoFrame(); 76 EncodedVideoFrame();
73 ~EncodedVideoFrame(); 77 ~EncodedVideoFrame();
74 78
75 VideoCodec codec; 79 VideoCodec codec;
76 bool key_frame; 80 bool key_frame;
77 uint32 frame_id; 81 uint32 frame_id;
78 uint32 last_referenced_frame_id; 82 uint32 last_referenced_frame_id;
79 uint32 rtp_timestamp; 83 uint32 rtp_timestamp;
80 std::string data; 84 std::string data;
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 lhs.rtp_timestamp == rhs.rtp_timestamp && 177 lhs.rtp_timestamp == rhs.rtp_timestamp &&
174 lhs.send_packet_count == rhs.send_packet_count && 178 lhs.send_packet_count == rhs.send_packet_count &&
175 lhs.send_octet_count == rhs.send_octet_count; 179 lhs.send_octet_count == rhs.send_octet_count;
176 } 180 }
177 181
178 } // namespace transport 182 } // namespace transport
179 } // namespace cast 183 } // namespace cast
180 } // namespace media 184 } // namespace media
181 185
182 #endif // MEDIA_CAST_TRANSPORT_CAST_TRANSPORT_CONFIG_H_ 186 #endif // MEDIA_CAST_TRANSPORT_CAST_TRANSPORT_CONFIG_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698