From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTP id 3D228495E6
for <ffmpegdev@gitmailbox.com>; Tue, 13 Feb 2024 23:05:52 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 81FBE68D1EA;
Wed, 14 Feb 2024 01:05:04 +0200 (EET)
Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com
[209.85.214.171])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AFB6068D1CA
for <ffmpeg-devel@ffmpeg.org>; Wed, 14 Feb 2024 01:05:01 +0200 (EET)
Received: by mail-pl1-f171.google.com with SMTP id
d9443c01a7336-1d8ef977f1eso35737525ad.0
for <ffmpeg-devel@ffmpeg.org>; Tue, 13 Feb 2024 15:05:01 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1707865500; x=1708470300; darn=ffmpeg.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=HeXed4UGZBj6VaQf17ueNpX57oMsMZNLncU0Kvv2BbU=;
b=CZHn62JrIhNRrXFl/BZKwgmVlbZa6O4FDcaIQLHPaBZ2Qvr1zfPLAbtwrh+1vno/2I
zqaVKP6PMa8i5drktp1NNF5qqPf2ZKy4WQpS6ljnWtMskoc4NWY62DTijDfr7OSQX9yW
0d7RBJZmlKNAf7KU8L38fMue+Q08S86AqF9zqWYWYfsUZVeBRNyM+PjZY6V4gM6mGUY2
ZoW1gbYqHmTYzbyt74uUVpsMYLEyX3BD3khT5H0ZKpH7zH6RPPMT0Ru4Cz3gJoBxJT/j
iLFlho6bTfmfMIB3SZAaT/k3EsT3/tLdC/ANzpSJ81Bx8CRpmsdqrwl7bTj8dp1DFmAC
mPvA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1707865500; x=1708470300;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=HeXed4UGZBj6VaQf17ueNpX57oMsMZNLncU0Kvv2BbU=;
b=e785uRxBgk/2ln66E0sFWjbzovJrZ7QmfaX+4/DEjrP0/LMtSEzJhIghhhL1w7hnwh
/9a4LtXKtOwPyhH9XQxwjVeO8VC4c5AdwUucOCQixMCdLywSOyzfsRz+Oq23JF5ZgMNX
mEzMPBHXN8X7O7rNqdWaelrEflDkDtfRuc4++D9WlZuhKj0DQmcNIl7Brh4SGPMBlJ/b
+Gizk2RWb0eWolRDyMZeGP760KVtoxrGgfo7EuGU1OJYOYclRLAbFraivVH1s/WQp/8C
Ef/NNVUm2Qgze85Fgvc7YFNlNBPTy/D6TJXCtRbk+ulvo9RcJ/StL/jrzoSDvPRdEC2s
LFmg==
X-Gm-Message-State: AOJu0YyLj0CigSHT2vTShIUZmKtynABniUMQrSvS6KRBHdi4u1TaSWRl
Rz0IPeuuAptV0FTWR4LEJYzLAEfrOIcq8pqy35aPkeqvs/dX7DeuC6GW0pe4
X-Google-Smtp-Source: AGHT+IHQS/tmL2ys6npllcE0OUHRD3ZV94I6L1KoMg2ZO4E/qLWFd7ymfFW29JrQxxnbRc9tykJaEA==
X-Received: by 2002:a17:903:183:b0:1da:1cdf:1ccf with SMTP id
z3-20020a170903018300b001da1cdf1ccfmr1241672plg.49.1707865499726;
Tue, 13 Feb 2024 15:04:59 -0800 (PST)
Received: from localhost.localdomain
(2a01cb040b6872000000000000000afa.ipv6.abo.wanadoo.fr.
[2a01:cb04:b68:7200::afa]) by smtp.gmail.com with ESMTPSA id
l13-20020a170903244d00b001da294ff6d5sm2580098pls.189.2024.02.13.15.04.57
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 13 Feb 2024 15:04:59 -0800 (PST)
From: Matthieu Bouron <matthieu.bouron@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Tue, 13 Feb 2024 23:50:15 +0100
Message-ID: <20240213230418.457056-8-matthieu.bouron@gmail.com>
X-Mailer: git-send-email 2.43.1
In-Reply-To: <20240213230418.457056-1-matthieu.bouron@gmail.com>
References: <20240213230418.457056-1-matthieu.bouron@gmail.com>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH 7/7] avcodec/mediacodec_wrapper: remove
unnecessary NULL checks before calling Delete{Global, Local}Ref()
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: Matthieu Bouron <matthieu.bouron@gmail.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20240213230418.457056-8-matthieu.bouron@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
Delete{Global,Local}Ref already handle NULL.
---
libavcodec/mediacodec_wrapper.c | 189 ++++++++------------------------
1 file changed, 47 insertions(+), 142 deletions(-)
diff --git a/libavcodec/mediacodec_wrapper.c b/libavcodec/mediacodec_wrapper.c
index 536b5b8e81..19d63e2ba0 100644
--- a/libavcodec/mediacodec_wrapper.c
+++ b/libavcodec/mediacodec_wrapper.c
@@ -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) {
avpriv_jni_reset_jfields(env, &format->jfields, jni_amediaformat_mapping, 1, format);
@@ -828,9 +792,7 @@ static char* mediaformat_jni_toString(FFAMediaFormat* ctx)
ret = avpriv_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);
avpriv_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;
}
--
2.43.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".