| Index: webrtc/test/fake_encoder.cc
|
| diff --git a/webrtc/test/fake_encoder.cc b/webrtc/test/fake_encoder.cc
|
| index 1db93eb40e36b6ebc87089a6171b438bfdfa907c..f0bff12aa49d8427cd82eb0e6fb3459e2ffe44ca 100644
|
| --- a/webrtc/test/fake_encoder.cc
|
| +++ b/webrtc/test/fake_encoder.cc
|
| @@ -27,6 +27,7 @@ namespace test {
|
| FakeEncoder::FakeEncoder(Clock* clock)
|
| : clock_(clock),
|
| callback_(nullptr),
|
| + configured_input_framerate_(-1),
|
| max_target_bitrate_kbps_(-1),
|
| last_encode_time_ms_(0) {
|
| // Generate some arbitrary not-all-zero data
|
| @@ -47,6 +48,7 @@ int32_t FakeEncoder::InitEncode(const VideoCodec* config,
|
| rtc::CritScope cs(&crit_sect_);
|
| config_ = *config;
|
| target_bitrate_.SetBitrate(0, 0, config_.startBitrate * 1000);
|
| + configured_input_framerate_ = config_.maxFramerate;
|
| return 0;
|
| }
|
|
|
| @@ -170,6 +172,7 @@ int32_t FakeEncoder::SetRateAllocation(const BitrateAllocation& rate_allocation,
|
| uint32_t framerate) {
|
| rtc::CritScope cs(&crit_sect_);
|
| target_bitrate_ = rate_allocation;
|
| + configured_input_framerate_ = framerate;
|
| return 0;
|
| }
|
|
|
| @@ -178,6 +181,11 @@ const char* FakeEncoder::ImplementationName() const {
|
| return kImplementationName;
|
| }
|
|
|
| +int FakeEncoder::GetConfiguredInputFramerate() {
|
| + rtc::CritScope cs(&crit_sect_);
|
| + return configured_input_framerate_;
|
| +}
|
| +
|
| FakeH264Encoder::FakeH264Encoder(Clock* clock)
|
| : FakeEncoder(clock), callback_(nullptr), idr_counter_(0) {
|
| FakeEncoder::RegisterEncodeCompleteCallback(this);
|
|
|