Commit f2084b75 authored by Martin Storsjö's avatar Martin Storsjö

Disable the iomx module by default, unless explicitly enabled

The omxil/iomx modules have higher priority than avcodec now
(since b79c09c on the main vlc repository), so instead of
explicitly asking for iomx when enabled, specify --codec
avcodec,all when it shouldn't be active.

If the omxil/iomx modules support other codecs that also are
provided by some other sw decoder than avcodec, those sw decoders
should also be listed here.
parent 6e864603
......@@ -197,11 +197,14 @@ void Java_org_videolan_vlc_android_LibVLC_nativeInit(JNIEnv *env, jobject thiz,
* On Nexus S, the decoder latency seems to be about 7 packets.
*/
const char *argv[] = {"-I", "dummy", "-vvv", "--no-plugins-cache",
"--no-drop-late-frames", "--codec", "iomx,all",
"--file-caching", "1500", "--network-caching", "1500" };
"--no-drop-late-frames", "--file-caching", "1500",
"--network-caching", "1500" };
size_t argc = sizeof(argv) / sizeof(*argv);
if (!enable_iomx)
argc -= 6; // Drop the --codec option and the iomx specific caching values
if (!enable_iomx) {
argc -= 4; // Drop the iomx specific caching values
argv[argc++] = "--codec";
argv[argc++] = "avcodec,all";
}
libvlc_instance_t *instance = libvlc_new(argc, argv);
......
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