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

Side by Side Diff: media/cast/cast_config.h

Issue 736233003: Renaming "incoming_feedback_ssrc" to "receiver_ssrc" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 | « chrome/renderer/media/cast_rtp_stream.cc ('k') | media/cast/cast_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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_CAST_CONFIG_H_ 5 #ifndef MEDIA_CAST_CAST_CONFIG_H_
6 #define MEDIA_CAST_CAST_CONFIG_H_ 6 #define MEDIA_CAST_CAST_CONFIG_H_
7 7
8 #include <list> 8 #include <list>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 15 matching lines...) Expand all
26 // TODO(miu): Merge AudioSenderConfig and VideoSenderConfig and make their 26 // TODO(miu): Merge AudioSenderConfig and VideoSenderConfig and make their
27 // naming/documentation consistent with FrameReceiverConfig. 27 // naming/documentation consistent with FrameReceiverConfig.
28 struct AudioSenderConfig { 28 struct AudioSenderConfig {
29 AudioSenderConfig(); 29 AudioSenderConfig();
30 ~AudioSenderConfig(); 30 ~AudioSenderConfig();
31 31
32 // Identifier referring to the sender, used by the receiver. 32 // Identifier referring to the sender, used by the receiver.
33 uint32 ssrc; 33 uint32 ssrc;
34 34
35 // The receiver's SSRC identifier. 35 // The receiver's SSRC identifier.
36 uint32 incoming_feedback_ssrc; 36 uint32 receiver_ssrc;
37 37
38 int rtcp_interval; 38 int rtcp_interval;
39 39
40 // The total amount of time between a frame's capture/recording on the sender 40 // The total amount of time between a frame's capture/recording on the sender
41 // and its playback on the receiver (i.e., shown to a user). This should be 41 // and its playback on the receiver (i.e., shown to a user). This should be
42 // set to a value large enough to give the system sufficient time to encode, 42 // set to a value large enough to give the system sufficient time to encode,
43 // transmit/retransmit, receive, decode, and render; given its run-time 43 // transmit/retransmit, receive, decode, and render; given its run-time
44 // environment (sender/receiver hardware performance, network conditions, 44 // environment (sender/receiver hardware performance, network conditions,
45 // etc.). 45 // etc.).
46 base::TimeDelta min_playout_delay; 46 base::TimeDelta min_playout_delay;
(...skipping 16 matching lines...) Expand all
63 }; 63 };
64 64
65 struct VideoSenderConfig { 65 struct VideoSenderConfig {
66 VideoSenderConfig(); 66 VideoSenderConfig();
67 ~VideoSenderConfig(); 67 ~VideoSenderConfig();
68 68
69 // Identifier referring to the sender, used by the receiver. 69 // Identifier referring to the sender, used by the receiver.
70 uint32 ssrc; 70 uint32 ssrc;
71 71
72 // The receiver's SSRC identifier. 72 // The receiver's SSRC identifier.
73 uint32 incoming_feedback_ssrc; // TODO(miu): Rename to receiver_ssrc. 73 uint32 receiver_ssrc;
74 74
75 int rtcp_interval; 75 int rtcp_interval;
76 76
77 // The total amount of time between a frame's capture/recording on the sender 77 // The total amount of time between a frame's capture/recording on the sender
78 // and its playback on the receiver (i.e., shown to a user). This should be 78 // and its playback on the receiver (i.e., shown to a user). This should be
79 // set to a value large enough to give the system sufficient time to encode, 79 // set to a value large enough to give the system sufficient time to encode,
80 // transmit/retransmit, receive, decode, and render; given its run-time 80 // transmit/retransmit, receive, decode, and render; given its run-time
81 // environment (sender/receiver hardware performance, network conditions, 81 // environment (sender/receiver hardware performance, network conditions,
82 // etc.). 82 // etc.).
83 base::TimeDelta min_playout_delay; 83 base::TimeDelta min_playout_delay;
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 typedef base::Callback<void(scoped_ptr<base::SharedMemory>)> 176 typedef base::Callback<void(scoped_ptr<base::SharedMemory>)>
177 ReceiveVideoEncodeMemoryCallback; 177 ReceiveVideoEncodeMemoryCallback;
178 typedef base::Callback<void(size_t size, 178 typedef base::Callback<void(size_t size,
179 const ReceiveVideoEncodeMemoryCallback&)> 179 const ReceiveVideoEncodeMemoryCallback&)>
180 CreateVideoEncodeMemoryCallback; 180 CreateVideoEncodeMemoryCallback;
181 181
182 } // namespace cast 182 } // namespace cast
183 } // namespace media 183 } // namespace media
184 184
185 #endif // MEDIA_CAST_CAST_CONFIG_H_ 185 #endif // MEDIA_CAST_CAST_CONFIG_H_
OLDNEW
« no previous file with comments | « chrome/renderer/media/cast_rtp_stream.cc ('k') | media/cast/cast_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698