From a911eaf79bceb3c35e0b33b7efabb2271b7bfe41 Mon Sep 17 00:00:00 2001 From: Rasmus Brandt Date: Tue, 28 Aug 2018 09:38:51 +0200 Subject: [PATCH] MediaCodecVideoEncoder: Fall back to SW when simulcast is requested. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:9675 Change-Id: I464c3bfefcf8271da2ea68588b9635b10a7eb6b0 Reviewed-on: https://webrtc-review.googlesource.com/96402 Reviewed-by: Sami Kalliomäki Commit-Queue: Rasmus Brandt Cr-Commit-Position: refs/heads/master@{#24465} --- sdk/android/src/jni/androidmediaencoder.cc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sdk/android/src/jni/androidmediaencoder.cc b/sdk/android/src/jni/androidmediaencoder.cc index ebd760ffc5..35608c888a 100644 --- a/sdk/android/src/jni/androidmediaencoder.cc +++ b/sdk/android/src/jni/androidmediaencoder.cc @@ -341,6 +341,13 @@ int32_t MediaCodecVideoEncoder::InitEncode(const VideoCodec* codec_settings, ALOGD << "InitEncode request: " << init_width << " x " << init_height; ALOGD << "Encoder automatic resize " << (scale_ ? "enabled" : "disabled"); + if (codec_settings->numberOfSimulcastStreams > 1) { + ALOGD << "Number of simulcast layers requested: " + << codec_settings->numberOfSimulcastStreams + << ". Requesting software fallback."; + return WEBRTC_VIDEO_CODEC_FALLBACK_SOFTWARE; + } + // Check allowed H.264 profile profile_ = H264::Profile::kProfileBaseline; if (codec_type == kVideoCodecH264) {