LAV
/
FFmpeg
1
0
Fork 0
Code

avcodec/mediacodec_wrapper: remove unnecessary NULL checks before calling Delete{Global,Local}Ref() 

Delete{Global,Local}Ref already handle NULL.
This commit is contained in:
Matthieu Bouron 2024-02-13 12:15:03 +01:00
parent b1a683a2fd
commit ad227a41d4
1 changed files with 47 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

189
libavcodec/mediacodec_wrapper.c
View File

@ -549,10 +549,8 @@ char *ff_AMediaCodecList_getCodecNameByType(const char *mime, int profile, int e
goto done; goto done;
} }
if (codec_name) { (*env)->DeleteLocalRef(env, codec_name);
(*env)->DeleteLocalRef(env, codec_name); codec_name = NULL;
codec_name = NULL;
}
/* Skip software decoders */ /* Skip software decoders */
if ( if (
@ -616,10 +614,8 @@ char *ff_AMediaCodecList_getCodecNameByType(const char *mime, int profile, int e
found_codec = profile == supported_profile; found_codec = profile == supported_profile;
if (profile_level) { (*env)->DeleteLocalRef(env, profile_level);
(*env)->DeleteLocalRef(env, profile_level); profile_level = NULL;
profile_level = NULL;
}
if (found_codec) { if (found_codec) {
break; break;
@ -627,20 +623,14 @@ char *ff_AMediaCodecList_getCodecNameByType(const char *mime, int profile, int e
} }
done_with_type: done_with_type:
if (profile_levels) { (*env)->DeleteLocalRef(env, profile_levels);
(*env)->DeleteLocalRef(env, profile_levels); profile_levels = NULL;
profile_levels = NULL;
}
if (capabilities) { (*env)->DeleteLocalRef(env, capabilities);
(*env)->DeleteLocalRef(env, capabilities); capabilities = NULL;
capabilities = NULL;
}
if (type) { (*env)->DeleteLocalRef(env, type);
(*env)->DeleteLocalRef(env, type); type = NULL;
type = NULL;
}
av_freep(&supported_type); av_freep(&supported_type);
@ -650,15 +640,11 @@ done_with_type:
} }
done_with_info: done_with_info:
if (info) { (*env)->DeleteLocalRef(env, info);
(*env)->DeleteLocalRef(env, info); info = NULL;
info = NULL;
}
if (types) { (*env)->DeleteLocalRef(env, types);
(*env)->DeleteLocalRef(env, types); types = NULL;
types = NULL;
}
if (found_codec) { if (found_codec) {
break; break;
@ -668,33 +654,13 @@ done_with_info:
} }
done: done:
if (codec_name) { (*env)->DeleteLocalRef(env, codec_name);
(*env)->DeleteLocalRef(env, codec_name); (*env)->DeleteLocalRef(env, info);
} (*env)->DeleteLocalRef(env, type);
(*env)->DeleteLocalRef(env, types);
if (info) { (*env)->DeleteLocalRef(env, capabilities);
(*env)->DeleteLocalRef(env, info); (*env)->DeleteLocalRef(env, profile_level);
} (*env)->DeleteLocalRef(env, profile_levels);
if (type) {
(*env)->DeleteLocalRef(env, type);
}
if (types) {
(*env)->DeleteLocalRef(env, types);
}
if (capabilities) {
(*env)->DeleteLocalRef(env, capabilities);
}
if (profile_level) {
(*env)->DeleteLocalRef(env, profile_level);
}
if (profile_levels) {
(*env)->DeleteLocalRef(env, profile_levels);
}
av_freep(&supported_type); av_freep(&supported_type);
@ -741,9 +707,7 @@ static FFAMediaFormat *mediaformat_jni_new(void)
} }
fail: fail:
if (object) { (*env)->DeleteLocalRef(env, object);
(*env)->DeleteLocalRef(env, object);
}
if (!format->object) { if (!format->object) {
ff_jni_reset_jfields(env, &format->jfields, jni_amediaformat_mapping, 1, format); ff_jni_reset_jfields(env, &format->jfields, jni_amediaformat_mapping, 1, format);
@ -828,9 +792,7 @@ static char* mediaformat_jni_toString(FFAMediaFormat* ctx)
ret = ff_jni_jstring_to_utf_chars(env, description, format); ret = ff_jni_jstring_to_utf_chars(env, description, format);
fail: fail:
if (description) { (*env)->DeleteLocalRef(env, description);
(*env)->DeleteLocalRef(env, description);
}
return ret; return ret;
} }
@ -867,9 +829,7 @@ static int mediaformat_jni_getInt32(FFAMediaFormat* ctx, const char *name, int32
ret = 1; ret = 1;
fail: fail:
if (key) { (*env)->DeleteLocalRef(env, key);
(*env)->DeleteLocalRef(env, key);
}
return ret; return ret;
} }
@ -906,9 +866,7 @@ static int mediaformat_jni_getInt64(FFAMediaFormat* ctx, const char *name, int64
ret = 1; ret = 1;
fail: fail:
if (key) { (*env)->DeleteLocalRef(env, key);
(*env)->DeleteLocalRef(env, key);
}
return ret; return ret;
} }
@ -945,9 +903,7 @@ static int mediaformat_jni_getFloat(FFAMediaFormat* ctx, const char *name, float
ret = 1; ret = 1;
fail: fail:
if (key) { (*env)->DeleteLocalRef(env, key);
(*env)->DeleteLocalRef(env, key);
}
return ret; return ret;
} }
@ -999,13 +955,8 @@ static int mediaformat_jni_getBuffer(FFAMediaFormat* ctx, const char *name, void
ret = 1; ret = 1;
fail: fail:
if (key) { (*env)->DeleteLocalRef(env, key);
(*env)->DeleteLocalRef(env, key); (*env)->DeleteLocalRef(env, result);
}
if (result) {
(*env)->DeleteLocalRef(env, result);
}
return ret; return ret;
} }
@ -1049,13 +1000,8 @@ static int mediaformat_jni_getString(FFAMediaFormat* ctx, const char *name, cons
ret = 1; ret = 1;
fail: fail:
if (key) { (*env)->DeleteLocalRef(env, key);
(*env)->DeleteLocalRef(env, key); (*env)->DeleteLocalRef(env, result);
}
if (result) {
(*env)->DeleteLocalRef(env, result);
}
return ret; return ret;
} }
@ -1081,9 +1027,7 @@ static void mediaformat_jni_setInt32(FFAMediaFormat* ctx, const char* name, int3
} }
fail: fail:
if (key) { (*env)->DeleteLocalRef(env, key);
(*env)->DeleteLocalRef(env, key);
}
} }
static void mediaformat_jni_setInt64(FFAMediaFormat* ctx, const char* name, int64_t value) static void mediaformat_jni_setInt64(FFAMediaFormat* ctx, const char* name, int64_t value)
@ -1107,9 +1051,7 @@ static void mediaformat_jni_setInt64(FFAMediaFormat* ctx, const char* name, int6
} }
fail: fail:
if (key) { (*env)->DeleteLocalRef(env, key);
(*env)->DeleteLocalRef(env, key);
}
} }
static void mediaformat_jni_setFloat(FFAMediaFormat* ctx, const char* name, float value) static void mediaformat_jni_setFloat(FFAMediaFormat* ctx, const char* name, float value)
@ -1133,9 +1075,7 @@ static void mediaformat_jni_setFloat(FFAMediaFormat* ctx, const char* name, floa
} }
fail: fail:
if (key) { (*env)->DeleteLocalRef(env, key);
(*env)->DeleteLocalRef(env, key);
}
} }
static void mediaformat_jni_setString(FFAMediaFormat* ctx, const char* name, const char* value) static void mediaformat_jni_setString(FFAMediaFormat* ctx, const char* name, const char* value)
@ -1165,13 +1105,8 @@ static void mediaformat_jni_setString(FFAMediaFormat* ctx, const char* name, con
} }
fail: fail:
if (key) { (*env)->DeleteLocalRef(env, key);
(*env)->DeleteLocalRef(env, key); (*env)->DeleteLocalRef(env, string);
}
if (string) {
(*env)->DeleteLocalRef(env, string);
}
} }
static void mediaformat_jni_setBuffer(FFAMediaFormat* ctx, const char* name, void* data, size_t size) static void mediaformat_jni_setBuffer(FFAMediaFormat* ctx, const char* name, void* data, size_t size)
@ -1213,13 +1148,8 @@ static void mediaformat_jni_setBuffer(FFAMediaFormat* ctx, const char* name, voi
} }
fail: fail:
if (key) { (*env)->DeleteLocalRef(env, key);
(*env)->DeleteLocalRef(env, key); (*env)->DeleteLocalRef(env, buffer);
}
if (buffer) {
(*env)->DeleteLocalRef(env, buffer);
}
} }
static int codec_init_static_fields(FFAMediaCodecJni *codec) static int codec_init_static_fields(FFAMediaCodecJni *codec)
@ -1352,26 +1282,13 @@ static inline FFAMediaCodec *codec_create(int method, const char *arg)
ret = 0; ret = 0;
fail: fail:
if (jarg) { (*env)->DeleteLocalRef(env, jarg);
(*env)->DeleteLocalRef(env, jarg); (*env)->DeleteLocalRef(env, object);
} (*env)->DeleteLocalRef(env, buffer_info);
if (object) {
(*env)->DeleteLocalRef(env, object);
}
if (buffer_info) {
(*env)->DeleteLocalRef(env, buffer_info);
}
if (ret < 0) { if (ret < 0) {
if (codec->object) { (*env)->DeleteGlobalRef(env, codec->object);
(*env)->DeleteGlobalRef(env, codec->object); (*env)->DeleteGlobalRef(env, codec->buffer_info);
}
if (codec->buffer_info) {
(*env)->DeleteGlobalRef(env, codec->buffer_info);
}
ff_jni_reset_jfields(env, &codec->jfields, jni_amediacodec_mapping, 1, codec); ff_jni_reset_jfields(env, &codec->jfields, jni_amediacodec_mapping, 1, codec);
av_freep(&codec); av_freep(&codec);
@ -1692,13 +1609,8 @@ static uint8_t* mediacodec_jni_getInputBuffer(FFAMediaCodec* ctx, size_t idx, si
ret = (*env)->GetDirectBufferAddress(env, buffer); ret = (*env)->GetDirectBufferAddress(env, buffer);
*out_size = (*env)->GetDirectBufferCapacity(env, buffer); *out_size = (*env)->GetDirectBufferCapacity(env, buffer);
fail: fail:
if (buffer) { (*env)->DeleteLocalRef(env, buffer);
(*env)->DeleteLocalRef(env, buffer); (*env)->DeleteLocalRef(env, input_buffers);
}
if (input_buffers) {
(*env)->DeleteLocalRef(env, input_buffers);
}
return ret; return ret;
} }
@ -1740,13 +1652,8 @@ static uint8_t* mediacodec_jni_getOutputBuffer(FFAMediaCodec* ctx, size_t idx, s
ret = (*env)->GetDirectBufferAddress(env, buffer); ret = (*env)->GetDirectBufferAddress(env, buffer);
*out_size = (*env)->GetDirectBufferCapacity(env, buffer); *out_size = (*env)->GetDirectBufferCapacity(env, buffer);
fail: fail:
if (buffer) { (*env)->DeleteLocalRef(env, buffer);
(*env)->DeleteLocalRef(env, buffer); (*env)->DeleteLocalRef(env, output_buffers);
}
if (output_buffers) {
(*env)->DeleteLocalRef(env, output_buffers);
}
return ret; return ret;
} }
@ -1768,9 +1675,7 @@ static FFAMediaFormat* mediacodec_jni_getOutputFormat(FFAMediaCodec* ctx)
ret = mediaformat_jni_newFromObject(mediaformat); ret = mediaformat_jni_newFromObject(mediaformat);
fail: fail:
if (mediaformat) { (*env)->DeleteLocalRef(env, mediaformat);
(*env)->DeleteLocalRef(env, mediaformat);
}
return ret; return ret;
} }