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

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: rebase Created 6 years, 6 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
« no previous file with comments | « media/cast/test/skewed_tick_clock.cc ('k') | media/cast/video_receiver/video_receiver.h » ('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
(...skipping 13 matching lines...) Expand all
24 kRtcpCompound, // Compound RTCP mode is described by RFC 4585. 24 kRtcpCompound, // Compound RTCP mode is described by RFC 4585.
25 kRtcpReducedSize, // Reduced-size RTCP mode is described by RFC 5506. 25 kRtcpReducedSize, // Reduced-size RTCP mode is described by RFC 5506.
26 }; 26 };
27 27
28 enum VideoCodec { kFakeSoftwareVideo, kVp8, kH264, kVideoCodecLast = kH264 }; 28 enum VideoCodec { kFakeSoftwareVideo, kVp8, kH264, kVideoCodecLast = kH264 };
29 29
30 enum AudioCodec { 30 enum AudioCodec {
31 kFakeSoftwareAudio, 31 kFakeSoftwareAudio,
32 kOpus, 32 kOpus,
33 kPcm16, 33 kPcm16,
34 kExternalAudio, 34 kAudioCodecLast = kPcm16
35 kAudioCodecLast = kExternalAudio
36 }; 35 };
37 36
38 struct RtpConfig { 37 struct RtpConfig {
39 RtpConfig(); 38 RtpConfig();
40 ~RtpConfig(); 39 ~RtpConfig();
41 uint32 ssrc; 40 uint32 ssrc;
42 int max_delay_ms; 41 int max_delay_ms;
43 int payload_type; 42 int payload_type;
44 std::string aes_key; // Binary string of size kAesKeySize. 43 std::string aes_key; // Binary string of size kAesKeySize.
45 std::string aes_iv_mask; // Binary string of size kAesBlockSize. 44 std::string aes_iv_mask; // Binary string of size kAesBlockSize.
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 lhs.rtp_timestamp == rhs.rtp_timestamp && 202 lhs.rtp_timestamp == rhs.rtp_timestamp &&
204 lhs.send_packet_count == rhs.send_packet_count && 203 lhs.send_packet_count == rhs.send_packet_count &&
205 lhs.send_octet_count == rhs.send_octet_count; 204 lhs.send_octet_count == rhs.send_octet_count;
206 } 205 }
207 206
208 } // namespace transport 207 } // namespace transport
209 } // namespace cast 208 } // namespace cast
210 } // namespace media 209 } // namespace media
211 210
212 #endif // MEDIA_CAST_TRANSPORT_CAST_TRANSPORT_CONFIG_H_ 211 #endif // MEDIA_CAST_TRANSPORT_CAST_TRANSPORT_CONFIG_H_
OLDNEW
« no previous file with comments | « media/cast/test/skewed_tick_clock.cc ('k') | media/cast/video_receiver/video_receiver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698