From patchwork Mon Apr 19 14:09:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27068 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp568511iob; Mon, 19 Apr 2021 07:26:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy1a5MejBeYGMy6oYLm/TowafrkF/RJfVj+8DG3kmQQXxgGj6TN1fnqzgcF0lW1lJ2yFS5G X-Received: by 2002:a05:6402:2552:: with SMTP id l18mr25628628edb.71.1618842410841; Mon, 19 Apr 2021 07:26:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618842410; cv=none; d=google.com; s=arc-20160816; b=Opz3zBXs9i6HuopId9LDy9BjRrW9LWKRFkNF5s77cPkgYixXP92w0tRLC8HDIqbCq1 XNs0gV87l8Y99iVMP7Abe5RzQ6KAXDQ8Z6g5aDbNmxy+rrcYGFR5UeDCIl68V+K0Fjpg L3cSzyhMjZeNWY6LqPM9cu5ApWCksXP7Ybi8Sgb3c4KlLIgMHvUZ1L9E8C+CZVnthkwS vCO+Gqk2VyrY0pNDHCH5c63pzghdCCGPwxg0zJDwJFhCn8Y1ykeRnjg8vLwbRsu8+4Bs s8yamFqP4AjgyPSvAHqSYzuA+LjrvUqtJHnK2WBZ/Kr6bhgjTr1AxSGtuooqnNx+1MH9 5whg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=sebe6Vc2nLU32qBwpYLgCGBPjUH857MP2/jaPXkeWAY=; b=qJmYzVokGEBd9SBNHIz7XSLWOsWyhZctIE3bNenYZfm8tmSBYLi3P9QNYN8Bz/ggL1 TXhMMySX4EO7tt3v9xBenqTV0j+TK4rFnlOr/vPOpMmhQ+uc/aUvVLQzGxnDylGLcXBz lPdA6Tkji47qZCzmOWLmrNOvrc/MA/TlnLoluwMZhp5XsKXCkvWnvphpxypiybyD6+4z b1XDL7T3oockIY/GA4ixQpF7252/x5HDqZmN4dUhEDKkjFKCjxwjNnmlHeAjJ/x4iLEK pfl5WaZ52RsrHfshYynNYYjrRGDcYKApIw+JTZrYed0UBwLoOc6n/Nsgam/upcEevA3H uywg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=taYQKskm; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y25si9453005ejb.256.2021.04.19.07.26.50; Mon, 19 Apr 2021 07:26:50 -0700 (PDT) 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=20161025 header.b=taYQKskm; 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 5BB4068A177; Mon, 19 Apr 2021 17:17:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F18168A0DE for ; Mon, 19 Apr 2021 17:17:06 +0300 (EEST) Received: by mail-qt1-f175.google.com with SMTP id 18so12731778qtz.6 for ; Mon, 19 Apr 2021 07:17:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=+PG0sBq3IgNP4FwcEG6JcpGFnQmyHFBlAAlJaus5nJU=; b=taYQKskmeX0/vQnxOPMsbQSYPtExRmB7DzLHuSdk1jahoVYmBlh/JS6t4BDGmXyVAk 1LnXJ3624Z3YdFNMQu0ly5HZJJddztWzzstqZ+Q0utSudMy5Ez5uzD3sQt28cebZXIKH M6q8Zce5YGkOSaezvHgj6kTV7TP6hMfOJQLy2buzgP5JIvMZNcrri4sV5OgrN2xuSRG/ 2nvhpHRRP2S44XWMIk46L2IBt5QWu/HjwkChypWJhqLSr1hth58/Yi8v8y7W+31W8l1/ BMpeuPeViLPTZsRIpdpumFAZs4uEZfE9OkPHB7GH6OzDRLBjgNirRs0yYLXxKoSoBYPo a5nQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+PG0sBq3IgNP4FwcEG6JcpGFnQmyHFBlAAlJaus5nJU=; b=Uyu+nwmHKwOW3PKYFoVwZ5KvuvN58t0RCJu9h3TRtAtV7mEiNlsuLVU1niLL5CDxnU AVnoBsBdAMoBxuR84UsJGrBOf0uh38TGdc0j3s4iX6C4H5IM3oglsGPPmh9k+qlHKH0S pq2K9s9Pqorx8I0wE5KZb4WNVbq6dHhGrkTmG7KTQOKxaIHzF1wBku1HRlIdcZ+cMzFm ZvjYpN/+PJt4rH7hZJREd8tFvhrPrK/3q/NsyaK9VXvGaRUTDBmc4GZT08PGQPzANFua Ek9/r8zXPi8FD6yYKhA2+WqkImsy2IWt94XKa9DYgVWllEk2UDle8AENEyxyn+Xbx+mj c74A== X-Gm-Message-State: AOAM533KtWIuj5Cx8/XQ/Ju0bXG7nDGlc4NgS6ZjyJro7CYEj81/Oo0a x1ElaExWqToWNAdU0SOOyznDXCbANn8= X-Received: by 2002:a05:620a:13ca:: with SMTP id g10mr11748113qkl.380.1618841478285; Mon, 19 Apr 2021 07:11:18 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:18 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:10 -0300 Message-Id: <20210419141024.8174-14-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419141024.8174-1-jamrial@gmail.com> References: <20210419141024.8174-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 13/87] avcodec: Remove lock manager API 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: broGEAVjbL/b From: Andreas Rheinhardt Deprecated in a04c2c707de2ce850f79870e84ac9d7ec7aa9143. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.c | 7 ------- libavcodec/avcodec.h | 43 ------------------------------------------- libavcodec/version.h | 3 --- 3 files changed, 53 deletions(-) diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index 760a98d8ef..8e91350d67 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -102,13 +102,6 @@ static void unlock_avcodec(const AVCodec *codec) ff_mutex_unlock(&codec_mutex); } -#if FF_API_LOCKMGR -int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op)) -{ - return 0; -} -#endif - static int64_t get_bit_rate(AVCodecContext *ctx) { int64_t bit_rate; diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 0e86064ccb..7c6f5c1fc0 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3799,49 +3799,6 @@ attribute_deprecated AVHWAccel *av_hwaccel_next(const AVHWAccel *hwaccel); #endif -#if FF_API_LOCKMGR -/** - * Lock operation used by lockmgr - * - * @deprecated Deprecated together with av_lockmgr_register(). - */ -enum AVLockOp { - AV_LOCK_CREATE, ///< Create a mutex - AV_LOCK_OBTAIN, ///< Lock the mutex - AV_LOCK_RELEASE, ///< Unlock the mutex - AV_LOCK_DESTROY, ///< Free mutex resources -}; - -/** - * Register a user provided lock manager supporting the operations - * specified by AVLockOp. The "mutex" argument to the function points - * to a (void *) where the lockmgr should store/get a pointer to a user - * allocated mutex. It is NULL upon AV_LOCK_CREATE and equal to the - * value left by the last call for all other ops. If the lock manager is - * unable to perform the op then it should leave the mutex in the same - * state as when it was called and return a non-zero value. However, - * when called with AV_LOCK_DESTROY the mutex will always be assumed to - * have been successfully destroyed. If av_lockmgr_register succeeds - * it will return a non-negative value, if it fails it will return a - * negative value and destroy all mutex and unregister all callbacks. - * av_lockmgr_register is not thread-safe, it must be called from a - * single thread before any calls which make use of locking are used. - * - * @param cb User defined callback. av_lockmgr_register invokes calls - * to this callback and the previously registered callback. - * The callback will be used to create more than one mutex - * each of which must be backed by its own underlying locking - * mechanism (i.e. do not use a single static object to - * implement your lock manager). If cb is set to NULL the - * lockmgr will be unregistered. - * - * @deprecated This function does nothing, and always returns 0. Be sure to - * build with thread support to get basic thread safety. - */ -attribute_deprecated -int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op)); -#endif - /** * @return a positive value if s is open (i.e. avcodec_open2() was called on it * with no corresponding avcodec_close()), 0 otherwise. diff --git a/libavcodec/version.h b/libavcodec/version.h index 6d0f0f1d25..c743d2a05c 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -87,9 +87,6 @@ #ifndef FF_API_USER_VISIBLE_AVHWACCEL #define FF_API_USER_VISIBLE_AVHWACCEL (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_LOCKMGR -#define FF_API_LOCKMGR (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_UNSANITIZED_BITRATES #define FF_API_UNSANITIZED_BITRATES (LIBAVCODEC_VERSION_MAJOR < 59) #endif