Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion sdk/android/src/java/org/webrtc/MediaCodecUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class MediaCodecUtils {
// Prefixes for supported hardware encoder/decoder component names.
static final String EXYNOS_PREFIX = "OMX.Exynos.";
static final String INTEL_PREFIX = "OMX.Intel.";
static final String MARVELL_PREFIX = "OMX.Marvell.";
static final String NVIDIA_PREFIX = "OMX.Nvidia.";
static final String QCOM_PREFIX = "OMX.qcom.";
static final String[] SOFTWARE_IMPLEMENTATION_PREFIXES = {
Expand All @@ -46,7 +47,8 @@ class MediaCodecUtils {
MediaCodecUtils.COLOR_QCOM_FORMATYVU420PackedSemiPlanar32m4ka,
MediaCodecUtils.COLOR_QCOM_FORMATYVU420PackedSemiPlanar16m4ka,
MediaCodecUtils.COLOR_QCOM_FORMATYVU420PackedSemiPlanar64x32Tile2m8ka,
MediaCodecUtils.COLOR_QCOM_FORMATYUV420PackedSemiPlanar32m};
MediaCodecUtils.COLOR_QCOM_FORMATYUV420PackedSemiPlanar32m,
MediaCodecInfo.CodecCapabilities.COLOR_FormatYUV420Flexible};

// Color formats supported by hardware encoder - in order of preference.
static final int[] ENCODER_COLOR_FORMATS = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
package org.webrtc;

import static org.webrtc.MediaCodecUtils.EXYNOS_PREFIX;
import static org.webrtc.MediaCodecUtils.MARVELL_PREFIX;
import static org.webrtc.MediaCodecUtils.QCOM_PREFIX;

import android.media.MediaCodecInfo;
Expand Down Expand Up @@ -127,8 +128,8 @@ private boolean isCodecAllowed(MediaCodecInfo info) {

private boolean isH264HighProfileSupported(MediaCodecInfo info) {
String name = info.getName();
// Support H.264 HP decoding on QCOM chips.
if (name.startsWith(QCOM_PREFIX)) {
// Support H.264 HP decoding on QCOM and Marvell chips
if (name.startsWith(QCOM_PREFIX) || name.startsWith(MARVELL_PREFIX)) {
return true;
}
// Support H.264 HP decoding on Exynos chips for Android M and above.
Expand Down