Commit 2ac31462 authored by Thomas Guillem's avatar Thomas Guillem

mediacodec: check if codec is blacklisted first

Because getCapabilitiesForType can crash.
parent cf1631d2
...@@ -455,6 +455,14 @@ static int OpenDecoder(vlc_object_t *p_this) ...@@ -455,6 +455,14 @@ static int OpenDecoder(vlc_object_t *p_this)
info = (*env)->CallStaticObjectMethod(env, jfields.media_codec_list_class, info = (*env)->CallStaticObjectMethod(env, jfields.media_codec_list_class,
jfields.get_codec_info_at, i); jfields.get_codec_info_at, i);
name = (*env)->CallObjectMethod(env, info, jfields.get_name);
name_len = (*env)->GetStringUTFLength(env, name);
name_ptr = (*env)->GetStringUTFChars(env, name, NULL);
if (OMXCodec_IsBlacklisted( name_ptr, name_len))
goto loopclean;
if ((*env)->CallBooleanMethod(env, info, jfields.is_encoder)) if ((*env)->CallBooleanMethod(env, info, jfields.is_encoder))
goto loopclean; goto loopclean;
...@@ -472,13 +480,8 @@ static int OpenDecoder(vlc_object_t *p_this) ...@@ -472,13 +480,8 @@ static int OpenDecoder(vlc_object_t *p_this)
types = (*env)->CallObjectMethod(env, info, jfields.get_supported_types); types = (*env)->CallObjectMethod(env, info, jfields.get_supported_types);
num_types = (*env)->GetArrayLength(env, types); num_types = (*env)->GetArrayLength(env, types);
name = (*env)->CallObjectMethod(env, info, jfields.get_name);
name_len = (*env)->GetStringUTFLength(env, name);
name_ptr = (*env)->GetStringUTFChars(env, name, NULL);
found = false; found = false;
if (OMXCodec_IsBlacklisted( name_ptr, name_len))
goto loopclean;
for (int j = 0; j < num_types && !found; j++) { for (int j = 0; j < num_types && !found; j++) {
jobject type = (*env)->GetObjectArrayElement(env, types, j); jobject type = (*env)->GetObjectArrayElement(env, types, j);
if (!jstrcmp(env, type, mime)) { if (!jstrcmp(env, type, mime)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment