Skip to content

Display and control your Android device

Detect codec/encoder mismatch

Romain Vimont0cc6f6aa09f0
diff --git a/server/src/main/java/com/genymobile/scrcpy/audio/AudioEncoder.java b/server/src/main/java/com/genymobile/scrcpy/audio/AudioEncoder.java
index 672403b8..f462431a 100644
--- a/server/src/main/java/com/genymobile/scrcpy/audio/AudioEncoder.java
+++ b/server/src/main/java/com/genymobile/scrcpy/audio/AudioEncoder.java
@@ -287,7 +287,13 @@ public final class AudioEncoder implements AsyncProcessor {
if (encoderName != null) {
Ln.d("Creating audio encoder by name: '" + encoderName + "'");
try {
- return MediaCodec.createByCodecName(encoderName);
+ MediaCodec mediaCodec = MediaCodec.createByCodecName(encoderName);
+ String mimeType = Codec.getMimeType(mediaCodec);
+ if (!codec.getMimeType().equals(mimeType)) {
+ Ln.e("Audio encoder type for \"" + encoderName + "\" (" + mimeType + ") does not match codec type (" + codec.getMimeType() + ")");
+ throw new ConfigurationException("Incorrect encoder type: " + encoderName);
+ }
+ return mediaCodec;
} catch (IllegalArgumentException e) {
Ln.e("Audio encoder '" + encoderName + "' for " + codec.getName() + " not found\n" + LogUtils.buildAudioEncoderListMessage());
throw new ConfigurationException("Unknown encoder: " + encoderName);
diff --git a/server/src/main/java/com/genymobile/scrcpy/util/Codec.java b/server/src/main/java/com/genymobile/scrcpy/util/Codec.java
index a363bd8b..b350409b 100644
--- a/server/src/main/java/com/genymobile/scrcpy/util/Codec.java
+++ b/server/src/main/java/com/genymobile/scrcpy/util/Codec.java
@@ -1,5 +1,7 @@
package com.genymobile.scrcpy.util;
+import android.media.MediaCodec;
+
public interface Codec {
enum Type {
@@ -14,4 +16,9 @@ public interface Codec {
String getName();
String getMimeType();
+
+ static String getMimeType(MediaCodec codec) {
+ String[] types = codec.getCodecInfo().getSupportedTypes();
+ return types.length > 0 ? types[0] : null;
+ }
}
diff --git a/server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.java b/server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.java
index 7800e4bb..41c38642 100644
--- a/server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.java
@@ -205,7 +205,13 @@ public class SurfaceEncoder implements AsyncProcessor {
if (encoderName != null) {
Ln.d("Creating encoder by name: '" + encoderName + "'");
try {
- return MediaCodec.createByCodecName(encoderName);
+ MediaCodec mediaCodec = MediaCodec.createByCodecName(encoderName);
+ String mimeType = Codec.getMimeType(mediaCodec);
+ if (!codec.getMimeType().equals(mimeType)) {
+ Ln.e("Video encoder type for \"" + encoderName + "\" (" + mimeType + ") does not match codec type (" + codec.getMimeType() + ")");
+ throw new ConfigurationException("Incorrect encoder type: " + encoderName);
+ }
+ return mediaCodec;
} catch (IllegalArgumentException e) {
Ln.e("Video encoder '" + encoderName + "' for " + codec.getName() + " not found\n" + LogUtils.buildVideoEncoderListMessage());
throw new ConfigurationException("Unknown encoder: " + encoderName);