Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 117 // The VideoEncoder may redistribute bitrates over the temporal layers so a | 117 // The VideoEncoder may redistribute bitrates over the temporal layers so a |
| 118 // bitrate threshold of 100k and an estimate of 105k does not imply that we | 118 // bitrate threshold of 100k and an estimate of 105k does not imply that we |
| 119 // get 100k in one temporal layer and 5k in the other, just that the bitrate | 119 // get 100k in one temporal layer and 5k in the other, just that the bitrate |
| 120 // in the first temporal layer should not exceed 100k. | 120 // in the first temporal layer should not exceed 100k. |
| 121 // TODO(pbos): Apart from a special case for two-layer screencast these | 121 // TODO(pbos): Apart from a special case for two-layer screencast these |
| 122 // thresholds are not propagated to the VideoEncoder. To be implemented. | 122 // thresholds are not propagated to the VideoEncoder. To be implemented. |
| 123 std::vector<int> temporal_layer_thresholds_bps; | 123 std::vector<int> temporal_layer_thresholds_bps; |
| 124 }; | 124 }; |
| 125 | 125 |
| 126 struct VideoEncoderConfig { | 126 struct VideoEncoderConfig { |
| 127 private: | |
|
stefan-webrtc
2016/07/08 15:56:41
Put private on the bottom instead
perkj_webrtc
2016/07/11 11:41:07
Done.
| |
| 128 // Access to the copy constructor is private to force use of the Copy() | |
| 129 // method for those exceptional cases where we do use it. | |
| 130 VideoEncoderConfig(const VideoEncoderConfig&) = default; | |
| 131 | |
| 132 public: | |
| 127 enum class ContentType { | 133 enum class ContentType { |
| 128 kRealtimeVideo, | 134 kRealtimeVideo, |
| 129 kScreen, | 135 kScreen, |
| 130 }; | 136 }; |
| 131 | 137 |
| 138 VideoEncoderConfig& operator=(VideoEncoderConfig&&) = default; | |
| 139 VideoEncoderConfig& operator=(const VideoEncoderConfig&) = delete; | |
| 140 | |
| 141 // Mostly used by tests. Avoid creating copies if you can. | |
| 142 VideoEncoderConfig Copy() const { return VideoEncoderConfig(*this); } | |
| 143 | |
| 132 VideoEncoderConfig(); | 144 VideoEncoderConfig(); |
| 145 VideoEncoderConfig(VideoEncoderConfig&&) = default; | |
| 133 ~VideoEncoderConfig(); | 146 ~VideoEncoderConfig(); |
| 134 std::string ToString() const; | 147 std::string ToString() const; |
| 135 | 148 |
| 136 std::vector<VideoStream> streams; | 149 std::vector<VideoStream> streams; |
| 137 std::vector<SpatialLayer> spatial_layers; | 150 std::vector<SpatialLayer> spatial_layers; |
| 138 ContentType content_type; | 151 ContentType content_type; |
| 139 void* encoder_specific_settings; | 152 void* encoder_specific_settings; |
| 140 | 153 |
| 141 // Padding will be used up to this bitrate regardless of the bitrate produced | 154 // Padding will be used up to this bitrate regardless of the bitrate produced |
| 142 // by the encoder. Padding above what's actually produced by the encoder helps | 155 // by the encoder. Padding above what's actually produced by the encoder helps |
| (...skipping 28 matching lines...) Expand all Loading... | |
| 171 struct VoicePacing { | 184 struct VoicePacing { |
| 172 VoicePacing() : enabled(false) {} | 185 VoicePacing() : enabled(false) {} |
| 173 explicit VoicePacing(bool value) : enabled(value) {} | 186 explicit VoicePacing(bool value) : enabled(value) {} |
| 174 static const ConfigOptionID identifier = ConfigOptionID::kVoicePacing; | 187 static const ConfigOptionID identifier = ConfigOptionID::kVoicePacing; |
| 175 bool enabled; | 188 bool enabled; |
| 176 }; | 189 }; |
| 177 | 190 |
| 178 } // namespace webrtc | 191 } // namespace webrtc |
| 179 | 192 |
| 180 #endif // WEBRTC_CONFIG_H_ | 193 #endif // WEBRTC_CONFIG_H_ |
| OLD | NEW |