Chromium Code Reviews| 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 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 216 | 216 |
| 217 bool GetChangedSendParameters(const VideoSendParameters& params, | 217 bool GetChangedSendParameters(const VideoSendParameters& params, |
| 218 ChangedSendParameters* changed_params) const; | 218 ChangedSendParameters* changed_params) const; |
| 219 bool GetChangedRecvParameters(const VideoRecvParameters& params, | 219 bool GetChangedRecvParameters(const VideoRecvParameters& params, |
| 220 ChangedRecvParameters* changed_params) const; | 220 ChangedRecvParameters* changed_params) const; |
| 221 | 221 |
| 222 void SetMaxSendBandwidth(int bps); | 222 void SetMaxSendBandwidth(int bps); |
| 223 void SetOptions(uint32_t ssrc, const VideoOptions& options); | 223 void SetOptions(uint32_t ssrc, const VideoOptions& options); |
| 224 | 224 |
| 225 void ConfigureReceiverRtp(webrtc::VideoReceiveStream::Config* config, | 225 void ConfigureReceiverRtp(webrtc::VideoReceiveStream::Config* config, |
| 226 const StreamParams& sp) const; | 226 const StreamParams& sp); |
| 227 bool CodecIsExternallySupported(const std::string& name) const; | 227 bool CodecIsExternallySupported(const std::string& name) const; |
| 228 bool ValidateSendSsrcAvailability(const StreamParams& sp) const | 228 bool ValidateSendSsrcAvailability(const StreamParams& sp) const |
| 229 EXCLUSIVE_LOCKS_REQUIRED(stream_crit_); | 229 EXCLUSIVE_LOCKS_REQUIRED(stream_crit_); |
| 230 bool ValidateReceiveSsrcAvailability(const StreamParams& sp) const | 230 bool ValidateReceiveSsrcAvailability(const StreamParams& sp) const |
| 231 EXCLUSIVE_LOCKS_REQUIRED(stream_crit_); | 231 EXCLUSIVE_LOCKS_REQUIRED(stream_crit_); |
| 232 void DeleteReceiveStream(WebRtcVideoReceiveStream* stream) | 232 void DeleteReceiveStream(WebRtcVideoReceiveStream* stream) |
| 233 EXCLUSIVE_LOCKS_REQUIRED(stream_crit_); | 233 EXCLUSIVE_LOCKS_REQUIRED(stream_crit_); |
| 234 | 234 |
| 235 static std::string CodecSettingsVectorToString( | 235 static std::string CodecSettingsVectorToString( |
| 236 const std::vector<VideoCodecSettings>& codecs); | 236 const std::vector<VideoCodecSettings>& codecs); |
| (...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 429 webrtc::RtcpMode rtcp_mode); | 429 webrtc::RtcpMode rtcp_mode); |
| 430 void SetRecvParameters(const ChangedRecvParameters& recv_params); | 430 void SetRecvParameters(const ChangedRecvParameters& recv_params); |
| 431 | 431 |
| 432 void OnFrame(const webrtc::VideoFrame& frame) override; | 432 void OnFrame(const webrtc::VideoFrame& frame) override; |
| 433 bool IsDefaultStream() const; | 433 bool IsDefaultStream() const; |
| 434 | 434 |
| 435 void SetSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink); | 435 void SetSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink); |
| 436 | 436 |
| 437 VideoReceiverInfo GetVideoReceiverInfo(); | 437 VideoReceiverInfo GetVideoReceiverInfo(); |
| 438 | 438 |
| 439 void DisableFec(); | |
|
Taylor Brandstetter
2016/05/09 18:40:36
May want to explain why this exists in a comment,
stefan-webrtc
2016/05/16 08:49:55
Done.
| |
| 440 | |
| 439 private: | 441 private: |
| 440 struct AllocatedDecoder { | 442 struct AllocatedDecoder { |
| 441 AllocatedDecoder(webrtc::VideoDecoder* decoder, | 443 AllocatedDecoder(webrtc::VideoDecoder* decoder, |
| 442 webrtc::VideoCodecType type, | 444 webrtc::VideoCodecType type, |
| 443 bool external); | 445 bool external); |
| 444 webrtc::VideoDecoder* decoder; | 446 webrtc::VideoDecoder* decoder; |
| 445 // Decoder wrapped into a fallback decoder to permit software fallback. | 447 // Decoder wrapped into a fallback decoder to permit software fallback. |
| 446 webrtc::VideoDecoder* external_decoder; | 448 webrtc::VideoDecoder* external_decoder; |
| 447 webrtc::VideoCodecType type; | 449 webrtc::VideoCodecType type; |
| 448 bool external; | 450 bool external; |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 529 WebRtcVideoEncoderFactory* const external_encoder_factory_; | 531 WebRtcVideoEncoderFactory* const external_encoder_factory_; |
| 530 WebRtcVideoDecoderFactory* const external_decoder_factory_; | 532 WebRtcVideoDecoderFactory* const external_decoder_factory_; |
| 531 std::vector<VideoCodecSettings> recv_codecs_; | 533 std::vector<VideoCodecSettings> recv_codecs_; |
| 532 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; | 534 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; |
| 533 webrtc::Call::Config::BitrateConfig bitrate_config_; | 535 webrtc::Call::Config::BitrateConfig bitrate_config_; |
| 534 // TODO(deadbeef): Don't duplicate information between | 536 // TODO(deadbeef): Don't duplicate information between |
| 535 // send_params/recv_params, rtp_extensions, options, etc. | 537 // send_params/recv_params, rtp_extensions, options, etc. |
| 536 VideoSendParameters send_params_; | 538 VideoSendParameters send_params_; |
| 537 VideoOptions default_send_options_; | 539 VideoOptions default_send_options_; |
| 538 VideoRecvParameters recv_params_; | 540 VideoRecvParameters recv_params_; |
| 541 rtc::Optional<bool> red_enabled_remote_peer_; | |
| 539 }; | 542 }; |
| 540 | 543 |
| 541 } // namespace cricket | 544 } // namespace cricket |
| 542 | 545 |
| 543 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_ | 546 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_ |
| OLD | NEW |