Copy VP8EncoderSimulcastProxy to EncoderSimulcastProxy

Use the new class internally where appropriate too.

The objective is to rename it, but due to some external dependency,
it is better to copy, update dependencies and remove.

Bug: webrtc:10069
Change-Id: I8477ce5a2982933db27513cc9509f51558dafaf3
Reviewed-on: https://webrtc-review.googlesource.com/c/113265
Commit-Queue: Florent Castelli <orphis@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25920}
This commit is contained in:
Florent Castelli
2018-12-06 13:38:24 +01:00
committed by Commit Bot
parent 18f0c3c038
commit e7862cc6b5
10 changed files with 413 additions and 8 deletions

View File

@ -77,6 +77,7 @@ rtc_static_library("builtin_video_encoder_factory") {
deps = [
":video_codecs_api",
"../../media:rtc_encoder_simulcast_proxy",
"../../media:rtc_internal_video_codecs",
"../../media:rtc_media_base",
"../../media:rtc_vp8_encoder_simulcast_proxy",

View File

@ -18,8 +18,8 @@
#include "api/video_codecs/video_encoder.h"
#include "media/base/codec.h"
#include "media/base/mediaconstants.h"
#include "media/engine/encoder_simulcast_proxy.h"
#include "media/engine/internalencoderfactory.h"
#include "media/engine/vp8_encoder_simulcast_proxy.h"
#include "rtc_base/checks.h"
namespace webrtc {
@ -63,7 +63,7 @@ class BuiltinVideoEncoderFactory : public VideoEncoderFactory {
format)) {
internal_encoder =
absl::EqualsIgnoreCase(format.name, cricket::kVp8CodecName)
? absl::make_unique<VP8EncoderSimulcastProxy>(
? absl::make_unique<EncoderSimulcastProxy>(
internal_encoder_factory_.get(), format)
: internal_encoder_factory_->CreateVideoEncoder(format);
}