admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Uncomment "override" in simulcast_encoder_adapter_unittest.cc

Browse Source 
Bug: None
Change-Id: I4f07bb27d08ccac43adb59c90823e487fa0cced3
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/140951
Commit-Queue: Elad Alon <eladalon@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28246}
This commit is contained in:
Elad Alon 2019-06-11 19:03:16 +02:00 committed by Commit Bot
parent 47ae30358e
commit a9952cb0c4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
media/engine/simulcast_encoder_adapter_unittest.cc
View File

@ -192,7 +192,7 @@ class MockVideoEncoder : public VideoEncoder {
// warnings from -Winconsistent-missing-override. See
// http://crbug.com/428099.
int32_t InitEncode(const VideoCodec* codecSettings,
const VideoEncoder::Settings& settings) /* override */ {
const VideoEncoder::Settings& settings) override {
codec_ = *codecSettings;
return init_encode_return_value_;
}
@ -203,12 +203,12 @@ class MockVideoEncoder : public VideoEncoder {
const std::vector<VideoFrameType>* frame_types) /* override */);
int32_t RegisterEncodeCompleteCallback(
EncodedImageCallback* callback) /* override */ {
EncodedImageCallback* callback) override {
callback_ = callback;
return 0;
}
MOCK_METHOD0(Release, int32_t());
MOCK_METHOD0(Release, int32_t() /* override */);
void SetRates(const RateControlParameters& parameters) {
last_set_rates_ = parameters;