admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make SEA to be codec agnostic.

Browse Source 
Bug: none
Change-Id: I803eebe710e8278bb62daa4468ffff5f1188c6db
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/192792
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Sergey Silkin <ssilkin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32593}
This commit is contained in:
Sergey Silkin 2020-11-11 17:14:50 +01:00 committed by Commit Bot
parent 728b5d01b0
commit 1bd6cc562b
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
media/engine/simulcast_encoder_adapter.cc
View File

@ -240,10 +240,6 @@ int SimulcastEncoderAdapter::InitEncode(
RTC_DCHECK_LT(lowest_resolution_stream_index, number_of_streams);
RTC_DCHECK_LT(highest_resolution_stream_index, number_of_streams);
const SdpVideoFormat format(
codec_.codecType == webrtc::kVideoCodecVP8 ? "VP8" : "H264",
video_format_.parameters);
for (int i = 0; i < number_of_streams; ++i) {
// If an existing encoder instance exists, reuse it.
// TODO(brandtr): Set initial RTP state (e.g., picture_id/tl0_pic_idx) here,
@ -253,10 +249,10 @@ int SimulcastEncoderAdapter::InitEncode(
encoder = std::move(stored_encoders_.top());
stored_encoders_.pop();
} else {
encoder = primary_encoder_factory_->CreateVideoEncoder(format);
encoder = primary_encoder_factory_->CreateVideoEncoder(video_format_);
if (fallback_encoder_factory_ != nullptr) {
encoder = CreateVideoEncoderSoftwareFallbackWrapper(
fallback_encoder_factory_->CreateVideoEncoder(format),
fallback_encoder_factory_->CreateVideoEncoder(video_format_),
std::move(encoder),
i == lowest_resolution_stream_index &&
prefer_temporal_support_on_base_layer_);