| Index: webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc
|
| diff --git a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc
|
| index 89c61cec3af9b84b507c23c27405f96544e420f4..2e3a7a10701b4a6fb91af4c4bec0fae5649101ac 100644
|
| --- a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc
|
| +++ b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc
|
| @@ -247,16 +247,16 @@ class TestSimulcastEncoderAdapterFake : public ::testing::Test,
|
| last_encoded_image_simulcast_index_(-1) {}
|
| virtual ~TestSimulcastEncoderAdapterFake() {}
|
|
|
| - int32_t Encoded(const EncodedImage& encodedImage,
|
| - const CodecSpecificInfo* codecSpecificInfo = NULL,
|
| - const RTPFragmentationHeader* fragmentation = NULL) override {
|
| - last_encoded_image_width_ = encodedImage._encodedWidth;
|
| - last_encoded_image_height_ = encodedImage._encodedHeight;
|
| - if (codecSpecificInfo) {
|
| + Result OnEncodedImage(const EncodedImage& encoded_image,
|
| + const CodecSpecificInfo* codec_specific_info,
|
| + const RTPFragmentationHeader* fragmentation) override {
|
| + last_encoded_image_width_ = encoded_image._encodedWidth;
|
| + last_encoded_image_height_ = encoded_image._encodedHeight;
|
| + if (codec_specific_info) {
|
| last_encoded_image_simulcast_index_ =
|
| - codecSpecificInfo->codecSpecific.VP8.simulcastIdx;
|
| + codec_specific_info->codecSpecific.VP8.simulcastIdx;
|
| }
|
| - return 0;
|
| + return Result();
|
| }
|
|
|
| bool GetLastEncodedImageInfo(int* out_width,
|
|
|