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

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

Issue 280993002: [Cast] Repair receiver playout time calculations and frame skip logic. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed hubbe's comments. Created 6 years, 7 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 12 matching lines...) Expand all
23 kRtcpCompound, // Compound RTCP mode is described by RFC 4585. 23 kRtcpCompound, // Compound RTCP mode is described by RFC 4585.
24 kRtcpReducedSize, // Reduced-size RTCP mode is described by RFC 5506. 24 kRtcpReducedSize, // Reduced-size RTCP mode is described by RFC 5506.
25 }; 25 };
26 26
27 enum VideoCodec { kFakeSoftwareVideo, kVp8, kH264, kVideoCodecLast = kH264 }; 27 enum VideoCodec { kFakeSoftwareVideo, kVp8, kH264, kVideoCodecLast = kH264 };
28 28
29 enum AudioCodec { 29 enum AudioCodec {
30 kFakeSoftwareAudio, 30 kFakeSoftwareAudio,
31 kOpus, 31 kOpus,
32 kPcm16, 32 kPcm16,
33 kExternalAudio, 33 kAudioCodecLast = kPcm16
34 kAudioCodecLast = kExternalAudio
35 }; 34 };
36 35
37 struct RtpConfig { 36 struct RtpConfig {
38 RtpConfig(); 37 RtpConfig();
39 ~RtpConfig(); 38 ~RtpConfig();
40 uint32 ssrc; 39 uint32 ssrc;
41 int max_delay_ms; 40 int max_delay_ms;
42 int payload_type; 41 int payload_type;
43 std::string aes_key; // Binary string of size kAesKeySize. 42 std::string aes_key; // Binary string of size kAesKeySize.
44 std::string aes_iv_mask; // Binary string of size kAesBlockSize. 43 std::string aes_iv_mask; // Binary string of size kAesBlockSize.
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 lhs.rtp_timestamp == rhs.rtp_timestamp && 176 lhs.rtp_timestamp == rhs.rtp_timestamp &&
178 lhs.send_packet_count == rhs.send_packet_count && 177 lhs.send_packet_count == rhs.send_packet_count &&
179 lhs.send_octet_count == rhs.send_octet_count; 178 lhs.send_octet_count == rhs.send_octet_count;
180 } 179 }
181 180
182 } // namespace transport 181 } // namespace transport
183 } // namespace cast 182 } // namespace cast
184 } // namespace media 183 } // namespace media
185 184
186 #endif // MEDIA_CAST_TRANSPORT_CAST_TRANSPORT_CONFIG_H_ 185 #endif // MEDIA_CAST_TRANSPORT_CAST_TRANSPORT_CONFIG_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698