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

Added user-defined predicate to filter video codec implementations.

Browse Source 
Ability to provide user defined predicate to disable particular
codec in particular circumstances was added. This could help
addressing mysterious crashes on specific Android devices.

Bug: webrtc:10029
Change-Id: I7ad81f4b1351aa68f036c0ee3b6d32fbf0f697ed
Reviewed-on: https://webrtc-review.googlesource.com/c/111781
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25820}
This commit is contained in:
Yura Yaroshevich
2018-11-28 15:41:17 +03:00
committed by Commit Bot
parent 7f7e973362
commit 68478b8287
6 changed files with 179 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
sdk/android/src/java/org/webrtc/MediaCodecVideoDecoderFactory.java
View File

@ -28,22 +28,20 @@ class MediaCodecVideoDecoderFactory implements VideoDecoderFactory {
private static final String TAG = "MediaCodecVideoDecoderFactory";
private final @Nullable EglBase.Context sharedContext;
private final String[] prefixWhitelist;
private final String[] prefixBlacklist;
private final @Nullable Predicate<MediaCodecInfo> codecAllowedPredicate;
/**
* MediaCodecVideoDecoderFactory will support codecs whitelisted excluding those blacklisted.
* MediaCodecVideoDecoderFactory with support of codecs filtering.
*
* @param sharedContext The textures generated will be accessible from this context. May be null,
* this disables texture support.
* @param prefixWhitelist List of codec prefixes to be whitelisted.
* @param prefixBlacklist List of codec prefixes to be blacklisted.
* @param codecAllowedPredicate optional predicate to test if codec allowed. All codecs are
* allowed when predicate is not provided.
*/
public MediaCodecVideoDecoderFactory(
@Nullable EglBase.Context sharedContext, String[] prefixWhitelist, String[] prefixBlacklist) {
public MediaCodecVideoDecoderFactory(@Nullable EglBase.Context sharedContext,
@Nullable Predicate<MediaCodecInfo> codecAllowedPredicate) {
this.sharedContext = sharedContext;
this.prefixWhitelist = Arrays.copyOf(prefixWhitelist, prefixWhitelist.length);
this.prefixBlacklist = Arrays.copyOf(prefixBlacklist, prefixBlacklist.length);
this.codecAllowedPredicate = codecAllowedPredicate;
}
@Nullable
@ -123,25 +121,14 @@ class MediaCodecVideoDecoderFactory implements VideoDecoderFactory {
== null) {
return false;
}
return isWhitelisted(name) && !isBlacklisted(name);
return isCodecAllowed(info);
}
private boolean isWhitelisted(String name) {
for (String prefix : prefixWhitelist) {
if (name.startsWith(prefix)) {
return true;
}
private boolean isCodecAllowed(MediaCodecInfo info) {
if (codecAllowedPredicate == null) {
return true;
}
return false;
}
private boolean isBlacklisted(String name) {
for (String prefix : prefixBlacklist) {
if (name.startsWith(prefix)) {
return true;
}
}
return false;
return codecAllowedPredicate.test(info);
}
private boolean isH264HighProfileSupported(MediaCodecInfo info) {