mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-19 00:01:23 +00:00
Don't allow using non-Google codecs if we started the Java VM ourselves
Hardware codecs, e.g. the TI ones, only work in processes that had their Java VM started via the non-public AndroidRuntime class.
This commit is contained in:
parent
6feb6433d5
commit
f2c5afd031
1 changed files with 12 additions and 0 deletions
|
@ -45,6 +45,7 @@ static jint (*get_created_java_vms) (JavaVM ** vmBuf, jsize bufLen,
|
|||
jsize * nVMs);
|
||||
static jint (*create_java_vm) (JavaVM ** p_vm, JNIEnv ** p_env, void *vm_args);
|
||||
static JavaVM *java_vm;
|
||||
static gboolean start_java_vm = FALSE;
|
||||
|
||||
/* Global cached references */
|
||||
static struct
|
||||
|
@ -178,6 +179,8 @@ initialize_java_vm (void)
|
|||
if (create_java_vm (&java_vm, &env, &vm_args) < 0)
|
||||
goto create_failed;
|
||||
GST_DEBUG ("Successfully created Java VM %p", java_vm);
|
||||
|
||||
started_java_vm = TRUE;
|
||||
}
|
||||
|
||||
return java_vm != NULL;
|
||||
|
@ -1663,6 +1666,15 @@ scan_codecs (GstPlugin * plugin)
|
|||
valid_codec = FALSE;
|
||||
goto next_codec;
|
||||
}
|
||||
/* FIXME: Non-Google codecs usually just don't work and hang forever
|
||||
* or crash when not used from a process that started the Java
|
||||
* VM via the non-public AndroidRuntime class
|
||||
*/
|
||||
if (started_java_vm && !g_str_has_prefix (name_str, "OMX.google.")) {
|
||||
GST_INFO ("Skipping non-Google codec in standalone mode");
|
||||
valid_codec = FALSE;
|
||||
goto next_codec;
|
||||
}
|
||||
gst_codec_info->name = g_strdup (name_str);
|
||||
|
||||
is_encoder = (*env)->CallBooleanMethod (env, codec_info, is_encoder_id);
|
||||
|
|
Loading…
Reference in a new issue