Merge pull request #60 from anilibria/fix/TR-266-harware-codecs

[TR-266] fix: hardware codec on mtk
anilibria · Oct 21, 2022 · 7565d03 · 7565d03
2 parents 94f5843 + 9471886
commit 7565d03
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/shared-app/src/main/java/ru/radiationx/shared_app/codecs/MediaCodecsFinder.kt b/shared-app/src/main/java/ru/radiationx/shared_app/codecs/MediaCodecsFinder.kt
@@ -7,7 +7,10 @@ import ru.radiationx.shared_app.codecs.types.KnownCodec
 object MediaCodecsFinder {
 
     private val nameRegex by lazy {
-        Regex("(?:\\w+\\.\\w+\\.([\\w\\.]+?)\\.(?:decoder|encoder)(?:\\.(\\w+))?)")
+        Regex(
+            "(?:\\w+\\.\\w+\\.([\\w\\.]+?)\\.(?:decoder|encoder)(?:\\.(\\w+))?)",
+            RegexOption.IGNORE_CASE
+        )
     }
 
     private val typeRegex by lazy {

diff --git a/shared-app/src/main/java/ru/radiationx/shared_app/codecs/MediaCodecsProvider.kt b/shared-app/src/main/java/ru/radiationx/shared_app/codecs/MediaCodecsProvider.kt
@@ -2,10 +2,8 @@ package ru.radiationx.shared_app.codecs
 
 import android.media.MediaCodecInfo
 import android.media.MediaCodecList
-import ru.radiationx.shared_app.codecs.types.Codec
-import ru.radiationx.shared_app.codecs.types.CodecOutputType
-import ru.radiationx.shared_app.codecs.types.CodecProcessingType
-import ru.radiationx.shared_app.codecs.types.CodecType
+import android.os.Build
+import ru.radiationx.shared_app.codecs.types.*
 
 object MediaCodecsProvider {
 
@@ -18,7 +16,12 @@ object MediaCodecsProvider {
                 firstMimeType.startsWith("video") -> CodecOutputType.VIDEO
                 else -> CodecOutputType.UNKNOWN
             }
-            val processingType = if (isSoftwareCodec(it.name)) {
+            val isSoftwareCodec = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                !it.isHardwareAccelerated
+            } else {
+                isSoftwareCodec(it.name)
+            }
+            val processingType = if (isSoftwareCodec) {
                 CodecProcessingType.SOFTWARE
             } else {
                 CodecProcessingType.HARDWARE
@@ -40,9 +43,6 @@ object MediaCodecsProvider {
     }
 
     private fun isSoftwareCodec(name: String): Boolean {
-        return name.startsWith("OMX.google.")
-                || name.startsWith("c2.android.")
-                || (!name.startsWith("OMX.")
-                && !name.startsWith("c2."))
+        return name.startsWith("OMX.google.") || name.startsWith("c2.android.")
     }
 }