From 742816df695382f69c385817d709a6b9d15292ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Tue, 18 Sep 2012 15:28:31 +0200
Subject: [PATCH] Remove some obsolete FIXMEs

---
 sys/androidmedia/gstamc.c         |  7 +++----
 sys/androidmedia/gstamcaudiodec.c | 11 +----------
 sys/androidmedia/gstamcvideodec.c | 11 +----------
 3 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/sys/androidmedia/gstamc.c b/sys/androidmedia/gstamc.c
index f7fb6d3af2..39c2ad51e3 100644
--- a/sys/androidmedia/gstamc.c
+++ b/sys/androidmedia/gstamc.c
@@ -181,9 +181,7 @@ initialize_java_vm (void)
     options[2].optionString = "-Xcheck:jni";
     options[3].optionString = "-Xdebug";
 
-    /* FIXME: Do we need any options here? Like exit()
-     * handler, or classpaths? */
-    vm_args.version = JNI_VERSION_1_6;
+    vm_args.version = JNI_VERSION_1_4;
     vm_args.options = options;
     vm_args.nOptions = 4;
     vm_args.ignoreUnrecognized = JNI_TRUE;
@@ -1679,7 +1677,8 @@ scan_codecs (GstPlugin * plugin)
     }
     /* 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
+     * VM via the non-public AndroidRuntime class. Can we somehow
+     * initialize all this?
      */
     if (started_java_vm && !g_str_has_prefix (name_str, "OMX.google.")) {
       GST_INFO ("Skipping non-Google codec in standalone mode");
diff --git a/sys/androidmedia/gstamcaudiodec.c b/sys/androidmedia/gstamcaudiodec.c
index 0b49935bcd..8864cc81a5 100644
--- a/sys/androidmedia/gstamcaudiodec.c
+++ b/sys/androidmedia/gstamcaudiodec.c
@@ -339,16 +339,8 @@ gst_amc_audio_dec_close (GstAudioDecoder * decoder)
 
   GST_DEBUG_OBJECT (self, "Closing decoder");
 
-  if (self->codec) {
-    /* FIXME: This crashes for some reason, looks like the
-     * MediaCodec API is not threadsafe between stop() and
-     * release()
-     */
-#if 0
-    gst_amc_codec_release (self->codec);
-#endif
+  if (self->codec)
     gst_amc_codec_free (self->codec);
-  }
   self->codec = NULL;
 
   self->started = FALSE;
@@ -880,7 +872,6 @@ gst_amc_audio_dec_set_format (GstAudioDecoder * decoder, GstCaps * caps)
   GST_DEBUG_OBJECT (self, "Configuring codec with format: %s", format_string);
   g_free (format_string);
 
-  /* FIXME: Flags? */
   if (!gst_amc_codec_configure (self->codec, format, 0)) {
     GST_ERROR_OBJECT (self, "Failed to configure codec");
     return FALSE;
diff --git a/sys/androidmedia/gstamcvideodec.c b/sys/androidmedia/gstamcvideodec.c
index 1185fce05b..28a302fb72 100644
--- a/sys/androidmedia/gstamcvideodec.c
+++ b/sys/androidmedia/gstamcvideodec.c
@@ -450,16 +450,8 @@ gst_amc_video_dec_close (GstVideoDecoder * decoder)
 
   GST_DEBUG_OBJECT (self, "Closing decoder");
 
-  if (self->codec) {
-    /* FIXME: This crashes for some reason, looks like the
-     * MediaCodec API is not threadsafe between stop() and
-     * release()
-     */
-#if 0
-    gst_amc_codec_release (self->codec);
-#endif
+  if (self->codec)
     gst_amc_codec_free (self->codec);
-  }
   self->codec = NULL;
 
   self->started = FALSE;
@@ -1240,7 +1232,6 @@ gst_amc_video_dec_set_format (GstVideoDecoder * decoder,
   GST_DEBUG_OBJECT (self, "Configuring codec with format: %s", format_string);
   g_free (format_string);
 
-  /* FIXME: Flags? */
   if (!gst_amc_codec_configure (self->codec, format, 0)) {
     GST_ERROR_OBJECT (self, "Failed to configure codec");
     return FALSE;