mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-03-30 12:49:40 +00:00
androidmedia: Remove g_return_if_fails()
This is not public API so it has no advantage to have them here.
This commit is contained in:
Sebastian Dröge
Nicolas Dufresne
parent
3ac90867ac
commit
ea43e42ca5
2 changed files with 0 additions and 83 deletions
|
|
@ -147,9 +147,6 @@ gst_am_mediacodec_configure (GstAmMediaCodec * self, GstAmMediaFormat * format,
|
|||
{
|
||||
JNIEnv *env = gst_dvm_get_env ();
|
||||
|
||||
g_return_val_if_fail (self != NULL, FALSE);
|
||||
g_return_val_if_fail (format != NULL, FALSE);
|
||||
|
||||
AMMC_CALL (return FALSE, Void, configure, format->object, NULL, NULL, flags);
|
||||
|
||||
return TRUE;
|
||||
|
|
@ -163,8 +160,6 @@ gst_am_mediacodec_create_by_codec_name (const gchar * name)
|
|||
jobject object = NULL;
|
||||
jstring name_str;
|
||||
|
||||
g_return_val_if_fail (name != NULL, NULL);
|
||||
|
||||
name_str = (*env)->NewStringUTF (env, name);
|
||||
if (name_str == NULL)
|
||||
goto done;
|
||||
|
|
@ -197,8 +192,6 @@ gst_am_mediacodec_get_output_format (GstAmMediaCodec * self)
|
|||
GstAmMediaFormat *format = NULL;
|
||||
jobject object = NULL;
|
||||
|
||||
g_return_val_if_fail (self != NULL, NULL);
|
||||
|
||||
object = AMMC_CALL (return NULL, Object, getOutputFormat);
|
||||
if (object) {
|
||||
format = g_slice_new0 (GstAmMediaFormat);
|
||||
|
|
@ -220,8 +213,6 @@ gst_am_mediacodec_start (GstAmMediaCodec * self)
|
|||
{
|
||||
JNIEnv *env = gst_dvm_get_env ();
|
||||
|
||||
g_return_val_if_fail (self != NULL, FALSE);
|
||||
|
||||
AMMC_CALL (return FALSE, Void, start);
|
||||
|
||||
return TRUE;
|
||||
|
|
@ -232,8 +223,6 @@ gst_am_mediacodec_stop (GstAmMediaCodec * self)
|
|||
{
|
||||
JNIEnv *env = gst_dvm_get_env ();
|
||||
|
||||
g_return_val_if_fail (self != NULL, FALSE);
|
||||
|
||||
AMMC_CALL (return FALSE, Void, stop);
|
||||
|
||||
return TRUE;
|
||||
|
|
@ -244,8 +233,6 @@ gst_am_mediacodec_flush (GstAmMediaCodec * self)
|
|||
{
|
||||
JNIEnv *env = gst_dvm_get_env ();
|
||||
|
||||
g_return_val_if_fail (self != NULL, FALSE);
|
||||
|
||||
AMMC_CALL (return FALSE, Void, flush);
|
||||
|
||||
return TRUE;
|
||||
|
|
@ -256,8 +243,6 @@ gst_am_mediacodec_release (GstAmMediaCodec * self)
|
|||
{
|
||||
JNIEnv *env = gst_dvm_get_env ();
|
||||
|
||||
g_return_if_fail (self != NULL);
|
||||
|
||||
AMMC_CALL (, Void, release);
|
||||
|
||||
(*env)->DeleteGlobalRef (env, self->object);
|
||||
|
|
@ -270,8 +255,6 @@ gst_am_mediacodec_free_buffers (GstAmcBuffer * buffers, gsize n_buffers)
|
|||
JNIEnv *env = gst_dvm_get_env ();
|
||||
jsize i;
|
||||
|
||||
g_return_if_fail (buffers != NULL);
|
||||
|
||||
for (i = 0; i < n_buffers; i++) {
|
||||
if (buffers[i].object)
|
||||
(*env)->DeleteGlobalRef (env, buffers[i].object);
|
||||
|
|
@ -288,9 +271,6 @@ gst_am_mediacodec_get_output_buffers (GstAmMediaCodec * self, gsize * n_buffers)
|
|||
GstAmcBuffer *ret = NULL;
|
||||
jsize i;
|
||||
|
||||
g_return_val_if_fail (self != NULL, NULL);
|
||||
g_return_val_if_fail (n_buffers != NULL, NULL);
|
||||
|
||||
*n_buffers = 0;
|
||||
output_buffers = AMMC_CALL (goto done, Object, getOutputBuffers);
|
||||
if (!output_buffers)
|
||||
|
|
@ -356,9 +336,6 @@ gst_am_mediacodec_get_input_buffers (GstAmMediaCodec * self, gsize * n_buffers)
|
|||
GstAmcBuffer *ret = NULL;
|
||||
jsize i;
|
||||
|
||||
g_return_val_if_fail (self != NULL, NULL);
|
||||
g_return_val_if_fail (n_buffers != NULL, NULL);
|
||||
|
||||
*n_buffers = 0;
|
||||
|
||||
input_buffers = AMMC_CALL (goto done, Object, getOutputBuffers);
|
||||
|
|
@ -423,8 +400,6 @@ gst_am_mediacodec_dequeue_input_buffer (GstAmMediaCodec * self,
|
|||
JNIEnv *env = gst_dvm_get_env ();
|
||||
gint ret = G_MININT;
|
||||
|
||||
g_return_val_if_fail (self != NULL, G_MININT);
|
||||
|
||||
ret = AMMC_CALL (return G_MININT, Int, dequeueInputBuffer, timeoutUs);
|
||||
|
||||
return ret;
|
||||
|
|
@ -433,8 +408,6 @@ gst_am_mediacodec_dequeue_input_buffer (GstAmMediaCodec * self,
|
|||
static gboolean
|
||||
_fill_buffer_info (JNIEnv * env, jobject buffer_info, GstAmmcBufferInfo * info)
|
||||
{
|
||||
g_return_val_if_fail (buffer_info != NULL, FALSE);
|
||||
|
||||
info->flags = (*env)->GetIntField (env, buffer_info,
|
||||
android_media_mediacodec_bufferinfo.flags);
|
||||
if ((*env)->ExceptionCheck (env)) {
|
||||
|
|
@ -478,8 +451,6 @@ gst_am_mediacodec_dequeue_output_buffer (GstAmMediaCodec * self,
|
|||
gint ret = G_MININT;
|
||||
jobject info_o = NULL;
|
||||
|
||||
g_return_val_if_fail (self != NULL, G_MININT);
|
||||
|
||||
info_o = (*env)->NewObject (env, android_media_mediacodec_bufferinfo.klass,
|
||||
android_media_mediacodec_bufferinfo.constructor);
|
||||
if (!info_o) {
|
||||
|
|
@ -511,9 +482,6 @@ gst_am_mediacodec_queue_input_buffer (GstAmMediaCodec * self, gint index,
|
|||
{
|
||||
JNIEnv *env = gst_dvm_get_env ();
|
||||
|
||||
g_return_val_if_fail (self != NULL, FALSE);
|
||||
g_return_val_if_fail (info != NULL, FALSE);
|
||||
|
||||
AMMC_CALL (return FALSE, Void, queueInputBuffer, index, info->offset,
|
||||
info->size, info->presentation_time_us, info->flags);
|
||||
|
||||
|
|
@ -525,8 +493,6 @@ gst_am_mediacodec_release_output_buffer (GstAmMediaCodec * self, gint index)
|
|||
{
|
||||
JNIEnv *env = gst_dvm_get_env ();
|
||||
|
||||
g_return_val_if_fail (self != NULL, FALSE);
|
||||
|
||||
AMMC_CALL (return FALSE, Void, releaseOutputBuffer, index, JNI_FALSE);
|
||||
|
||||
return TRUE;
|
||||
|
|
|
|||
|
|
@ -154,8 +154,6 @@ gst_am_mediaformat_create_audio_format (const gchar * mime,
|
|||
jstring mime_str;
|
||||
jobject object = NULL;
|
||||
|
||||
g_return_val_if_fail (mime != NULL, NULL);
|
||||
|
||||
mime_str = (*env)->NewStringUTF (env, mime);
|
||||
if (mime_str == NULL)
|
||||
goto done;
|
||||
|
|
@ -190,8 +188,6 @@ gst_am_mediaformat_create_video_format (const gchar * mime,
|
|||
jstring mime_str;
|
||||
jobject object = NULL;
|
||||
|
||||
g_return_val_if_fail (mime != NULL, NULL);
|
||||
|
||||
mime_str = (*env)->NewStringUTF (env, mime);
|
||||
if (mime_str == NULL)
|
||||
goto done;
|
||||
|
|
@ -222,8 +218,6 @@ gst_am_mediaformat_free (GstAmMediaFormat * self)
|
|||
{
|
||||
JNIEnv *env = gst_dvm_get_env ();
|
||||
|
||||
g_return_if_fail (self != NULL);
|
||||
|
||||
(*env)->DeleteGlobalRef (env, self->object);
|
||||
g_slice_free (GstAmMediaFormat, self);
|
||||
}
|
||||
|
|
@ -236,8 +230,6 @@ gst_am_mediaformat_to_string (GstAmMediaFormat * self)
|
|||
const gchar *v = NULL;
|
||||
gchar *ret = NULL;
|
||||
|
||||
g_return_val_if_fail (self != NULL, FALSE);
|
||||
|
||||
v_str = AMMF_CALL (return NULL, Object, toString);
|
||||
if (v_str) {
|
||||
v = (*env)->GetStringUTFChars (env, v_str, NULL);
|
||||
|
|
@ -265,9 +257,6 @@ gst_am_mediaformat_contains_key (GstAmMediaFormat * self, const gchar * key)
|
|||
gboolean ret = FALSE;
|
||||
jstring key_str = NULL;
|
||||
|
||||
g_return_val_if_fail (self != NULL, FALSE);
|
||||
g_return_val_if_fail (key != NULL, FALSE);
|
||||
|
||||
key_str = (*env)->NewStringUTF (env, key);
|
||||
if (!key_str)
|
||||
goto done;
|
||||
|
|
@ -289,10 +278,6 @@ gst_am_mediaformat_get_float (GstAmMediaFormat * self, const gchar * key,
|
|||
jstring key_str = NULL;
|
||||
gboolean ret = FALSE;
|
||||
|
||||
g_return_val_if_fail (self != NULL, FALSE);
|
||||
g_return_val_if_fail (key != NULL, FALSE);
|
||||
g_return_val_if_fail (value != NULL, FALSE);
|
||||
|
||||
*value = 0;
|
||||
|
||||
key_str = (*env)->NewStringUTF (env, key);
|
||||
|
|
@ -317,9 +302,6 @@ gst_am_mediaformat_set_float (GstAmMediaFormat * self, const gchar * key,
|
|||
jstring key_str = NULL;
|
||||
gboolean ret = FALSE;
|
||||
|
||||
g_return_val_if_fail (self != NULL, FALSE);
|
||||
g_return_val_if_fail (key != NULL, FALSE);
|
||||
|
||||
key_str = (*env)->NewStringUTF (env, key);
|
||||
if (!key_str)
|
||||
goto done;
|
||||
|
|
@ -342,10 +324,6 @@ gst_am_mediaformat_get_int (GstAmMediaFormat * self, const gchar * key,
|
|||
jstring key_str = NULL;
|
||||
gboolean ret = FALSE;
|
||||
|
||||
g_return_val_if_fail (self != NULL, FALSE);
|
||||
g_return_val_if_fail (key != NULL, FALSE);
|
||||
g_return_val_if_fail (value != NULL, FALSE);
|
||||
|
||||
*value = 0;
|
||||
|
||||
key_str = (*env)->NewStringUTF (env, key);
|
||||
|
|
@ -371,9 +349,6 @@ gst_am_mediaformat_set_int (GstAmMediaFormat * self, const gchar * key,
|
|||
jstring key_str = NULL;
|
||||
gboolean ret = FALSE;
|
||||
|
||||
g_return_val_if_fail (self != NULL, FALSE);
|
||||
g_return_val_if_fail (key != NULL, FALSE);
|
||||
|
||||
key_str = (*env)->NewStringUTF (env, key);
|
||||
if (!key_str)
|
||||
goto done;
|
||||
|
|
@ -397,10 +372,6 @@ gst_am_mediaformat_get_long (GstAmMediaFormat * self, const gchar * key,
|
|||
gboolean ret = FALSE;
|
||||
jlong long_value;
|
||||
|
||||
g_return_val_if_fail (self != NULL, FALSE);
|
||||
g_return_val_if_fail (key != NULL, FALSE);
|
||||
g_return_val_if_fail (value != NULL, FALSE);
|
||||
|
||||
*value = 0;
|
||||
|
||||
key_str = (*env)->NewStringUTF (env, key);
|
||||
|
|
@ -428,9 +399,6 @@ gst_am_mediaformat_set_long (GstAmMediaFormat * self, const gchar * key,
|
|||
gboolean ret = FALSE;
|
||||
jlong long_value = value;
|
||||
|
||||
g_return_val_if_fail (self != NULL, FALSE);
|
||||
g_return_val_if_fail (key != NULL, FALSE);
|
||||
|
||||
key_str = (*env)->NewStringUTF (env, key);
|
||||
if (!key_str)
|
||||
goto done;
|
||||
|
|
@ -455,10 +423,6 @@ gst_am_mediaformat_get_string (GstAmMediaFormat * self, const gchar * key,
|
|||
jstring v_str = NULL;
|
||||
const gchar *v = NULL;
|
||||
|
||||
g_return_val_if_fail (self != NULL, FALSE);
|
||||
g_return_val_if_fail (key != NULL, FALSE);
|
||||
g_return_val_if_fail (value != NULL, FALSE);
|
||||
|
||||
*value = 0;
|
||||
|
||||
key_str = (*env)->NewStringUTF (env, key);
|
||||
|
|
@ -498,10 +462,6 @@ gst_am_mediaformat_set_string (GstAmMediaFormat * self, const gchar * key,
|
|||
jstring v_str = NULL;
|
||||
gboolean ret = FALSE;
|
||||
|
||||
g_return_val_if_fail (self != NULL, FALSE);
|
||||
g_return_val_if_fail (key != NULL, FALSE);
|
||||
g_return_val_if_fail (value != NULL, FALSE);
|
||||
|
||||
key_str = (*env)->NewStringUTF (env, key);
|
||||
if (!key_str)
|
||||
goto done;
|
||||
|
|
@ -532,10 +492,6 @@ gst_am_mediaformat_get_buffer (GstAmMediaFormat * self, const gchar * key,
|
|||
guint8 *data;
|
||||
gsize size;
|
||||
|
||||
g_return_val_if_fail (self != NULL, FALSE);
|
||||
g_return_val_if_fail (key != NULL, FALSE);
|
||||
g_return_val_if_fail (value != NULL, FALSE);
|
||||
|
||||
*value = 0;
|
||||
|
||||
key_str = (*env)->NewStringUTF (env, key);
|
||||
|
|
@ -574,11 +530,6 @@ gst_am_mediaformat_set_buffer (GstAmMediaFormat * self, const gchar * key,
|
|||
jobject v = NULL;
|
||||
gboolean ret = FALSE;
|
||||
|
||||
g_return_val_if_fail (self != NULL, FALSE);
|
||||
g_return_val_if_fail (key != NULL, FALSE);
|
||||
g_return_val_if_fail (value != NULL, FALSE);
|
||||
|
||||
|
||||
key_str = (*env)->NewStringUTF (env, key);
|
||||
if (!key_str)
|
||||
goto done;
|
||||
|
|
|
|||
Loading…
Reference in a new issue