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

Use Android Q API to test if MediaCodecInfo is HW Accelerated

Browse Source 
Also, add the prefix of SW Codecs in Codec2.0.

Bug: None
Change-Id: Ifc7a079a68506975cd9e52ddaf6da69744ac0614
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/177800
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31723}
This commit is contained in:
Byoungchan Lee
2020-07-02 02:00:25 +09:00
committed by Commit Bot
parent 84bb634238
commit 80d2159ff4
3 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sdk/android/api/org/webrtc/HardwareVideoDecoderFactory.java
View File

@ -18,18 +18,9 @@ import java.util.Arrays;
public class HardwareVideoDecoderFactory extends MediaCodecVideoDecoderFactory {
private final static Predicate<MediaCodecInfo> defaultAllowedPredicate =
new Predicate<MediaCodecInfo>() {
private String[] prefixBlocklist =
Arrays.copyOf(MediaCodecUtils.SOFTWARE_IMPLEMENTATION_PREFIXES,
MediaCodecUtils.SOFTWARE_IMPLEMENTATION_PREFIXES.length);
@Override
public boolean test(MediaCodecInfo arg) {
final String name = arg.getName();
for (String prefix : prefixBlocklist) {
if (name.startsWith(prefix)) {
return false;
}
}
return true;
return MediaCodecUtils.isHardwareAccelerated(arg);
}
};

12
sdk/android/api/org/webrtc/PlatformSoftwareVideoDecoderFactory.java
View File

@ -21,19 +21,9 @@ public class PlatformSoftwareVideoDecoderFactory extends MediaCodecVideoDecoderF
*/
private static final Predicate<MediaCodecInfo> defaultAllowedPredicate =
new Predicate<MediaCodecInfo>() {
private String[] prefixAllowlist =
Arrays.copyOf(MediaCodecUtils.SOFTWARE_IMPLEMENTATION_PREFIXES,
MediaCodecUtils.SOFTWARE_IMPLEMENTATION_PREFIXES.length);
@Override
public boolean test(MediaCodecInfo arg) {
final String name = arg.getName();
for (String prefix : prefixAllowlist) {
if (name.startsWith(prefix)) {
return true;
}
}
return false;
return MediaCodecUtils.isSoftwareOnly(arg);
}
};

34
sdk/android/src/java/org/webrtc/MediaCodecUtils.java
View File

@ -10,6 +10,7 @@
package org.webrtc;
import android.annotation.TargetApi;
import android.media.MediaCodecInfo;
import android.media.MediaCodecInfo.CodecCapabilities;
import android.os.Build;
@ -28,7 +29,8 @@ class MediaCodecUtils {
static final String INTEL_PREFIX = "OMX.Intel.";
static final String NVIDIA_PREFIX = "OMX.Nvidia.";
static final String QCOM_PREFIX = "OMX.qcom.";
static final String[] SOFTWARE_IMPLEMENTATION_PREFIXES = {"OMX.google.", "OMX.SEC."};
static final String[] SOFTWARE_IMPLEMENTATION_PREFIXES = {
"OMX.google.", "OMX.SEC.", "c2.android"};
// NV12 color format supported by QCOM codec, but not declared in MediaCodec -
// see /hardware/qcom/media/mm-core/inc/OMX_QCOMExtns.h
@ -97,6 +99,36 @@ class MediaCodecUtils {
}
}
static boolean isHardwareAccelerated(MediaCodecInfo info) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
return isHardwareAcceleratedQOrHigher(info);
}
return !isSoftwareOnly(info);
}
@TargetApi(29)
private static boolean isHardwareAcceleratedQOrHigher(android.media.MediaCodecInfo codecInfo) {
return codecInfo.isHardwareAccelerated();
}
static boolean isSoftwareOnly(android.media.MediaCodecInfo codecInfo) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
return isSoftwareOnlyQOrHigher(codecInfo);
}
String name = codecInfo.getName();
for (String prefix : SOFTWARE_IMPLEMENTATION_PREFIXES) {
if (name.startsWith(prefix)) {
return true;
}
}
return false;
}
@TargetApi(29)
private static boolean isSoftwareOnlyQOrHigher(android.media.MediaCodecInfo codecInfo) {
return codecInfo.isSoftwareOnly();
}
private MediaCodecUtils() {
// This class should not be instantiated.
}