| Index: webrtc/video/video_send_stream.cc
|
| diff --git a/webrtc/video/video_send_stream.cc b/webrtc/video/video_send_stream.cc
|
| index 2ab78ce77de6815d9e096ed08e96a634e8656656..1dc9026576d6bf6e65e12341327a486a9c06f071 100644
|
| --- a/webrtc/video/video_send_stream.cc
|
| +++ b/webrtc/video/video_send_stream.cc
|
| @@ -284,11 +284,11 @@ class VideoSendStreamImpl : public webrtc::BitrateAllocatorObserver,
|
| int64_t rtt) override;
|
|
|
| // Implements webrtc::VCMProtectionCallback.
|
| - int ProtectionRequest(const FecProtectionParams* delta_params,
|
| - const FecProtectionParams* key_params,
|
| - uint32_t* sent_video_rate_bps,
|
| - uint32_t* sent_nack_rate_bps,
|
| - uint32_t* sent_fec_rate_bps) override;
|
| + void ProtectionRequest(const FecProtectionParams& delta_params,
|
| + const FecProtectionParams& key_params,
|
| + uint32_t* sent_video_rate_bps,
|
| + uint32_t* sent_nack_rate_bps,
|
| + uint32_t* sent_fec_rate_bps) override;
|
|
|
| void OnEncoderConfigurationChanged(std::vector<VideoStream> streams,
|
| int min_transmit_bitrate_bps) override;
|
| @@ -1080,9 +1080,9 @@ void VideoSendStreamImpl::EnableEncodedFrameRecording(
|
| }
|
| }
|
|
|
| -int VideoSendStreamImpl::ProtectionRequest(
|
| - const FecProtectionParams* delta_params,
|
| - const FecProtectionParams* key_params,
|
| +void VideoSendStreamImpl::ProtectionRequest(
|
| + const FecProtectionParams& delta_params,
|
| + const FecProtectionParams& key_params,
|
| uint32_t* sent_video_rate_bps,
|
| uint32_t* sent_nack_rate_bps,
|
| uint32_t* sent_fec_rate_bps) {
|
| @@ -1102,7 +1102,6 @@ int VideoSendStreamImpl::ProtectionRequest(
|
| *sent_nack_rate_bps += module_nack_rate;
|
| *sent_fec_rate_bps += module_fec_rate;
|
| }
|
| - return 0;
|
| }
|
|
|
| } // namespace internal
|
|
|