Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Delete{Global,Local}Ref already handle NULL.
release/7.0
Matthieu Bouron 12 months ago
parent b1a683a2fd
commit ad227a41d4
1 changed files with 47 additions and 142 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 189
      libavcodec/mediacodec_wrapper.c

189
libavcodec/mediacodec_wrapper.c
Unescape View File

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

Write Preview
Loading…
Cancel
Save