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

Android: Re-enable videoprocessor integration tests.

Browse Source 
The problem was that the encoder was feeded with frames that had 0 as
a timestamp. This confused the encoder. H264 high profile support
clause was also wrong and is corrected.

Bug: webrtc:8601
Change-Id: Ic5a893b4b7573e694f865b63620843b2c9aa489f
Reviewed-on: https://webrtc-review.googlesource.com/32300
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21234}
This commit is contained in:
Sami Kalliomäki
2017-12-12 16:37:16 +01:00
committed by Commit Bot
parent 6acefdb70a
commit 20b294c28e
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sdk/android/api/org/webrtc/HardwareVideoEncoderFactory.java
View File

@ -259,7 +259,8 @@ public class HardwareVideoEncoderFactory implements VideoEncoderFactory {
}
private boolean isH264HighProfileSupported(MediaCodecInfo info) {
return enableH264HighProfile && info.getName().startsWith(QCOM_PREFIX);
return enableH264HighProfile && Build.VERSION.SDK_INT > Build.VERSION_CODES.M
&& info.getName().startsWith(EXYNOS_PREFIX);
}
private Map<String, String> getCodecProperties(VideoCodecType type, boolean highProfile) {