File tree Expand file tree Collapse file tree 2 files changed +6
-3
lines changed
sdk/android/src/java/org/webrtc Expand file tree Collapse file tree 2 files changed +6
-3
lines changed Original file line number Diff line number Diff line change @@ -27,6 +27,7 @@ class MediaCodecUtils {
27
27
// Prefixes for supported hardware encoder/decoder component names.
28
28
static final String EXYNOS_PREFIX = "OMX.Exynos." ;
29
29
static final String INTEL_PREFIX = "OMX.Intel." ;
30
+ static final String MARVELL_PREFIX = "OMX.Marvell." ;
30
31
static final String NVIDIA_PREFIX = "OMX.Nvidia." ;
31
32
static final String QCOM_PREFIX = "OMX.qcom." ;
32
33
static final String [] SOFTWARE_IMPLEMENTATION_PREFIXES = {
@@ -46,7 +47,8 @@ class MediaCodecUtils {
46
47
MediaCodecUtils .COLOR_QCOM_FORMATYVU420PackedSemiPlanar32m4ka ,
47
48
MediaCodecUtils .COLOR_QCOM_FORMATYVU420PackedSemiPlanar16m4ka ,
48
49
MediaCodecUtils .COLOR_QCOM_FORMATYVU420PackedSemiPlanar64x32Tile2m8ka ,
49
- MediaCodecUtils .COLOR_QCOM_FORMATYUV420PackedSemiPlanar32m };
50
+ MediaCodecUtils .COLOR_QCOM_FORMATYUV420PackedSemiPlanar32m ,
51
+ MediaCodecInfo .CodecCapabilities .COLOR_FormatYUV420Flexible };
50
52
51
53
// Color formats supported by hardware encoder - in order of preference.
52
54
static final int [] ENCODER_COLOR_FORMATS = {
Original file line number Diff line number Diff line change 11
11
package org .webrtc ;
12
12
13
13
import static org .webrtc .MediaCodecUtils .EXYNOS_PREFIX ;
14
+ import static org .webrtc .MediaCodecUtils .MARVELL_PREFIX ;
14
15
import static org .webrtc .MediaCodecUtils .QCOM_PREFIX ;
15
16
16
17
import android .media .MediaCodecInfo ;
@@ -127,8 +128,8 @@ private boolean isCodecAllowed(MediaCodecInfo info) {
127
128
128
129
private boolean isH264HighProfileSupported (MediaCodecInfo info ) {
129
130
String name = info .getName ();
130
- // Support H.264 HP decoding on QCOM chips.
131
- if (name .startsWith (QCOM_PREFIX )) {
131
+ // Support H.264 HP decoding on QCOM and Marvell chips
132
+ if (name .startsWith (QCOM_PREFIX ) || name . startsWith ( MARVELL_PREFIX ) ) {
132
133
return true ;
133
134
}
134
135
// Support H.264 HP decoding on Exynos chips for Android M and above.
You can’t perform that action at this time.
0 commit comments