Index: webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.cc |
diff --git a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.cc b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.cc |
index 7b1e9d9d962afebe90cb67047a3dd2ac8dc5c6dc..eba59d0fdff8d4e280c2235f2a395f7b15e033df 100644 |
--- a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.cc |
+++ b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.cc |
@@ -120,12 +120,12 @@ class AdapterEncodedImageCallback : public webrtc::EncodedImageCallback { |
size_t stream_idx) |
: adapter_(adapter), stream_idx_(stream_idx) {} |
- int32_t Encoded( |
- const webrtc::EncodedImage& encodedImage, |
- const webrtc::CodecSpecificInfo* codecSpecificInfo = NULL, |
- const webrtc::RTPFragmentationHeader* fragmentation = NULL) override { |
- return adapter_->Encoded(stream_idx_, encodedImage, codecSpecificInfo, |
- fragmentation); |
+ EncodedImageCallback::Result OnEncodedImage( |
+ const webrtc::EncodedImage& encoded_image, |
+ const webrtc::CodecSpecificInfo* codec_specific_info, |
+ const webrtc::RTPFragmentationHeader* fragmentation) override { |
+ return adapter_->OnEncodedImage(stream_idx_, encoded_image, |
+ codec_specific_info, fragmentation); |
} |
private: |
@@ -404,7 +404,7 @@ int SimulcastEncoderAdapter::SetRates(uint32_t new_bitrate_kbit, |
return WEBRTC_VIDEO_CODEC_OK; |
} |
-int32_t SimulcastEncoderAdapter::Encoded( |
+EncodedImageCallback::Result SimulcastEncoderAdapter::OnEncodedImage( |
size_t stream_idx, |
const EncodedImage& encodedImage, |
const CodecSpecificInfo* codecSpecificInfo, |
@@ -413,7 +413,7 @@ int32_t SimulcastEncoderAdapter::Encoded( |
CodecSpecificInfoVP8* vp8Info = &(stream_codec_specific.codecSpecific.VP8); |
vp8Info->simulcastIdx = stream_idx; |
- return encoded_complete_callback_->Encoded( |
+ return encoded_complete_callback_->OnEncodedImage( |
encodedImage, &stream_codec_specific, fragmentation); |
} |