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

Side by Side Diff: webrtc/media/engine/webrtcvideoengine2.h

Issue 2474993002: Pass selected cricket::VideoCodec down to internal H264 encoder (Closed)
Patch Set: Fix. Created 4 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 bool conference_mode; 295 bool conference_mode;
296 rtc::Optional<VideoCodecSettings> codec_settings; 296 rtc::Optional<VideoCodecSettings> codec_settings;
297 // Sent resolutions + bitrates etc. by the underlying VideoSendStream, 297 // Sent resolutions + bitrates etc. by the underlying VideoSendStream,
298 // typically changes when setting a new resolution or reconfiguring 298 // typically changes when setting a new resolution or reconfiguring
299 // bitrates. 299 // bitrates.
300 webrtc::VideoEncoderConfig encoder_config; 300 webrtc::VideoEncoderConfig encoder_config;
301 }; 301 };
302 302
303 struct AllocatedEncoder { 303 struct AllocatedEncoder {
304 AllocatedEncoder(webrtc::VideoEncoder* encoder, 304 AllocatedEncoder(webrtc::VideoEncoder* encoder,
305 webrtc::VideoCodecType type, 305 const cricket::VideoCodec& codec,
306 bool external); 306 bool external);
307 webrtc::VideoEncoder* encoder; 307 webrtc::VideoEncoder* encoder;
308 webrtc::VideoEncoder* external_encoder; 308 webrtc::VideoEncoder* external_encoder;
309 webrtc::VideoCodecType type; 309 cricket::VideoCodec codec;
310 bool external; 310 bool external;
311 }; 311 };
312 312
313 // TODO(perkj): VideoFrameInfo is currently used for sending a black frame 313 // TODO(perkj): VideoFrameInfo is currently used for sending a black frame
314 // when the video source is removed. Consider moving that logic to 314 // when the video source is removed. Consider moving that logic to
315 // VieEncoder or remove it. 315 // VieEncoder or remove it.
316 struct VideoFrameInfo { 316 struct VideoFrameInfo {
317 VideoFrameInfo() 317 VideoFrameInfo()
318 : width(0), 318 : width(0),
319 height(0), 319 height(0),
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
517 VideoSendParameters send_params_; 517 VideoSendParameters send_params_;
518 VideoOptions default_send_options_; 518 VideoOptions default_send_options_;
519 VideoRecvParameters recv_params_; 519 VideoRecvParameters recv_params_;
520 bool red_disabled_by_remote_side_; 520 bool red_disabled_by_remote_side_;
521 int64_t last_stats_log_ms_; 521 int64_t last_stats_log_ms_;
522 }; 522 };
523 523
524 } // namespace cricket 524 } // namespace cricket
525 525
526 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_ 526 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698