From 0fe0270244caace958512adf23cfc3a0b9edd812 Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xavier.claessens@collabora.com>
Date: Tue, 13 Nov 2018 13:16:34 -0500
Subject: [PATCH] amc: Remove gst_amc_format_contains_key()

It is not needed, we can just try to get the key and ignore error.
NdkMediaFormat doesn't have that method.
---
 sys/androidmedia/gstamc-format.h         |  2 --
 sys/androidmedia/gstamcaudiodec.c        |  5 ++-
 sys/androidmedia/jni/gstamc-format-jni.c | 41 +++---------------------
 3 files changed, 6 insertions(+), 42 deletions(-)

diff --git a/sys/androidmedia/gstamc-format.h b/sys/androidmedia/gstamc-format.h
index da0cf260c4..b78d161578 100644
--- a/sys/androidmedia/gstamc-format.h
+++ b/sys/androidmedia/gstamc-format.h
@@ -36,8 +36,6 @@ void gst_amc_format_free (GstAmcFormat * format);
 
 gchar * gst_amc_format_to_string (GstAmcFormat * format, GError **err);
 
-gboolean gst_amc_format_contains_key (GstAmcFormat *format, const gchar *key, GError **err);
-
 gboolean gst_amc_format_get_float (GstAmcFormat *format, const gchar *key, gfloat *value, GError **err);
 gboolean gst_amc_format_set_float (GstAmcFormat *format, const gchar *key, gfloat value, GError **err);
 gboolean gst_amc_format_get_int (GstAmcFormat *format, const gchar *key, gint *value, GError **err);
diff --git a/sys/androidmedia/gstamcaudiodec.c b/sys/androidmedia/gstamcaudiodec.c
index 8e0571063f..c4a6458132 100644
--- a/sys/androidmedia/gstamcaudiodec.c
+++ b/sys/androidmedia/gstamcaudiodec.c
@@ -379,9 +379,8 @@ gst_amc_audio_dec_set_src_caps (GstAmcAudioDec * self, GstAmcFormat * format)
   }
 
   /* Not always present */
-  if (gst_amc_format_contains_key (format, "channel-mask", NULL))
-    gst_amc_format_get_int (format, "channel-mask", (gint *) & channel_mask,
-        NULL);
+  gst_amc_format_get_int (format, "channel-mask", (gint *) & channel_mask,
+      NULL);
 
   gst_amc_audio_channel_mask_to_positions (channel_mask, channels,
       self->positions);
diff --git a/sys/androidmedia/jni/gstamc-format-jni.c b/sys/androidmedia/jni/gstamc-format-jni.c
index 8d370568d0..63bea1cecf 100644
--- a/sys/androidmedia/jni/gstamc-format-jni.c
+++ b/sys/androidmedia/jni/gstamc-format-jni.c
@@ -33,7 +33,6 @@ static struct
   jmethodID create_audio_format;
   jmethodID create_video_format;
   jmethodID to_string;
-  jmethodID contains_key;
   jmethodID get_float;
   jmethodID set_float;
   jmethodID get_integer;
@@ -85,9 +84,6 @@ gst_amc_format_static_init (void)
   media_format.to_string =
       (*env)->GetMethodID (env, media_format.klass, "toString",
       "()Ljava/lang/String;");
-  media_format.contains_key =
-      (*env)->GetMethodID (env, media_format.klass, "containsKey",
-      "(Ljava/lang/String;)Z");
   media_format.get_float =
       (*env)->GetMethodID (env, media_format.klass, "getFloat",
       "(Ljava/lang/String;)F");
@@ -113,11 +109,10 @@ gst_amc_format_static_init (void)
       (*env)->GetMethodID (env, media_format.klass, "setByteBuffer",
       "(Ljava/lang/String;Ljava/nio/ByteBuffer;)V");
   if (!media_format.create_audio_format || !media_format.create_video_format
-      || !media_format.contains_key || !media_format.get_float
-      || !media_format.set_float || !media_format.get_integer
-      || !media_format.set_integer || !media_format.get_string
-      || !media_format.set_string || !media_format.get_byte_buffer
-      || !media_format.set_byte_buffer) {
+      || !media_format.get_float || !media_format.set_float
+      || !media_format.get_integer || !media_format.set_integer
+      || !media_format.get_string || !media_format.set_string
+      || !media_format.get_byte_buffer || !media_format.set_byte_buffer) {
     ret = FALSE;
     GST_ERROR ("Failed to get format methods");
     if ((*env)->ExceptionCheck (env)) {
@@ -242,34 +237,6 @@ done:
   return ret;
 }
 
-gboolean
-gst_amc_format_contains_key (GstAmcFormat * format, const gchar * key,
-    GError ** err)
-{
-  JNIEnv *env;
-  gboolean ret = FALSE;
-  jstring key_str = NULL;
-
-  g_return_val_if_fail (format != NULL, FALSE);
-  g_return_val_if_fail (key != NULL, FALSE);
-
-  env = gst_amc_jni_get_env ();
-
-  key_str = gst_amc_jni_string_from_gchar (env, err, FALSE, key);
-  if (!key_str)
-    goto done;
-
-  if (!gst_amc_jni_call_boolean_method (env, err, format->object,
-          media_format.contains_key, &ret, key_str))
-    goto done;
-
-done:
-  if (key_str)
-    gst_amc_jni_object_local_unref (env, key_str);
-
-  return ret;
-}
-
 gboolean
 gst_amc_format_get_float (GstAmcFormat * format, const gchar * key,
     gfloat * value, GError ** err)