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

Unified Diff: webrtc/test/configurable_frame_size_encoder.cc

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
« no previous file with comments | « webrtc/test/configurable_frame_size_encoder.h ('k') | webrtc/test/fake_encoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/test/configurable_frame_size_encoder.cc
diff --git a/webrtc/test/configurable_frame_size_encoder.cc b/webrtc/test/configurable_frame_size_encoder.cc
index 905b69aae8131801f14a6cbe2688db6b7fc1180e..bef62405dd65211fbe935c1740e08b7ffdcab4ad 100644
--- a/webrtc/test/configurable_frame_size_encoder.cc
+++ b/webrtc/test/configurable_frame_size_encoder.cc
@@ -12,6 +12,7 @@
#include <string.h>
+#include "webrtc/base/checks.h"
#include "webrtc/common_video/include/video_image.h"
#include "webrtc/modules/video_coding/include/video_codec_interface.h"
#include "webrtc/test/gtest.h"
@@ -72,8 +73,9 @@ int32_t ConfigurableFrameSizeEncoder::SetChannelParameters(uint32_t packet_loss,
return WEBRTC_VIDEO_CODEC_OK;
}
-int32_t ConfigurableFrameSizeEncoder::SetRates(uint32_t new_bit_rate,
- uint32_t frame_rate) {
+int32_t ConfigurableFrameSizeEncoder::SetRateAllocation(
+ const BitrateAllocation& allocation,
+ uint32_t framerate) {
return WEBRTC_VIDEO_CODEC_OK;
}
@@ -82,7 +84,7 @@ int32_t ConfigurableFrameSizeEncoder::SetPeriodicKeyFrames(bool enable) {
}
int32_t ConfigurableFrameSizeEncoder::SetFrameSize(size_t size) {
- assert(size <= max_frame_size_);
+ RTC_DCHECK_LE(size, max_frame_size_);
current_frame_size_ = size;
return WEBRTC_VIDEO_CODEC_OK;
}
« no previous file with comments | « webrtc/test/configurable_frame_size_encoder.h ('k') | webrtc/test/fake_encoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698