| Index: webrtc/media/engine/fakewebrtcvideoengine.h
|
| diff --git a/webrtc/media/engine/fakewebrtcvideoengine.h b/webrtc/media/engine/fakewebrtcvideoengine.h
|
| index cb77072e2b13e1ab4c4ab2b4347502f26ba48161..a6cfeb3edf83e43f4c46c799b88a9b849abcdfe3 100644
|
| --- a/webrtc/media/engine/fakewebrtcvideoengine.h
|
| +++ b/webrtc/media/engine/fakewebrtcvideoengine.h
|
| @@ -132,9 +132,9 @@
|
| FakeWebRtcVideoEncoder()
|
| : init_encode_event_(false, false), num_frames_encoded_(0) {}
|
|
|
| - int32_t InitEncode(const webrtc::VideoCodec* codecSettings,
|
| - int32_t numberOfCores,
|
| - size_t maxPayloadSize) override {
|
| + virtual int32_t InitEncode(const webrtc::VideoCodec* codecSettings,
|
| + int32_t numberOfCores,
|
| + size_t maxPayloadSize) {
|
| rtc::CritScope lock(&crit_);
|
| codec_settings_ = *codecSettings;
|
| init_encode_event_.Set();
|
| @@ -148,28 +148,27 @@
|
| return codec_settings_;
|
| }
|
|
|
| - int32_t Encode(const webrtc::VideoFrame& inputImage,
|
| - const webrtc::CodecSpecificInfo* codecSpecificInfo,
|
| - const std::vector<webrtc::FrameType>* frame_types) override {
|
| + virtual int32_t Encode(const webrtc::VideoFrame& inputImage,
|
| + const webrtc::CodecSpecificInfo* codecSpecificInfo,
|
| + const std::vector<webrtc::FrameType>* frame_types) {
|
| rtc::CritScope lock(&crit_);
|
| ++num_frames_encoded_;
|
| init_encode_event_.Set();
|
| return WEBRTC_VIDEO_CODEC_OK;
|
| }
|
|
|
| - int32_t RegisterEncodeCompleteCallback(
|
| - webrtc::EncodedImageCallback* callback) override {
|
| - return WEBRTC_VIDEO_CODEC_OK;
|
| - }
|
| -
|
| - int32_t Release() override { return WEBRTC_VIDEO_CODEC_OK; }
|
| -
|
| - int32_t SetChannelParameters(uint32_t packetLoss, int64_t rtt) override {
|
| - return WEBRTC_VIDEO_CODEC_OK;
|
| - }
|
| -
|
| - int32_t SetRateAllocation(const webrtc::BitrateAllocation& allocation,
|
| - uint32_t framerate) override {
|
| + virtual int32_t RegisterEncodeCompleteCallback(
|
| + webrtc::EncodedImageCallback* callback) {
|
| + return WEBRTC_VIDEO_CODEC_OK;
|
| + }
|
| +
|
| + virtual int32_t Release() { return WEBRTC_VIDEO_CODEC_OK; }
|
| +
|
| + virtual int32_t SetChannelParameters(uint32_t packetLoss, int64_t rtt) {
|
| + return WEBRTC_VIDEO_CODEC_OK;
|
| + }
|
| +
|
| + virtual int32_t SetRates(uint32_t newBitRate, uint32_t frameRate) {
|
| return WEBRTC_VIDEO_CODEC_OK;
|
| }
|
|
|
|
|