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

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

Issue 1731403002: media: Add out-of-line copy ctors for complex classes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « media/capture/video/video_capture_device_info.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 <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 // 1080p, 30 FPS). 52 // 1080p, 30 FPS).
53 kDefaultMinVideoKbps = 300, 53 kDefaultMinVideoKbps = 300,
54 kDefaultMaxVideoKbps = 5000, 54 kDefaultMaxVideoKbps = 5000,
55 }; 55 };
56 56
57 // TODO(miu): Merge AudioSenderConfig and VideoSenderConfig and make their 57 // TODO(miu): Merge AudioSenderConfig and VideoSenderConfig and make their
58 // naming/documentation consistent with FrameReceiverConfig. 58 // naming/documentation consistent with FrameReceiverConfig.
59 // http://crbug.com/530839 59 // http://crbug.com/530839
60 struct AudioSenderConfig { 60 struct AudioSenderConfig {
61 AudioSenderConfig(); 61 AudioSenderConfig();
62 AudioSenderConfig(const AudioSenderConfig& other);
62 ~AudioSenderConfig(); 63 ~AudioSenderConfig();
63 64
64 // Identifier referring to the sender, used by the receiver. 65 // Identifier referring to the sender, used by the receiver.
65 uint32_t ssrc; 66 uint32_t ssrc;
66 67
67 // The receiver's SSRC identifier. 68 // The receiver's SSRC identifier.
68 uint32_t receiver_ssrc; 69 uint32_t receiver_ssrc;
69 70
70 // The total amount of time between a frame's capture/recording on the sender 71 // The total amount of time between a frame's capture/recording on the sender
71 // and its playback on the receiver (i.e., shown to a user). This should be 72 // and its playback on the receiver (i.e., shown to a user). This should be
(...skipping 18 matching lines...) Expand all
90 91
91 // The AES crypto key and initialization vector. Each of these strings 92 // The AES crypto key and initialization vector. Each of these strings
92 // contains the data in binary form, of size kAesKeySize. If they are empty 93 // contains the data in binary form, of size kAesKeySize. If they are empty
93 // strings, crypto is not being used. 94 // strings, crypto is not being used.
94 std::string aes_key; 95 std::string aes_key;
95 std::string aes_iv_mask; 96 std::string aes_iv_mask;
96 }; 97 };
97 98
98 struct VideoSenderConfig { 99 struct VideoSenderConfig {
99 VideoSenderConfig(); 100 VideoSenderConfig();
101 VideoSenderConfig(const VideoSenderConfig& other);
100 ~VideoSenderConfig(); 102 ~VideoSenderConfig();
101 103
102 // Identifier referring to the sender, used by the receiver. 104 // Identifier referring to the sender, used by the receiver.
103 uint32_t ssrc; 105 uint32_t ssrc;
104 106
105 // The receiver's SSRC identifier. 107 // The receiver's SSRC identifier.
106 uint32_t receiver_ssrc; 108 uint32_t receiver_ssrc;
107 109
108 // The total amount of time between a frame's capture/recording on the sender 110 // The total amount of time between a frame's capture/recording on the sender
109 // and its playback on the receiver (i.e., shown to a user). This should be 111 // and its playback on the receiver (i.e., shown to a user). This should be
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 // The AES crypto key and initialization vector. Each of these strings 158 // The AES crypto key and initialization vector. Each of these strings
157 // contains the data in binary form, of size kAesKeySize. If they are empty 159 // contains the data in binary form, of size kAesKeySize. If they are empty
158 // strings, crypto is not being used. 160 // strings, crypto is not being used.
159 std::string aes_key; 161 std::string aes_key;
160 std::string aes_iv_mask; 162 std::string aes_iv_mask;
161 }; 163 };
162 164
163 // TODO(miu): Naming and minor type changes are badly needed in a later CL. 165 // TODO(miu): Naming and minor type changes are badly needed in a later CL.
164 struct FrameReceiverConfig { 166 struct FrameReceiverConfig {
165 FrameReceiverConfig(); 167 FrameReceiverConfig();
168 FrameReceiverConfig(const FrameReceiverConfig& other);
166 ~FrameReceiverConfig(); 169 ~FrameReceiverConfig();
167 170
168 // The receiver's SSRC identifier. 171 // The receiver's SSRC identifier.
169 uint32_t receiver_ssrc; 172 uint32_t receiver_ssrc;
170 173
171 // The sender's SSRC identifier. 174 // The sender's SSRC identifier.
172 uint32_t sender_ssrc; 175 uint32_t sender_ssrc;
173 176
174 // The total amount of time between a frame's capture/recording on the sender 177 // The total amount of time between a frame's capture/recording on the sender
175 // and its playback on the receiver (i.e., shown to a user). This is fixed as 178 // and its playback on the receiver (i.e., shown to a user). This is fixed as
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 typedef base::Callback<void(scoped_ptr<base::SharedMemory>)> 219 typedef base::Callback<void(scoped_ptr<base::SharedMemory>)>
217 ReceiveVideoEncodeMemoryCallback; 220 ReceiveVideoEncodeMemoryCallback;
218 typedef base::Callback<void(size_t size, 221 typedef base::Callback<void(size_t size,
219 const ReceiveVideoEncodeMemoryCallback&)> 222 const ReceiveVideoEncodeMemoryCallback&)>
220 CreateVideoEncodeMemoryCallback; 223 CreateVideoEncodeMemoryCallback;
221 224
222 } // namespace cast 225 } // namespace cast
223 } // namespace media 226 } // namespace media
224 227
225 #endif // MEDIA_CAST_CAST_CONFIG_H_ 228 #endif // MEDIA_CAST_CAST_CONFIG_H_
OLDNEW
« no previous file with comments | « media/capture/video/video_capture_device_info.cc ('k') | media/cast/cast_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698