mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 05:06:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

androidmedia: Remove g_return_if_fails()

Browse source 
This is not public API so it has no advantage to have them here.
This commit is contained in:
Sebastian Dröge 2012-12-12 18:10:13 +00:00 committed by Nicolas Dufresne
parent 3ac90867ac
commit ea43e42ca5
2 changed files with 0 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
sys/androidmedia/gst-android-media-mediacodec.c
View file

@ -147,9 +147,6 @@ gst_am_mediacodec_configure (GstAmMediaCodec * self, GstAmMediaFormat * format,
{ {
JNIEnv *env = gst_dvm_get_env (); 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); AMMC_CALL (return FALSE, Void, configure, format->object, NULL, NULL, flags);
return TRUE; return TRUE;
@ -163,8 +160,6 @@ gst_am_mediacodec_create_by_codec_name (const gchar * name)
jobject object = NULL; jobject object = NULL;
jstring name_str; jstring name_str;
g_return_val_if_fail (name != NULL, NULL);
name_str = (*env)->NewStringUTF (env, name); name_str = (*env)->NewStringUTF (env, name);
if (name_str == NULL) if (name_str == NULL)
goto done; goto done;
@ -197,8 +192,6 @@ gst_am_mediacodec_get_output_format (GstAmMediaCodec * self)
GstAmMediaFormat *format = NULL; GstAmMediaFormat *format = NULL;
jobject object = NULL; jobject object = NULL;
g_return_val_if_fail (self != NULL, NULL);
object = AMMC_CALL (return NULL, Object, getOutputFormat); object = AMMC_CALL (return NULL, Object, getOutputFormat);
if (object) { if (object) {
format = g_slice_new0 (GstAmMediaFormat); format = g_slice_new0 (GstAmMediaFormat);
@ -220,8 +213,6 @@ gst_am_mediacodec_start (GstAmMediaCodec * self)
{ {
JNIEnv *env = gst_dvm_get_env (); JNIEnv *env = gst_dvm_get_env ();
g_return_val_if_fail (self != NULL, FALSE);
AMMC_CALL (return FALSE, Void, start); AMMC_CALL (return FALSE, Void, start);
return TRUE; return TRUE;
@ -232,8 +223,6 @@ gst_am_mediacodec_stop (GstAmMediaCodec * self)
{ {
JNIEnv *env = gst_dvm_get_env (); JNIEnv *env = gst_dvm_get_env ();
g_return_val_if_fail (self != NULL, FALSE);
AMMC_CALL (return FALSE, Void, stop); AMMC_CALL (return FALSE, Void, stop);
return TRUE; return TRUE;
@ -244,8 +233,6 @@ gst_am_mediacodec_flush (GstAmMediaCodec * self)
{ {
JNIEnv *env = gst_dvm_get_env (); JNIEnv *env = gst_dvm_get_env ();
g_return_val_if_fail (self != NULL, FALSE);
AMMC_CALL (return FALSE, Void, flush); AMMC_CALL (return FALSE, Void, flush);
return TRUE; return TRUE;
@ -256,8 +243,6 @@ gst_am_mediacodec_release (GstAmMediaCodec * self)
{ {
JNIEnv *env = gst_dvm_get_env (); JNIEnv *env = gst_dvm_get_env ();
g_return_if_fail (self != NULL);
AMMC_CALL (, Void, release); AMMC_CALL (, Void, release);
(*env)->DeleteGlobalRef (env, self->object); (*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 (); JNIEnv *env = gst_dvm_get_env ();
jsize i; jsize i;
g_return_if_fail (buffers != NULL);
for (i = 0; i < n_buffers; i++) { for (i = 0; i < n_buffers; i++) {
if (buffers[i].object) if (buffers[i].object)
(*env)->DeleteGlobalRef (env, 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; GstAmcBuffer *ret = NULL;
jsize i; jsize i;
g_return_val_if_fail (self != NULL, NULL);
g_return_val_if_fail (n_buffers != NULL, NULL);
*n_buffers = 0; *n_buffers = 0;
output_buffers = AMMC_CALL (goto done, Object, getOutputBuffers); output_buffers = AMMC_CALL (goto done, Object, getOutputBuffers);
if (!output_buffers) if (!output_buffers)
@ -356,9 +336,6 @@ gst_am_mediacodec_get_input_buffers (GstAmMediaCodec * self, gsize * n_buffers)
GstAmcBuffer *ret = NULL; GstAmcBuffer *ret = NULL;
jsize i; jsize i;
g_return_val_if_fail (self != NULL, NULL);
g_return_val_if_fail (n_buffers != NULL, NULL);
*n_buffers = 0; *n_buffers = 0;
input_buffers = AMMC_CALL (goto done, Object, getOutputBuffers); 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 (); JNIEnv *env = gst_dvm_get_env ();
gint ret = G_MININT; gint ret = G_MININT;
g_return_val_if_fail (self != NULL, G_MININT);
ret = AMMC_CALL (return G_MININT, Int, dequeueInputBuffer, timeoutUs); ret = AMMC_CALL (return G_MININT, Int, dequeueInputBuffer, timeoutUs);
return ret; return ret;
@ -433,8 +408,6 @@ gst_am_mediacodec_dequeue_input_buffer (GstAmMediaCodec * self,
static gboolean static gboolean
_fill_buffer_info (JNIEnv * env, jobject buffer_info, GstAmmcBufferInfo * info) _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, info->flags = (*env)->GetIntField (env, buffer_info,
android_media_mediacodec_bufferinfo.flags); android_media_mediacodec_bufferinfo.flags);
if ((*env)->ExceptionCheck (env)) { if ((*env)->ExceptionCheck (env)) {
@ -478,8 +451,6 @@ gst_am_mediacodec_dequeue_output_buffer (GstAmMediaCodec * self,
gint ret = G_MININT; gint ret = G_MININT;
jobject info_o = NULL; jobject info_o = NULL;
g_return_val_if_fail (self != NULL, G_MININT);
info_o = (*env)->NewObject (env, android_media_mediacodec_bufferinfo.klass, info_o = (*env)->NewObject (env, android_media_mediacodec_bufferinfo.klass,
android_media_mediacodec_bufferinfo.constructor); android_media_mediacodec_bufferinfo.constructor);
if (!info_o) { if (!info_o) {
@ -511,9 +482,6 @@ gst_am_mediacodec_queue_input_buffer (GstAmMediaCodec * self, gint index,
{ {
JNIEnv *env = gst_dvm_get_env (); 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, AMMC_CALL (return FALSE, Void, queueInputBuffer, index, info->offset,
info->size, info->presentation_time_us, info->flags); 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 (); JNIEnv *env = gst_dvm_get_env ();
g_return_val_if_fail (self != NULL, FALSE);
AMMC_CALL (return FALSE, Void, releaseOutputBuffer, index, JNI_FALSE); AMMC_CALL (return FALSE, Void, releaseOutputBuffer, index, JNI_FALSE);
return TRUE; return TRUE;

49
sys/androidmedia/gst-android-media-mediaformat.c
View file

@ -154,8 +154,6 @@ gst_am_mediaformat_create_audio_format (const gchar * mime,
jstring mime_str; jstring mime_str;
jobject object = NULL; jobject object = NULL;
g_return_val_if_fail (mime != NULL, NULL);
mime_str = (*env)->NewStringUTF (env, mime); mime_str = (*env)->NewStringUTF (env, mime);
if (mime_str == NULL) if (mime_str == NULL)
goto done; goto done;
@ -190,8 +188,6 @@ gst_am_mediaformat_create_video_format (const gchar * mime,
jstring mime_str; jstring mime_str;
jobject object = NULL; jobject object = NULL;
g_return_val_if_fail (mime != NULL, NULL);
mime_str = (*env)->NewStringUTF (env, mime); mime_str = (*env)->NewStringUTF (env, mime);
if (mime_str == NULL) if (mime_str == NULL)
goto done; goto done;
@ -222,8 +218,6 @@ gst_am_mediaformat_free (GstAmMediaFormat * self)
{ {
JNIEnv *env = gst_dvm_get_env (); JNIEnv *env = gst_dvm_get_env ();
g_return_if_fail (self != NULL);
(*env)->DeleteGlobalRef (env, self->object); (*env)->DeleteGlobalRef (env, self->object);
g_slice_free (GstAmMediaFormat, self); g_slice_free (GstAmMediaFormat, self);
} }
@ -236,8 +230,6 @@ gst_am_mediaformat_to_string (GstAmMediaFormat * self)
const gchar *v = NULL; const gchar *v = NULL;
gchar *ret = NULL; gchar *ret = NULL;
g_return_val_if_fail (self != NULL, FALSE);
v_str = AMMF_CALL (return NULL, Object, toString); v_str = AMMF_CALL (return NULL, Object, toString);
if (v_str) { if (v_str) {
v = (*env)->GetStringUTFChars (env, v_str, NULL); v = (*env)->GetStringUTFChars (env, v_str, NULL);
@ -265,9 +257,6 @@ gst_am_mediaformat_contains_key (GstAmMediaFormat * self, const gchar * key)
gboolean ret = FALSE; gboolean ret = FALSE;
jstring key_str = NULL; 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); key_str = (*env)->NewStringUTF (env, key);
if (!key_str) if (!key_str)
goto done; goto done;
@ -289,10 +278,6 @@ gst_am_mediaformat_get_float (GstAmMediaFormat * self, const gchar * key,
jstring key_str = NULL; jstring key_str = NULL;
gboolean ret = FALSE; 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; *value = 0;
key_str = (*env)->NewStringUTF (env, key); key_str = (*env)->NewStringUTF (env, key);
@ -317,9 +302,6 @@ gst_am_mediaformat_set_float (GstAmMediaFormat * self, const gchar * key,
jstring key_str = NULL; jstring key_str = NULL;
gboolean ret = FALSE; 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); key_str = (*env)->NewStringUTF (env, key);
if (!key_str) if (!key_str)
goto done; goto done;
@ -342,10 +324,6 @@ gst_am_mediaformat_get_int (GstAmMediaFormat * self, const gchar * key,
jstring key_str = NULL; jstring key_str = NULL;
gboolean ret = FALSE; 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; *value = 0;
key_str = (*env)->NewStringUTF (env, key); key_str = (*env)->NewStringUTF (env, key);
@ -371,9 +349,6 @@ gst_am_mediaformat_set_int (GstAmMediaFormat * self, const gchar * key,
jstring key_str = NULL; jstring key_str = NULL;
gboolean ret = FALSE; 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); key_str = (*env)->NewStringUTF (env, key);
if (!key_str) if (!key_str)
goto done; goto done;
@ -397,10 +372,6 @@ gst_am_mediaformat_get_long (GstAmMediaFormat * self, const gchar * key,
gboolean ret = FALSE; gboolean ret = FALSE;
jlong long_value; 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; *value = 0;
key_str = (*env)->NewStringUTF (env, key); key_str = (*env)->NewStringUTF (env, key);
@ -428,9 +399,6 @@ gst_am_mediaformat_set_long (GstAmMediaFormat * self, const gchar * key,
gboolean ret = FALSE; gboolean ret = FALSE;
jlong long_value = value; 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); key_str = (*env)->NewStringUTF (env, key);
if (!key_str) if (!key_str)
goto done; goto done;
@ -455,10 +423,6 @@ gst_am_mediaformat_get_string (GstAmMediaFormat * self, const gchar * key,
jstring v_str = NULL; jstring v_str = NULL;
const gchar *v = 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; *value = 0;
key_str = (*env)->NewStringUTF (env, key); key_str = (*env)->NewStringUTF (env, key);
@ -498,10 +462,6 @@ gst_am_mediaformat_set_string (GstAmMediaFormat * self, const gchar * key,
jstring v_str = NULL; jstring v_str = NULL;
gboolean ret = FALSE; 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); key_str = (*env)->NewStringUTF (env, key);
if (!key_str) if (!key_str)
goto done; goto done;
@ -532,10 +492,6 @@ gst_am_mediaformat_get_buffer (GstAmMediaFormat * self, const gchar * key,
guint8 *data; guint8 *data;
gsize size; 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; *value = 0;
key_str = (*env)->NewStringUTF (env, key); key_str = (*env)->NewStringUTF (env, key);
@ -574,11 +530,6 @@ gst_am_mediaformat_set_buffer (GstAmMediaFormat * self, const gchar * key,
jobject v = NULL; jobject v = NULL;
gboolean ret = FALSE; 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); key_str = (*env)->NewStringUTF (env, key);
if (!key_str) if (!key_str)
goto done; goto done;