VlcMigration: remove HWDecoderUtil for vlc 4

In vlc4 HWDecoderUtil log is moved in audio_output/android/device.c so
it is not needed anymore

See vlc#24982, vlc!5680, and !1948

application/resources/src/main/java/org/videolan/resources/VLCOptions.kt

@@ -32,12 +32,12 @@ import androidx.core.content.getSystemService
 import org.videolan.libvlc.MediaPlayer
 import org.videolan.libvlc.interfaces.IMedia
 import org.videolan.libvlc.util.AndroidUtil
-import org.videolan.libvlc.util.HWDecoderUtil
 import org.videolan.libvlc.util.VLCUtil
 import org.videolan.medialibrary.interfaces.media.MediaWrapper
 import org.videolan.tools.Preferences
 import org.videolan.tools.Settings
 import org.videolan.tools.putSingle
+import org.videolan.vlc.VlcMigrationHelper
 import org.videolan.vlc.isVLC4
 import java.io.File
 import java.util.*
@@ -204,8 +204,8 @@ object VLCOptions {
         } catch (ignored: NumberFormatException) {
         }
 
-        val hwaout = HWDecoderUtil.getAudioOutputFromDevice()
+        val hwaout = VlcMigrationHelper.getAudioOutputFromDevice()
-        if (hwaout == HWDecoderUtil.AudioOutput.OPENSLES)
+        if (hwaout == VlcMigrationHelper.AudioOutput.OPENSLES)
             aout = AOUT_OPENSLES
 
         return if (aout == AOUT_OPENSLES) "opensles" else if (aout == AOUT_AUDIOTRACK) "audiotrack" else null /* aaudio is the default */

application/television/src/main/java/org/videolan/television/ui/preferences/PreferencesAudio.kt

@@ -40,7 +40,6 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
 import org.videolan.libvlc.util.AndroidUtil
-import org.videolan.libvlc.util.HWDecoderUtil
 import org.videolan.resources.VLCInstance
 import org.videolan.tools.AUDIO_DUCKING
 import org.videolan.tools.KEY_PLAYBACK_RATE
@@ -51,6 +50,7 @@ import org.videolan.tools.Settings
 import org.videolan.tools.putSingle
 import org.videolan.vlc.BuildConfig
 import org.videolan.vlc.R
+import org.videolan.vlc.VlcMigrationHelper
 import org.videolan.vlc.gui.browser.EXTRA_MRL
 import org.videolan.vlc.gui.browser.FilePickerActivity
 import org.videolan.vlc.gui.browser.KEY_PICKER_TYPE
@@ -92,8 +92,8 @@ class PreferencesAudio : BasePreferenceFragment(), SharedPreferences.OnSharedPre
         findPreference<Preference>(RESUME_PLAYBACK)?.isVisible = false
         findPreference<Preference>(AUDIO_DUCKING)?.isVisible = !AndroidUtil.isOOrLater
 
-        val aout = HWDecoderUtil.getAudioOutputFromDevice()
+        val aout = VlcMigrationHelper.getAudioOutputFromDevice()
-        if (aout != HWDecoderUtil.AudioOutput.ALL) {
+        if (aout != VlcMigrationHelper.AudioOutput.ALL) {
             /* no AudioOutput choice */
             aoutPref?.isVisible = false
         }

application/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesAudio.kt

@@ -39,7 +39,6 @@ import androidx.preference.Preference
 import androidx.preference.TwoStatePreference
 import kotlinx.coroutines.launch
 import org.videolan.libvlc.util.AndroidUtil
-import org.videolan.libvlc.util.HWDecoderUtil
 import org.videolan.resources.AndroidDevices
 import org.videolan.resources.VLCInstance
 import org.videolan.tools.AUDIO_DUCKING
@@ -51,6 +50,7 @@ import org.videolan.tools.Settings
 import org.videolan.tools.putSingle
 import org.videolan.vlc.BuildConfig
 import org.videolan.vlc.R
+import org.videolan.vlc.VlcMigrationHelper
 import org.videolan.vlc.gui.browser.EXTRA_MRL
 import org.videolan.vlc.gui.browser.FilePickerActivity
 import org.videolan.vlc.gui.browser.KEY_PICKER_TYPE
@@ -80,8 +80,8 @@ class PreferencesAudio : BasePreferenceFragment(), SharedPreferences.OnSharedPre
         findPreference<Preference>(AUDIO_DUCKING)?.isVisible = !AndroidUtil.isOOrLater
         findPreference<Preference>(RESUME_PLAYBACK)?.isVisible = AndroidDevices.isPhone
         val aoutPref = findPreference<ListPreference>("aout")
-        val aout = HWDecoderUtil.getAudioOutputFromDevice()
+        val aout = VlcMigrationHelper.getAudioOutputFromDevice()
-        if (aout != HWDecoderUtil.AudioOutput.ALL) {
+        if (aout != VlcMigrationHelper.AudioOutput.ALL) {
             /* no AudioOutput choice */
             aoutPref?.isVisible = false
         }

medialibrary/vlc3/src/org/videolan/vlc/VlcMigrationHelper.java

@@ -29,6 +29,7 @@ import static org.videolan.libvlc.util.AndroidUtil.isMarshMallowOrLater;
 import android.os.Build;
 
 import org.videolan.libvlc.interfaces.IMedia;
+import org.videolan.libvlc.util.HWDecoderUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -45,4 +46,17 @@ public class VlcMigrationHelper {
     public static final boolean isLolliPopOrLater = isMarshMallowOrLater || android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;
     public static final boolean isKitKatOrLater = isLolliPopOrLater || android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
     public static final boolean isJellyBeanMR2OrLater = isKitKatOrLater || android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2;
+
+    public enum AudioOutput {
+        OPENSLES, AUDIOTRACK, ALL
+    }
+
+    public static AudioOutput getAudioOutputFromDevice() {
+        HWDecoderUtil.AudioOutput aout = HWDecoderUtil.getAudioOutputFromDevice();
+        if (aout == HWDecoderUtil.AudioOutput.OPENSLES)
+            return AudioOutput.OPENSLES;
+        else if (aout == HWDecoderUtil.AudioOutput.AUDIOTRACK)
+            return AudioOutput.AUDIOTRACK;
+        return AudioOutput.ALL;
+    }
 }

medialibrary/vlc4/src/org/videolan/vlc/VlcMigrationHelper.java

@@ -42,4 +42,12 @@ public class VlcMigrationHelper {
     public static final boolean isLolliPopOrLater = true;
     public static final boolean isKitKatOrLater = true;
     public static final boolean isJellyBeanMR2OrLater = true;
+
+    public enum AudioOutput {
+        OPENSLES, AUDIOTRACK, ALL
+    }
+
+    public static AudioOutput getAudioOutputFromDevice() {
+        return AudioOutput.ALL;
+    }
 }