| 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 class WebRtcLocalStreamInfo; | 54 class WebRtcLocalStreamInfo; |
| 55 class WebRtcRenderAdapter; | 55 class WebRtcRenderAdapter; |
| 56 class WebRtcVideoChannel2; | 56 class WebRtcVideoChannel2; |
| 57 class WebRtcVideoChannelRecvInfo; | 57 class WebRtcVideoChannelRecvInfo; |
| 58 class WebRtcVideoChannelSendInfo; | 58 class WebRtcVideoChannelSendInfo; |
| 59 class WebRtcVoiceEngine; | 59 class WebRtcVoiceEngine; |
| 60 class WebRtcVoiceMediaChannel; | 60 class WebRtcVoiceMediaChannel; |
| 61 | 61 |
| 62 struct Device; | 62 struct Device; |
| 63 | 63 |
| 64 // Exposed here for unittests. | |
| 65 std::vector<VideoCodec> DefaultVideoCodecList(); | |
| 66 | |
| 67 class UnsignalledSsrcHandler { | 64 class UnsignalledSsrcHandler { |
| 68 public: | 65 public: |
| 69 enum Action { | 66 enum Action { |
| 70 kDropPacket, | 67 kDropPacket, |
| 71 kDeliverPacket, | 68 kDeliverPacket, |
| 72 }; | 69 }; |
| 73 virtual Action OnUnsignalledSsrc(WebRtcVideoChannel2* channel, | 70 virtual Action OnUnsignalledSsrc(WebRtcVideoChannel2* channel, |
| 74 uint32_t ssrc) = 0; | 71 uint32_t ssrc) = 0; |
| 75 virtual ~UnsignalledSsrcHandler() = default; | 72 virtual ~UnsignalledSsrcHandler() = default; |
| 76 }; | 73 }; |
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 294 bool conference_mode; | 291 bool conference_mode; |
| 295 rtc::Optional<VideoCodecSettings> codec_settings; | 292 rtc::Optional<VideoCodecSettings> codec_settings; |
| 296 // Sent resolutions + bitrates etc. by the underlying VideoSendStream, | 293 // Sent resolutions + bitrates etc. by the underlying VideoSendStream, |
| 297 // typically changes when setting a new resolution or reconfiguring | 294 // typically changes when setting a new resolution or reconfiguring |
| 298 // bitrates. | 295 // bitrates. |
| 299 webrtc::VideoEncoderConfig encoder_config; | 296 webrtc::VideoEncoderConfig encoder_config; |
| 300 }; | 297 }; |
| 301 | 298 |
| 302 struct AllocatedEncoder { | 299 struct AllocatedEncoder { |
| 303 AllocatedEncoder(webrtc::VideoEncoder* encoder, | 300 AllocatedEncoder(webrtc::VideoEncoder* encoder, |
| 304 webrtc::VideoCodecType type, | 301 const cricket::VideoCodec& codec, |
| 305 bool external); | 302 bool external); |
| 306 webrtc::VideoEncoder* encoder; | 303 webrtc::VideoEncoder* encoder; |
| 307 webrtc::VideoEncoder* external_encoder; | 304 webrtc::VideoEncoder* external_encoder; |
| 308 webrtc::VideoCodecType type; | 305 cricket::VideoCodec codec; |
| 309 bool external; | 306 bool external; |
| 310 }; | 307 }; |
| 311 | 308 |
| 312 // TODO(perkj): VideoFrameInfo is currently used for sending a black frame | 309 // TODO(perkj): VideoFrameInfo is currently used for sending a black frame |
| 313 // when the video source is removed. Consider moving that logic to | 310 // when the video source is removed. Consider moving that logic to |
| 314 // VieEncoder or remove it. | 311 // VieEncoder or remove it. |
| 315 struct VideoFrameInfo { | 312 struct VideoFrameInfo { |
| 316 VideoFrameInfo() | 313 VideoFrameInfo() |
| 317 : width(0), | 314 : width(0), |
| 318 height(0), | 315 height(0), |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 507 // send_params/recv_params, rtp_extensions, options, etc. | 504 // send_params/recv_params, rtp_extensions, options, etc. |
| 508 VideoSendParameters send_params_; | 505 VideoSendParameters send_params_; |
| 509 VideoOptions default_send_options_; | 506 VideoOptions default_send_options_; |
| 510 VideoRecvParameters recv_params_; | 507 VideoRecvParameters recv_params_; |
| 511 int64_t last_stats_log_ms_; | 508 int64_t last_stats_log_ms_; |
| 512 }; | 509 }; |
| 513 | 510 |
| 514 } // namespace cricket | 511 } // namespace cricket |
| 515 | 512 |
| 516 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_ | 513 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_ |
| OLD | NEW |