Skip to content

Add H264 hardware decoding for Marvell chips #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Add H264 hardware decoding for Marvell chips #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e7c3d03
Add H264 hardware decoding for Marvell chips
tao1 Oct 18, 2023
ba07d1d
Ignore publish stuff in build.gradle so stream-webrtc-android can be …
tao1 Oct 18, 2023
e23a11f
minSdk 21
tao1 Dec 14, 2023
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
11 changes: 8 additions & 3 deletions stream-webrtc-android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,29 @@
@file:Suppress("UnstableApiUsage")

import io.getstream.Configurations
//import io.getstream.Configurations

@Suppress("DSL_SCOPE_VIOLATION")
plugins {
id(libs.plugins.android.library.get().pluginId)
id(libs.plugins.kotlin.android.get().pluginId)
}

/*
rootProject.extra.apply {
set("PUBLISH_GROUP_ID", Configurations.artifactGroup)
set("PUBLISH_ARTIFACT_ID", "stream-webrtc-android")
set("PUBLISH_VERSION", rootProject.extra.get("rootVersionName"))
}

apply(from ="${rootDir}/scripts/publish-module.gradle")
*/

android {
namespace = "org.webrtc"
compileSdk = Configurations.compileSdk
compileSdk = 34 //Configurations.compileSdk

defaultConfig {
minSdk = Configurations.minSdk
minSdk = 21 //Configurations.minSdk
consumerProguardFiles("consumer-rules.pro")
}

Expand All @@ -39,6 +41,9 @@ android {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = "11"
}
}

tasks.withType(JavaCompile::class.java).configureEach {
Expand Down
5 changes: 4 additions & 1 deletion stream-webrtc-android/src/main/java/org/webrtc/MediaCodecUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ 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 MARVELL_PREFIX = "OMX.Marvell.";
static final String[] SOFTWARE_IMPLEMENTATION_PREFIXES = {
"OMX.google.", "OMX.SEC.", "c2.android"};

Expand All @@ -40,7 +41,9 @@ class MediaCodecUtils {
static final int COLOR_QCOM_FORMATYUV420PackedSemiPlanar32m = 0x7FA30C04;

// Color formats supported by hardware decoder - in order of preference.
static final int[] DECODER_COLOR_FORMATS = new int[] {CodecCapabilities.COLOR_FormatYUV420Planar,
static final int[] DECODER_COLOR_FORMATS = new int[] {
MediaCodecInfo.CodecCapabilities.COLOR_FormatYUV420Flexible,
CodecCapabilities.COLOR_FormatYUV420Planar,
CodecCapabilities.COLOR_FormatYUV420SemiPlanar,
CodecCapabilities.COLOR_QCOM_FormatYUV420SemiPlanar,
MediaCodecUtils.COLOR_QCOM_FORMATYVU420PackedSemiPlanar32m4ka,
Expand Down
5 changes: 3 additions & 2 deletions stream-webrtc-android/src/main/java/org/webrtc/MediaCodecVideoDecoderFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

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

import android.media.MediaCodecInfo;
import android.media.MediaCodecInfo.CodecCapabilities;
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