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

MediaCodecVideoEncoder: Fall back to SW when simulcast is requested.

Browse Source 
Bug: webrtc:9675
Change-Id: I464c3bfefcf8271da2ea68588b9635b10a7eb6b0
Reviewed-on: https://webrtc-review.googlesource.com/96402
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Commit-Queue: Rasmus Brandt <brandtr@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24465}
This commit is contained in:
Rasmus Brandt
2018-08-28 09:38:51 +02:00
committed by Commit Bot
parent 5b7a484ff1
commit a911eaf79b
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sdk/android/src/jni/androidmediaencoder.cc
View File

@ -341,6 +341,13 @@ int32_t MediaCodecVideoEncoder::InitEncode(const VideoCodec* codec_settings,
ALOGD << "InitEncode request: " << init_width << " x " << init_height; ALOGD << "InitEncode request: " << init_width << " x " << init_height;
ALOGD << "Encoder automatic resize " << (scale_ ? "enabled" : "disabled"); 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 // Check allowed H.264 profile
profile_ = H264::Profile::kProfileBaseline; profile_ = H264::Profile::kProfileBaseline;
if (codec_type == kVideoCodecH264) { if (codec_type == kVideoCodecH264) {