Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(736)

Unified Diff: webrtc/media/engine/fakewebrtcvideoengine.h

Issue 2510583002: Reland #2 of Issue 2434073003: Extract bitrate allocation ... (Closed)
Patch Set: Addressed comments Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/media/engine/fakewebrtcvideoengine.h
diff --git a/webrtc/media/engine/fakewebrtcvideoengine.h b/webrtc/media/engine/fakewebrtcvideoengine.h
index 008f7a12d23ceefc3b4b33b70252e5324baa28e2..0204f8040b6734e2575da9d51f26f64eb6881a83 100644
--- a/webrtc/media/engine/fakewebrtcvideoengine.h
+++ b/webrtc/media/engine/fakewebrtcvideoengine.h
@@ -132,9 +132,9 @@ class FakeWebRtcVideoEncoder : public webrtc::VideoEncoder {
FakeWebRtcVideoEncoder()
: init_encode_event_(false, false), num_frames_encoded_(0) {}
- virtual int32_t InitEncode(const webrtc::VideoCodec* codecSettings,
- int32_t numberOfCores,
- size_t maxPayloadSize) {
+ int32_t InitEncode(const webrtc::VideoCodec* codecSettings,
+ int32_t numberOfCores,
+ size_t maxPayloadSize) override {
rtc::CritScope lock(&crit_);
codec_settings_ = *codecSettings;
init_encode_event_.Set();
@@ -148,27 +148,28 @@ class FakeWebRtcVideoEncoder : public webrtc::VideoEncoder {
return codec_settings_;
}
- virtual int32_t Encode(const webrtc::VideoFrame& inputImage,
- const webrtc::CodecSpecificInfo* codecSpecificInfo,
- const std::vector<webrtc::FrameType>* frame_types) {
+ int32_t Encode(const webrtc::VideoFrame& inputImage,
+ const webrtc::CodecSpecificInfo* codecSpecificInfo,
+ const std::vector<webrtc::FrameType>* frame_types) override {
rtc::CritScope lock(&crit_);
++num_frames_encoded_;
init_encode_event_.Set();
return WEBRTC_VIDEO_CODEC_OK;
}
- virtual int32_t RegisterEncodeCompleteCallback(
- webrtc::EncodedImageCallback* callback) {
+ int32_t RegisterEncodeCompleteCallback(
+ webrtc::EncodedImageCallback* callback) override {
return WEBRTC_VIDEO_CODEC_OK;
}
- virtual int32_t Release() { return WEBRTC_VIDEO_CODEC_OK; }
+ int32_t Release() override { return WEBRTC_VIDEO_CODEC_OK; }
- virtual int32_t SetChannelParameters(uint32_t packetLoss, int64_t rtt) {
+ int32_t SetChannelParameters(uint32_t packetLoss, int64_t rtt) override {
return WEBRTC_VIDEO_CODEC_OK;
}
- virtual int32_t SetRates(uint32_t newBitRate, uint32_t frameRate) {
+ int32_t SetRateAllocation(const webrtc::BitrateAllocation& allocation,
+ uint32_t framerate) override {
return WEBRTC_VIDEO_CODEC_OK;
}
« no previous file with comments | « webrtc/common_video/include/video_bitrate_allocator.h ('k') | webrtc/media/engine/videoencodersoftwarefallbackwrapper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698