zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update EncoderProxy to use EncoderInfo

Browse Source 
Bug: webrtc:9890
Change-Id: Iadb9cab3bb628480cb83c456f23cc15f6fee8d47
Reviewed-on: https://webrtc-review.googlesource.com/c/109027
Reviewed-by: Niels Moller <nisse@webrtc.org>
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Commit-Queue: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25497}
This commit is contained in:
Erik Språng
2018-11-01 17:45:06 +01:00
committed by Commit Bot
parent bf0d0c1b30
commit a1ead6f2ab
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/video_encoder_proxy_factory.h
View File

@ -71,9 +71,6 @@ class VideoEncoderProxyFactory final : public VideoEncoderFactory {
size_t max_payload_size) override { size_t max_payload_size) override {
return encoder_->InitEncode(config, number_of_cores, max_payload_size); return encoder_->InitEncode(config, number_of_cores, max_payload_size);
} }
VideoEncoder::ScalingSettings GetScalingSettings() const override {
return encoder_->GetScalingSettings();
}
int32_t RegisterEncodeCompleteCallback( int32_t RegisterEncodeCompleteCallback(
EncodedImageCallback* callback) override { EncodedImageCallback* callback) override {
return encoder_->RegisterEncodeCompleteCallback(callback); return encoder_->RegisterEncodeCompleteCallback(callback);
@ -86,8 +83,8 @@ class VideoEncoderProxyFactory final : public VideoEncoderFactory {
uint32_t framerate) override { uint32_t framerate) override {
return encoder_->SetRateAllocation(rate_allocation, framerate); return encoder_->SetRateAllocation(rate_allocation, framerate);
} }
const char* ImplementationName() const override { VideoEncoder::EncoderInfo GetEncoderInfo() const override {
return encoder_->ImplementationName(); return encoder_->GetEncoderInfo();
} }
VideoEncoder* const encoder_; VideoEncoder* const encoder_;