virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/mediacodec_wrapper: use MediaCodecInfo.isSoftwareOnly() when available

Browse Source 
Added in Android 10 it provides a reliable way of filtering out
software decoders, unlike existing string-based checks.
This commit is contained in:
sfan5 2021-02-17 16:51:09 +01:00 committed by Matthieu Bouron
parent 1a033008e8
commit a7425f712a
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/mediacodec_wrapper.c
View File

@ -45,6 +45,7 @@ struct JNIAMediaCodecListFields {
jmethodID get_codec_capabilities_id; jmethodID get_codec_capabilities_id;
jmethodID get_supported_types_id; jmethodID get_supported_types_id;
jmethodID is_encoder_id; jmethodID is_encoder_id;
jmethodID is_software_only_id;
jclass codec_capabilities_class; jclass codec_capabilities_class;
jfieldID color_formats_id; jfieldID color_formats_id;
@ -81,6 +82,7 @@ static const struct FFJniField jni_amediacodeclist_mapping[] = {
{ "android/media/MediaCodecInfo", "getCapabilitiesForType", "(Ljava/lang/String;)Landroid/media/MediaCodecInfo$CodecCapabilities;", FF_JNI_METHOD, offsetof(struct JNIAMediaCodecListFields, get_codec_capabilities_id), 1 }, { "android/media/MediaCodecInfo", "getCapabilitiesForType", "(Ljava/lang/String;)Landroid/media/MediaCodecInfo$CodecCapabilities;", FF_JNI_METHOD, offsetof(struct JNIAMediaCodecListFields, get_codec_capabilities_id), 1 },
{ "android/media/MediaCodecInfo", "getSupportedTypes", "()[Ljava/lang/String;", FF_JNI_METHOD, offsetof(struct JNIAMediaCodecListFields, get_supported_types_id), 1 }, { "android/media/MediaCodecInfo", "getSupportedTypes", "()[Ljava/lang/String;", FF_JNI_METHOD, offsetof(struct JNIAMediaCodecListFields, get_supported_types_id), 1 },
{ "android/media/MediaCodecInfo", "isEncoder", "()Z", FF_JNI_METHOD, offsetof(struct JNIAMediaCodecListFields, is_encoder_id), 1 }, { "android/media/MediaCodecInfo", "isEncoder", "()Z", FF_JNI_METHOD, offsetof(struct JNIAMediaCodecListFields, is_encoder_id), 1 },
{ "android/media/MediaCodecInfo", "isSoftwareOnly", "()Z", FF_JNI_METHOD, offsetof(struct JNIAMediaCodecListFields, is_software_only_id), 0 },
{ "android/media/MediaCodecInfo$CodecCapabilities", NULL, NULL, FF_JNI_CLASS, offsetof(struct JNIAMediaCodecListFields, codec_capabilities_class), 1 }, { "android/media/MediaCodecInfo$CodecCapabilities", NULL, NULL, FF_JNI_CLASS, offsetof(struct JNIAMediaCodecListFields, codec_capabilities_class), 1 },
{ "android/media/MediaCodecInfo$CodecCapabilities", "colorFormats", "[I", FF_JNI_FIELD, offsetof(struct JNIAMediaCodecListFields, color_formats_id), 1 }, { "android/media/MediaCodecInfo$CodecCapabilities", "colorFormats", "[I", FF_JNI_FIELD, offsetof(struct JNIAMediaCodecListFields, color_formats_id), 1 },
@ -441,6 +443,17 @@ char *ff_AMediaCodecList_getCodecNameByType(const char *mime, int profile, int e
goto done_with_info; goto done_with_info;
} }
if (jfields.is_software_only_id) {
int is_software_only = (*env)->CallBooleanMethod(env, info, jfields.is_software_only_id);
if (ff_jni_exception_check(env, 1, log_ctx) < 0) {
goto done;
}
if (is_software_only) {
goto done_with_info;
}
}
codec_name = (*env)->CallObjectMethod(env, info, jfields.get_name_id); codec_name = (*env)->CallObjectMethod(env, info, jfields.get_name_id);
if (ff_jni_exception_check(env, 1, log_ctx) < 0) { if (ff_jni_exception_check(env, 1, log_ctx) < 0) {
goto done; goto done;