From patchwork Tue Feb 13 22:50:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Bouron X-Patchwork-Id: 46249 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c493:b0:19e:cdac:8cce with SMTP id eo19csp42156pzb; Tue, 13 Feb 2024 15:05:55 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWiQ1nVnaIVt3ur5FBGvI0YIz8AIIMO32meY6yZmUfJnMDMk6+9u+oWTQVzwGwrgNw+YKwL9pwOqiXdiO+/09S3NuTE7dIZIrLcBw== X-Google-Smtp-Source: AGHT+IGCWs98nHyCOaBIuGT4MiNhjaDy+CMyxZcImoRIuaCFHkmKOOgWA+4Gq6ILrK40od7Qzhy2 X-Received: by 2002:a19:750c:0:b0:511:a1b5:5382 with SMTP id y12-20020a19750c000000b00511a1b55382mr429282lfe.12.1707865554983; Tue, 13 Feb 2024 15:05:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707865554; cv=none; d=google.com; s=arc-20160816; b=aEwwyBGAKbSHFjQLG16QqP04nD+GTAAVTbRXNivA/ZYX2ELomzRoqHkHU3d+iBw8xj Gkfu0bMnPuH75PBSgRnaqSm1iidezPi9K/A1BXr10bFCdDaOKI4fnuHGb/dV1xDLsuMA +mj1bK0YJpuCSBwzuNFDEsF3L37uzZNUgqcBAlVBCFNBSzEexkvuMjM3KZYZg2fBAby9 O/GWdZWUQRo5LoxHDKlX7pUAf8yVughVIQ2ZkRLit44QItH2BpVAHj+sSdHvqiqutxHe 462+gy+Cf2qC/Fu/rqEJme/iNR+eDr0kj1ZPcmw5TvR7H9KVsIe7hWZtPeSz0vKc4/Z4 kUOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=b1K1Jf0h3Iu8LfctEDp7mebNeTbiFKpzBe0RC2m+tJo=; fh=ZdRNsJ//2BROY61MUk5KgG0NbgAz0cjBwtEq3PbWuwc=; b=DKeK3ySQcpFctnCnueENj7Ju+05S08ubQ6fM5jgwGy8KNSIntdC5lQ+3KsV4Uk9JIj FmLJUMmg8Z9tx58VJwfHU+uj1q1vLVbdnTZb35wVqYPyadpVEECqDmijd2U8ns4kv37f l20HCq16bKyN5hZ7Wo8IJqpQFyAyzwhK8qeEWnjmZw/dbCsWAcc1tJbvmHyJy2N6Pv3a MFWQjOTMnKMHdjJ7zSPSK2u3ySSe8xdmuCsg5nbYwNDATJNaJx9ntONmpyx3tSB9VLoC fUF6v6y8Yu4Sgx4z+4j/iWVt1M7DqeQHBbYIuoyYZxicVjeol/pw6WMDXUKfxaApJ5qx LtBw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=CZHn62Jr; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com X-Forwarded-Encrypted: i=1; AJvYcCV/InjvrvMaEdc0ydfAJQy+bKJ2qrtYud4rs05I/qT+8n1S/NGn1VLJHLNDK/fd492n6+ZdendPo02IFTq0ppMuZMUuRRGtlnMkbjPC5XvmPKPNSsZBqpz6wInzx4BKvhYJCSMbupD8LCv6Mm7Yfn0uci6c4sjP1B6AJOcN4LJJNUpLqnIVQWZ2oiQvnMLI9sZ3FPaXpHe30PEAcMAXDwkr6Pck+9q7BKHEXOr0ZH1BmGv69FGORvJGfCfhvRBjKeGbaV1FF6sg1URldf0KaNpL8pHJJuXdPW+cCKgMbX3Q6Lsx58yjx+SITNZtBZ5gGQ/h8Mo+t5+SNMNeLm0akCrwjeIoW87FpoaJUwHwf6Uy0gOKc8WUlJKRU73T+Q93gobC8YMWoFbfA9iUf4r06f1w/cEQtGURDs2c+UmI964kx67tQ5i5uVzzzOKkcSoZ4QBNzF5Fn94JeVFazNvVfaLjfaZiiBvTCM/iBz3u0Hr6VS0MdS8M5rIPZDECsRUeVTvqurDr9JYU0zsH1/BxNGpqpn2vasrXJVbM3fj4xwCOy9v6wdgrmMCzNza43eTk87U8G3Oh1U12OodZrR0cbcBtgkkukTHkNK6xFNlVM2xIn5q0ebrDZ/5c+bfiIKeOdaUhFrNH3suw/Ws4meamm67KLRirfLDPRJjNUdFH6RtsBIrv43QopZVwNkj0xadtFOVODTuKH2IDPv8JBIkF1NI0vvoJAUM1DGKA7bjOMqRZFxhaTgGcPhLyFj8EFXKDf0j0zWKGAR8G3RbEwJ57tvX/2+vsE8eCW2qfojbc3iztD307YwM4FFaWFwgNjRp4FStPR1eIIiIacMmUl4RQqMuf0BpRIXf1VKcjMhtFUOFV85ZEWElfRJWpf4v+eOljdIvfLZtqp5z3wOkboUt4EwtoSxVqu0wg7H69Fiwc3zfBj0ROtg8mEEmbayPamjq+ANWhZe AyAoFZXuXeJhku6X+Zz79UTKApudspWotj8CREF+Nzpbt/v95XlkCs8nAfnmFdho4niEkI7tpdiwlASRXvsWdBKbGa93ge6uePtmqt6QXKDXlK6La/dtmQkLQAJtRdQDHWX52nYqaHZQ7qLi1Ai7O/Vc8ZLWO/K9GGMdHQBKfe80ukj4MHgZLGQMeisG0GEt6REL40UT2wQ8c0CM/DSvvCg9OQ+GNOB+uSBnILQ0HOZqb6o8MpD/oY7YeT9MD+aEiqQBiOB08zX4IrVeV9I40vVi6FBAy8iF/8kIYP+hGNWLVcd0sd4jRccJ56DPW6J0enMtJSm3zh8rxZAZiJxJTnkMEy/3FUSqv9miFrl7a//onD5GE8z1vFLCoNTF3xDPdcUzMjadqdrrrTnNhFx7aXC52+wIMnvxWKakCubEikxotHxfO4s++WExzvZMMMFzGXgJ1nTwmBmMw629Bnws0fggd593zlM/UarKrToPCSt2seQZvh67YuAusNITQhV7E0jHFUCU4sjODeNaRa1zDrb3q5hNgBHxpWPH/dE3nPN3OiYC3xJtIYUmfW9xxraDNtv+TOMh5yzPDD3sTjL9cZovmMWgteZnUm0Gxvo7bcq8/8cC+uVHyUp37WpCEbuJfrPYSc Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i10-20020a05640242ca00b00561e9234d43si1278350edc.61.2024.02.13.15.05.54; Tue, 13 Feb 2024 15:05:54 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=CZHn62Jr; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BDF3468D140; Wed, 14 Feb 2024 01:05:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 ; Wed, 14 Feb 2024 01:05:01 +0200 (EET) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1d8ef977f1eso35737525ad.0 for ; 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-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 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Matthieu Bouron Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 5CmFMfvvEcEm 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; }