diff --git a/libvlc/src/main/java/org/videolan/libvlc/LibVLC.java b/libvlc/src/main/java/org/videolan/libvlc/LibVLC.java
index 7cfc010c961aa5c4999a42a91096c25aff472e84..f4a3ba31986951ba193e45305ecf19e6be29b277 100644
--- a/libvlc/src/main/java/org/videolan/libvlc/LibVLC.java
+++ b/libvlc/src/main/java/org/videolan/libvlc/LibVLC.java
@@ -27,9 +27,7 @@ import androidx.annotation.Nullable;
import org.videolan.libvlc.interfaces.AbstractVLCEvent;
import org.videolan.libvlc.interfaces.ILibVLC;
-import org.videolan.libvlc.util.HWDecoderUtil;
-import java.util.ArrayList;
import java.util.List;
@SuppressWarnings("unused, JniMissingFunction")
diff --git a/libvlc/src/main/java/org/videolan/libvlc/Media.java b/libvlc/src/main/java/org/videolan/libvlc/Media.java
index f7229be04314d421f7894385c085b4df9fb95bb5..09e702e321379d6681e4a8ffd5525b65964d02d6 100644
--- a/libvlc/src/main/java/org/videolan/libvlc/Media.java
+++ b/libvlc/src/main/java/org/videolan/libvlc/Media.java
@@ -29,7 +29,6 @@ import org.videolan.libvlc.interfaces.ILibVLC;
import org.videolan.libvlc.interfaces.IMedia;
import org.videolan.libvlc.interfaces.IMediaList;
import org.videolan.libvlc.util.AndroidUtil;
-import org.videolan.libvlc.util.HWDecoderUtil;
import org.videolan.libvlc.util.VLCUtil;
import java.io.FileDescriptor;
@@ -447,45 +446,7 @@ public class Media extends VLCObject<IMedia.Event> implements IMedia {
* @param force force hw acceleration even for unknown devices
*/
public void setHWDecoderEnabled(boolean enabled, boolean force) {
-
- if (LibVLC.majorVersion() == 3) {
- HWDecoderUtil.Decoder decoder = enabled ?
- HWDecoderUtil.getDecoderFromDevice() :
- HWDecoderUtil.Decoder.NONE;
-
- /* Unknown device but the user asked for hardware acceleration */
- if (decoder == HWDecoderUtil.Decoder.UNKNOWN && force)
- decoder = HWDecoderUtil.Decoder.ALL;
-
- if (decoder == HWDecoderUtil.Decoder.NONE || decoder == HWDecoderUtil.Decoder.UNKNOWN) {
- addOption(":codec=all");
- return;
- }
-
- /*
- * Set higher caching values if using iomx decoding, since some omx
- * decoders have a very high latency, and if the preroll data isn't
- * enough to make the decoder output a frame, the playback timing gets
- * started too soon, and every decoded frame appears to be too late.
- * On Nexus One, the decoder latency seems to be 25 input packets
- * for 320x170 H.264, a few packets less on higher resolutions.
- * On Nexus S, the decoder latency seems to be about 7 packets.
- */
- if (!mFileCachingSet)
- addOption(":file-caching=1500");
- if (!mNetworkCachingSet)
- addOption(":network-caching=1500");
-
- final StringBuilder sb = new StringBuilder(":codec=");
- if (decoder == HWDecoderUtil.Decoder.MEDIACODEC || decoder == HWDecoderUtil.Decoder.ALL)
- sb.append(getMediaCodecModule()).append(",");
- if (force && (decoder == HWDecoderUtil.Decoder.OMX || decoder == HWDecoderUtil.Decoder.ALL))
- sb.append("iomx,");
- sb.append("all");
-
- addOption(sb.toString());
- }
- else if (!enabled) /* LibVLC >= 4.0 */
+ if (!enabled) /* LibVLC >= 4.0 */
addOption(":no-hw-dec");
}
diff --git a/libvlc/src/main/java/org/videolan/libvlc/util/HWDecoderUtil.java b/libvlc/src/main/java/org/videolan/libvlc/util/HWDecoderUtil.java
deleted file mode 100644
index 56c7b9db477c032ec1a62bc0c739d0d0279ea262..0000000000000000000000000000000000000000
--- a/libvlc/src/main/java/org/videolan/libvlc/util/HWDecoderUtil.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*****************************************************************************
- * HWDecUtil.java
- *****************************************************************************
- * Copyright © 2010-2013 VLC authors and VideoLAN
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-package org.videolan.libvlc.util;
-
-import java.lang.reflect.Method;
-import java.util.HashMap;
-
-/**
- * Utility class that return the preferred hardware decoder from a list of known devices.
- */
-public class HWDecoderUtil {
-
- public enum Decoder {
- UNKNOWN, NONE, OMX, MEDIACODEC, ALL
- }
-
- public enum AudioOutput {
- OPENSLES, ALL
- }
-
- private static class DecoderBySOC {
- public final String key;
- public final String value;
- public final Decoder dec;
- public DecoderBySOC(String key, String value, Decoder dec) {
- this.key = key;
- this.value = value;
- this.dec = dec;
- }
- }
-
- private static class AudioOutputBySOC {
- public final String key;
- public final String value;
- public final AudioOutput aout;
-
- public AudioOutputBySOC(String key, String value, AudioOutput aout) {
- this.key = key;
- this.value = value;
- this.aout = aout;
- }
- }
-
- private static final DecoderBySOC[] sBlacklistedDecoderBySOCList = new DecoderBySOC[] {
- /*
- * FIXME: Theses cpu crash in MediaCodec. We need to get hands on these devices in order to debug it.
- */
- new DecoderBySOC("ro.product.board", "MSM8225", Decoder.NONE), //Samsung Galaxy Core
- new DecoderBySOC("ro.product.board", "hawaii", Decoder.NONE), // Samsung Galaxy Ace 4
- };
-
- private static final DecoderBySOC[] sDecoderBySOCList = new DecoderBySOC[] {
- /*
- * Put first devices you want to blacklist
- * because theses devices can match the next rules.
- */
- new DecoderBySOC("ro.product.brand", "SEMC", Decoder.NONE), // Xperia S
- new DecoderBySOC("ro.board.platform", "msm7627", Decoder.NONE), // QCOM S1
-
- /*
- * Even if omap, old Amazon devices don't work with OMX, so either use MediaCodec or SW.
- */
- new DecoderBySOC("ro.product.brand", "Amazon", Decoder.MEDIACODEC),
-
- /*
- * Devices working on OMX
- */
- new DecoderBySOC("ro.board.platform", "omap3", Decoder.OMX), // Omap 3
- new DecoderBySOC("ro.board.platform", "rockchip", Decoder.OMX), // Rockchip RK29
- new DecoderBySOC("ro.board.platform", "rk29", Decoder.OMX), // Rockchip RK29
- new DecoderBySOC("ro.board.platform", "msm7630", Decoder.OMX), // QCOM S2
- new DecoderBySOC("ro.board.platform", "s5pc", Decoder.OMX), // Exynos 3
- new DecoderBySOC("ro.board.platform", "montblanc", Decoder.OMX), // Montblanc
- new DecoderBySOC("ro.board.platform", "exdroid", Decoder.OMX), // Allwinner A31
- new DecoderBySOC("ro.board.platform", "sun6i", Decoder.OMX), // Allwinner A31
-
- /*
- * Devices working only on Mediacodec
- */
- new DecoderBySOC("ro.board.platform", "exynos4", Decoder.MEDIACODEC), // Exynos 4 (Samsung Galaxy S2/S3)
-
- /*
- * Devices working on Mediacodec and OMX
- */
- new DecoderBySOC("ro.board.platform", "omap4", Decoder.ALL), // Omap 4
- new DecoderBySOC("ro.board.platform", "tegra", Decoder.ALL), // Tegra 2 & 3
- new DecoderBySOC("ro.board.platform", "tegra3", Decoder.ALL), // Tegra 3
- new DecoderBySOC("ro.board.platform", "msm8660", Decoder.ALL), // QCOM S3
- new DecoderBySOC("ro.board.platform", "exynos5", Decoder.ALL), // Exynos 5 (Samsung Galaxy S4)
- new DecoderBySOC("ro.board.platform", "rk30", Decoder.ALL), // Rockchip RK30
- new DecoderBySOC("ro.board.platform", "rk31", Decoder.ALL), // Rockchip RK31
- new DecoderBySOC("ro.board.platform", "mv88de3100", Decoder.ALL), // Marvell ARMADA 1500
-
- new DecoderBySOC("ro.hardware", "mt83", Decoder.ALL), //MTK
- };
-
- private static final AudioOutputBySOC[] sAudioOutputBySOCList = new AudioOutputBySOC[] {
- /* getPlaybackHeadPosition returns an invalid position on Fire OS,
- * thus Audiotrack is not usable */
- new AudioOutputBySOC("ro.product.brand", "Amazon", AudioOutput.OPENSLES),
- new AudioOutputBySOC("ro.product.manufacturer", "Amazon", AudioOutput.OPENSLES),
- };
-
- private static final HashMap<String, String> sSystemPropertyMap = new HashMap<String, String>();
-
- /**
- * @return the hardware decoder known to work for the running device
- * (Always return Dec.ALL after Android 4.3)
- */
- public static Decoder getDecoderFromDevice() {
- /*
- * Try first blacklisted decoders (for all android versions)
- */
- for (DecoderBySOC decBySOC : sBlacklistedDecoderBySOCList) {
- final String prop = getSystemPropertyCached(decBySOC.key);
- if (prop != null) {
- if (prop.contains(decBySOC.value))
- return decBySOC.dec;
- }
- }
- /*
- * Always try MediaCodec after JellyBean MR2,
- * Try OMX or MediaCodec after HoneyComb depending on device properties.
- * Otherwise, use software decoder by default.
- */
- if (AndroidUtil.isJellyBeanMR2OrLater)
- return Decoder.ALL;
- else {
- for (DecoderBySOC decBySOC : sDecoderBySOCList) {
- final String prop = getSystemPropertyCached(decBySOC.key);
- if (prop != null) {
- if (prop.contains(decBySOC.value))
- return decBySOC.dec;
- }
- }
- }
- return Decoder.UNKNOWN;
- }
-
- /**
- * @return the audio output known to work for the running device
- * (By default, returns ALL, i.e AudioTrack + OpenSles)
- */
- public static AudioOutput getAudioOutputFromDevice() {
- /* Accept all Audio API after Android P/28 */
- if (AndroidUtil.isPOrLater)
- return AudioOutput.ALL;
-
- for (AudioOutputBySOC aoutBySOC : sAudioOutputBySOCList) {
- final String prop = getSystemPropertyCached(aoutBySOC.key);
- if (prop != null) {
- if (prop.contains(aoutBySOC.value))
- return aoutBySOC.aout;
- }
- }
- return AudioOutput.ALL;
- }
-
- private static String getSystemPropertyCached(String key) {
- String prop = sSystemPropertyMap.get(key);
- if (prop == null) {
- prop = getSystemProperty(key, "none");
- sSystemPropertyMap.put(key, prop);
- }
- return prop;
- }
-
- private static String getSystemProperty(String key, String def) {
- try {
- final ClassLoader cl = ClassLoader.getSystemClassLoader();
- final Class<?> SystemProperties = cl.loadClass("android.os.SystemProperties");
- final Class<?>[] paramTypes = new Class[] { String.class, String.class };
- final Method get = SystemProperties.getMethod("get", paramTypes);
- final Object[] params = new Object[] { key, def };
- return (String) get.invoke(SystemProperties, params);
- } catch (Exception e){
- return def;
- }
- }
-}