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

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

Issue 839983002: Adding "target_frame_rate" variable in lieu of "max_frame_rate" for FrameReceiverConfig (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 | « no previous file | 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 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 // this is the sampling rate. For video, by convention, this is 90 kHz. 138 // this is the sampling rate. For video, by convention, this is 90 kHz.
139 int frequency; // TODO(miu): Rename to rtp_timebase for clarity. 139 int frequency; // TODO(miu): Rename to rtp_timebase for clarity.
140 140
141 // Number of channels. For audio, this is normally 2. For video, this must 141 // Number of channels. For audio, this is normally 2. For video, this must
142 // be 1 as Cast does not have support for stereoscopic video. 142 // be 1 as Cast does not have support for stereoscopic video.
143 int channels; 143 int channels;
144 144
145 // The target frame rate. For audio, this is normally 100 (i.e., frames have 145 // The target frame rate. For audio, this is normally 100 (i.e., frames have
146 // a duration of 10ms each). For video, this is normally 30, but any frame 146 // a duration of 10ms each). For video, this is normally 30, but any frame
147 // rate is supported. 147 // rate is supported.
148 int max_frame_rate; // TODO(miu): Rename to target_frame_rate. 148 int target_frame_rate;
149 149
150 // Codec used for the compression of signal data. 150 // Codec used for the compression of signal data.
151 // TODO(miu): Merge the AudioCodec and VideoCodec enums into one so this union 151 // TODO(miu): Merge the AudioCodec and VideoCodec enums into one so this union
152 // is not necessary. 152 // is not necessary.
153 Codec codec; 153 Codec codec;
154 154
155 // The AES crypto key and initialization vector. Each of these strings 155 // The AES crypto key and initialization vector. Each of these strings
156 // contains the data in binary form, of size kAesKeySize. If they are empty 156 // contains the data in binary form, of size kAesKeySize. If they are empty
157 // strings, crypto is not being used. 157 // strings, crypto is not being used.
158 std::string aes_key; 158 std::string aes_key;
(...skipping 17 matching lines...) Expand all
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 | « no previous file | media/cast/cast_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698