| OLD | NEW |
| 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 288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 299 const cricket::VideoCodec& codec, | 299 const cricket::VideoCodec& codec, |
| 300 bool external); | 300 bool external); |
| 301 webrtc::VideoEncoder* encoder; | 301 webrtc::VideoEncoder* encoder; |
| 302 webrtc::VideoEncoder* external_encoder; | 302 webrtc::VideoEncoder* external_encoder; |
| 303 cricket::VideoCodec codec; | 303 cricket::VideoCodec codec; |
| 304 bool external; | 304 bool external; |
| 305 }; | 305 }; |
| 306 | 306 |
| 307 rtc::scoped_refptr<webrtc::VideoEncoderConfig::EncoderSpecificSettings> | 307 rtc::scoped_refptr<webrtc::VideoEncoderConfig::EncoderSpecificSettings> |
| 308 ConfigureVideoEncoderSettings(const VideoCodec& codec); | 308 ConfigureVideoEncoderSettings(const VideoCodec& codec); |
| 309 AllocatedEncoder CreateVideoEncoder(const VideoCodec& codec); | 309 // If force_encoder_allocation is true, a new AllocatedEncoder is always |
| 310 // created. If false, the allocated encoder may be reused, if the type |
| 311 // matches. |
| 312 AllocatedEncoder CreateVideoEncoder(const VideoCodec& codec, |
| 313 bool force_encoder_allocation); |
| 310 void DestroyVideoEncoder(AllocatedEncoder* encoder); | 314 void DestroyVideoEncoder(AllocatedEncoder* encoder); |
| 311 void SetCodec(const VideoCodecSettings& codec); | 315 void SetCodec(const VideoCodecSettings& codec, |
| 316 bool force_encoder_allocation); |
| 312 void RecreateWebRtcStream(); | 317 void RecreateWebRtcStream(); |
| 313 webrtc::VideoEncoderConfig CreateVideoEncoderConfig( | 318 webrtc::VideoEncoderConfig CreateVideoEncoderConfig( |
| 314 const VideoCodec& codec) const; | 319 const VideoCodec& codec) const; |
| 315 void ReconfigureEncoder(); | 320 void ReconfigureEncoder(); |
| 316 bool ValidateRtpParameters(const webrtc::RtpParameters& parameters); | 321 bool ValidateRtpParameters(const webrtc::RtpParameters& parameters); |
| 317 | 322 |
| 318 // Calls Start or Stop according to whether or not |sending_| is true, | 323 // Calls Start or Stop according to whether or not |sending_| is true, |
| 319 // and whether or not the encoding in |rtp_parameters_| is active. | 324 // and whether or not the encoding in |rtp_parameters_| is active. |
| 320 void UpdateSendState(); | 325 void UpdateSendState(); |
| 321 | 326 |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 490 // send_params/recv_params, rtp_extensions, options, etc. | 495 // send_params/recv_params, rtp_extensions, options, etc. |
| 491 VideoSendParameters send_params_; | 496 VideoSendParameters send_params_; |
| 492 VideoOptions default_send_options_; | 497 VideoOptions default_send_options_; |
| 493 VideoRecvParameters recv_params_; | 498 VideoRecvParameters recv_params_; |
| 494 int64_t last_stats_log_ms_; | 499 int64_t last_stats_log_ms_; |
| 495 }; | 500 }; |
| 496 | 501 |
| 497 } // namespace cricket | 502 } // namespace cricket |
| 498 | 503 |
| 499 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_ | 504 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_ |
| OLD | NEW |