From patchwork Sat Dec 3 16:07:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rick Kern X-Patchwork-Id: 39576 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp2086550pzb; Sat, 3 Dec 2022 08:08:20 -0800 (PST) X-Google-Smtp-Source: AA0mqf7RQljaDdJvNbQfJPk7ocT/2p2Pt4yGRtUi3WrILpPuCLRbWSdYpeCus6W/M16C5lXDHuEv X-Received: by 2002:a50:ff0d:0:b0:461:c6e8:452e with SMTP id a13-20020a50ff0d000000b00461c6e8452emr57583776edu.298.1670083700281; Sat, 03 Dec 2022 08:08:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670083700; cv=none; d=google.com; s=arc-20160816; b=v9Pd3OypeY9SgzgGMeLsUz4+p9Dkcp6XHgQ9Oje4pHOSUA6hH1vKL+8ThRSphPEBAZ ot7GpZIsOODJT/FSUELGpZMkIsza3mrnTGprcYzT5JNXulDho/8s2655m4fdeMfQ0Cjp 5fC3PEqNFvKZXOmaLyxZMGkxr/PJzlaZTYwhwu4HnpvNlrfcpTIxQVngnIFsrN+Atggi knZpsuKv0/9I4t4adcDRJ/P1e7l6aUW8na/MVs0BAFMpQ2+6GRGhVfVQATZKnuq90+0p ygkMdoZwZIBdZ7BDkpL9qA9RysKUdtUCJOcSiB9gxMdDF+X/rSqAcTCxd72/1YQi6cE4 dYfA== 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=YtT/bULvgqC938fdcNgiADw5Vtt/rogvHmlsFkil7Tw=; b=JkPR2HPSqCIDTcPX1ivHnmT+XjvaUyHP6xkbQLtmp1OP3ox9K3+hoq6mfbCeiqV6th PUenvdHZYd63zKP5TGggibpu+Bur7Dw2mYB4cHFlKy2+5limM3qO6X13+cnLDcmx9zus 2uKn7MUuGslUfWbgy9hw/07UIxHakp32+lE+blRspHvAknHe1t9IN2ozwn6a6esEETYh C7w3SIDYUtqE+qmQ5/Jlpx8b1+dM+qcwDxmu3c9HPoh+8+HK3jCJ32A7ZBJjiGgqfnDa GxbGXIJCe5s62ibHy/+RFL3dfpHUu7k/TVlzshLh4No/fJxtAxsBbYerSq2ckDg/klUf 4bpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=GeAW4C+e; 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 b18-20020a056402279200b0045ad02bb8fbsi9479900ede.290.2022.12.03.08.08.19; Sat, 03 Dec 2022 08:08:20 -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=20210112 header.b=GeAW4C+e; 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 298A068B9EC; Sat, 3 Dec 2022 18:08:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f52.google.com (mail-qv1-f52.google.com [209.85.219.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8583568B9CA for ; Sat, 3 Dec 2022 18:08:02 +0200 (EET) Received: by mail-qv1-f52.google.com with SMTP id e18so5433527qvs.1 for ; Sat, 03 Dec 2022 08:08:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=XqDu6FNJ96MprrhHErhd8xuVSz7L84RUKycykNZIpCY=; b=GeAW4C+eK1PuQ0bEpnvehUPv5SCZfwmRfT+QDzWp1IWT+XwiYvym7XHguHwWDToSSJ sW3jC+SHOUGF5y7ZCmd7vun2eegl8tN7Qaj3uHv8rWHZhkfk4BFqeWg61s2Z8QxcPY5l eFOoarp6/aiG706Hzgv5/EOy7ohueJmI+DZqvvWPbN35oHzexl3fUvPV+55LGs4xdjFg wcECrS2w/QZ0OO+m/fcR0hdXJoKj/PUY9kmP+yZqANYgHu7XZm+GtM4kKaZtoJPq1rqK DKSdkayvyYCX8+/RMX7Cv2LiSqIhQOuQT/1wA27/CZP+HL7IpPC6wwkqZKB04RQXr3OP ly4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XqDu6FNJ96MprrhHErhd8xuVSz7L84RUKycykNZIpCY=; b=sHi3ehy5o1mUnVNPRXo6IbPDRM4YOfHEQsViHNbf5NsS6KExNBj3vOHxuWmidvaAQM b3xhFRqX27EsWJPLklZvFWQBjleP4RrvFuSALLb1U80jTF1nQ5/n+UcsCKHcZOQEY6wQ 3lGb/1ZhdXuD1iw3qAjV8jp5r8lbSyULRauAZo2kQk+nj9iksWEF73EJcn6jCSnQkKnM sgP1Gc5VyTQiFBvwe/NPqU/b4flHBqeG2hy0mALeEH6GTIL6Yul+iSbH7w5xzSeTbkoM SFNAss+FOtF7hxVEDIMpmI73xH+vWtu8PE9xBgefnqcPnx7s9Gxj52SeGYq7I9O4kClv huvA== X-Gm-Message-State: ANoB5plaVBzakf5L06+Ug9o+TWtQtIfTeDtwCatKYYqbqtl80hfOKOGe q8TGmKo2POi+EPYttnZ2SCrbRBiKQiB4gA== X-Received: by 2002:ad4:5441:0:b0:4af:9759:6f4b with SMTP id h1-20020ad45441000000b004af97596f4bmr49975649qvt.31.1670083680708; Sat, 03 Dec 2022 08:08:00 -0800 (PST) Received: from localhost.localdomain ([2603:3007:2608:b900:38fa:c53b:cbdc:b66a]) by smtp.gmail.com with ESMTPSA id o21-20020a05620a2a1500b006eeb3165554sm8395723qkp.19.2022.12.03.08.07.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Dec 2022 08:07:59 -0800 (PST) From: Rick Kern To: ffmpeg-devel@ffmpeg.org Date: Sat, 3 Dec 2022 11:07:56 -0500 Message-Id: <20221203160757.74546-2-kernrj@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221203160757.74546-1-kernrj@gmail.com> References: <20221203155056.74093-1-kernrj@gmail.com> <20221203160757.74546-1-kernrj@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 1/2] fftools/objpool: move objpool to libavutil 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: WiSzYOCXxg+v Moved objpool to libavutil to make it available outside of fftools. Signed-off-by: Rick Kern --- fftools/Makefile | 1 - fftools/ffmpeg_mux.c | 8 ++++---- fftools/sync_queue.c | 18 +++++++++--------- fftools/thread_queue.c | 14 +++++++------- fftools/thread_queue.h | 4 ++-- libavutil/Makefile | 2 ++ {fftools => libavutil}/objpool.c | 32 +++++++++++++++++--------------- {fftools => libavutil}/objpool.h | 30 ++++++++++++++++-------------- 8 files changed, 57 insertions(+), 52 deletions(-) rename {fftools => libavutil}/objpool.c (77%) rename {fftools => libavutil}/objpool.h (56%) diff --git a/fftools/Makefile b/fftools/Makefile index 8ac38e75d2..25b11deaff 100644 --- a/fftools/Makefile +++ b/fftools/Makefile @@ -16,7 +16,6 @@ OBJS-ffmpeg += \ fftools/ffmpeg_mux.o \ fftools/ffmpeg_mux_init.o \ fftools/ffmpeg_opt.o \ - fftools/objpool.o \ fftools/sync_queue.o \ fftools/thread_queue.o \ diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index 20524e5a28..8e4dd0facf 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -22,7 +22,6 @@ #include "ffmpeg.h" #include "ffmpeg_mux.h" -#include "objpool.h" #include "sync_queue.h" #include "thread_queue.h" @@ -30,6 +29,7 @@ #include "libavutil/intreadwrite.h" #include "libavutil/log.h" #include "libavutil/mem.h" +#include "libavutil/objpool.h" #include "libavutil/timestamp.h" #include "libavutil/thread.h" @@ -398,16 +398,16 @@ static void pkt_move(void *dst, void *src) static int thread_start(Muxer *mux) { AVFormatContext *fc = mux->fc; - ObjPool *op; + AVObjPool *op; int ret; - op = objpool_alloc_packets(); + op = av_objpool_alloc_packets(); if (!op) return AVERROR(ENOMEM); mux->tq = tq_alloc(fc->nb_streams, mux->thread_queue_size, op, pkt_move); if (!mux->tq) { - objpool_free(&op); + av_objpool_free(&op); return AVERROR(ENOMEM); } diff --git a/fftools/sync_queue.c b/fftools/sync_queue.c index c2b23ee4f5..bfa91bc129 100644 --- a/fftools/sync_queue.c +++ b/fftools/sync_queue.c @@ -24,8 +24,8 @@ #include "libavutil/fifo.h" #include "libavutil/mathematics.h" #include "libavutil/mem.h" +#include "libavutil/objpool.h" -#include "objpool.h" #include "sync_queue.h" typedef struct SyncQueueStream { @@ -60,7 +60,7 @@ struct SyncQueue { unsigned int nb_streams; // pool of preallocated frames to avoid constant allocations - ObjPool *pool; + AVObjPool *pool; }; static void frame_move(const SyncQueue *sq, SyncQueueFrame dst, @@ -250,7 +250,7 @@ int sq_send(SyncQueue *sq, unsigned int stream_idx, SyncQueueFrame frame) if (st->finished) return AVERROR_EOF; - ret = objpool_get(sq->pool, (void**)&dst); + ret = av_objpool_get(sq->pool, (void**)&dst); if (ret < 0) return ret; @@ -261,7 +261,7 @@ int sq_send(SyncQueue *sq, unsigned int stream_idx, SyncQueueFrame frame) ret = av_fifo_write(st->fifo, &dst, 1); if (ret < 0) { frame_move(sq, frame, dst); - objpool_release(sq->pool, (void**)&dst); + av_objpool_release(sq->pool, (void**)&dst); return ret; } @@ -302,7 +302,7 @@ static int receive_for_stream(SyncQueue *sq, unsigned int stream_idx, */ if (cmp <= 0 || ts == AV_NOPTS_VALUE) { frame_move(sq, frame, peek); - objpool_release(sq->pool, (void**)&peek); + av_objpool_release(sq->pool, (void**)&peek); av_fifo_drain2(st->fifo, 1); return 0; } @@ -415,8 +415,8 @@ SyncQueue *sq_alloc(enum SyncQueueType type, int64_t buf_size_us) sq->head_stream = -1; sq->head_finished_stream = -1; - sq->pool = (type == SYNC_QUEUE_PACKETS) ? objpool_alloc_packets() : - objpool_alloc_frames(); + sq->pool = (type == SYNC_QUEUE_PACKETS) ? av_objpool_alloc_packets() : + av_objpool_alloc_frames(); if (!sq->pool) { av_freep(&sq); return NULL; @@ -435,14 +435,14 @@ void sq_free(SyncQueue **psq) for (unsigned int i = 0; i < sq->nb_streams; i++) { SyncQueueFrame frame; while (av_fifo_read(sq->streams[i].fifo, &frame, 1) >= 0) - objpool_release(sq->pool, (void**)&frame); + av_objpool_release(sq->pool, (void**)&frame); av_fifo_freep2(&sq->streams[i].fifo); } av_freep(&sq->streams); - objpool_free(&sq->pool); + av_objpool_free(&sq->pool); av_freep(psq); } diff --git a/fftools/thread_queue.c b/fftools/thread_queue.c index a1ab4ce92e..514d12bb6a 100644 --- a/fftools/thread_queue.c +++ b/fftools/thread_queue.c @@ -24,9 +24,9 @@ #include "libavutil/fifo.h" #include "libavutil/intreadwrite.h" #include "libavutil/mem.h" +#include "libavutil/objpool.h" #include "libavutil/thread.h" -#include "objpool.h" #include "thread_queue.h" enum { @@ -45,7 +45,7 @@ struct ThreadQueue { AVFifo *fifo; - ObjPool *obj_pool; + AVObjPool *obj_pool; void (*obj_move)(void *dst, void *src); pthread_mutex_t lock; @@ -62,11 +62,11 @@ void tq_free(ThreadQueue **ptq) if (tq->fifo) { FifoElem elem; while (av_fifo_read(tq->fifo, &elem, 1) >= 0) - objpool_release(tq->obj_pool, &elem.obj); + av_objpool_release(tq->obj_pool, &elem.obj); } av_fifo_freep2(&tq->fifo); - objpool_free(&tq->obj_pool); + av_objpool_free(&tq->obj_pool); av_freep(&tq->finished); @@ -77,7 +77,7 @@ void tq_free(ThreadQueue **ptq) } ThreadQueue *tq_alloc(unsigned int nb_streams, size_t queue_size, - ObjPool *obj_pool, void (*obj_move)(void *dst, void *src)) + AVObjPool *obj_pool, void (*obj_move)(void *dst, void *src)) { ThreadQueue *tq; int ret; @@ -141,7 +141,7 @@ int tq_send(ThreadQueue *tq, unsigned int stream_idx, void *data) } else { FifoElem elem = { .stream_idx = stream_idx }; - ret = objpool_get(tq->obj_pool, &elem.obj); + ret = av_objpool_get(tq->obj_pool, &elem.obj); if (ret < 0) goto finish; @@ -166,7 +166,7 @@ static int receive_locked(ThreadQueue *tq, int *stream_idx, if (av_fifo_read(tq->fifo, &elem, 1) >= 0) { tq->obj_move(data, elem.obj); - objpool_release(tq->obj_pool, &elem.obj); + av_objpool_release(tq->obj_pool, &elem.obj); *stream_idx = elem.stream_idx; return 0; } diff --git a/fftools/thread_queue.h b/fftools/thread_queue.h index 0cc8c71ebd..e61260687f 100644 --- a/fftools/thread_queue.h +++ b/fftools/thread_queue.h @@ -21,7 +21,7 @@ #include -#include "objpool.h" +#include "libavutil/objpool.h" typedef struct ThreadQueue ThreadQueue; @@ -37,7 +37,7 @@ typedef struct ThreadQueue ThreadQueue; * @param callback that moves the contents between two data pointers */ ThreadQueue *tq_alloc(unsigned int nb_streams, size_t queue_size, - ObjPool *obj_pool, void (*obj_move)(void *dst, void *src)); + AVObjPool *obj_pool, void (*obj_move)(void *dst, void *src)); void tq_free(ThreadQueue **tq); /** diff --git a/libavutil/Makefile b/libavutil/Makefile index 3d9c07aea8..bd9ac28335 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -62,6 +62,7 @@ HEADERS = adler32.h \ mem.h \ motion_vector.h \ murmur3.h \ + objpool.h \ opt.h \ parseutils.h \ pixdesc.h \ @@ -149,6 +150,7 @@ OBJS = adler32.o \ md5.o \ mem.o \ murmur3.o \ + objpool.o \ opt.o \ parseutils.o \ pixdesc.o \ diff --git a/fftools/objpool.c b/libavutil/objpool.c similarity index 77% rename from fftools/objpool.c rename to libavutil/objpool.c index 87237cf724..2309afb5b2 100644 --- a/fftools/objpool.c +++ b/libavutil/objpool.c @@ -27,19 +27,21 @@ #include "objpool.h" -struct ObjPool { +struct AVObjPool { void *pool[32]; unsigned int pool_count; - ObjPoolCBAlloc alloc; - ObjPoolCBReset reset; - ObjPoolCBFree free; + AVObjPoolCBAlloc alloc; + AVObjPoolCBReset reset; + AVObjPoolCBFree free; }; -ObjPool *objpool_alloc(ObjPoolCBAlloc cb_alloc, ObjPoolCBReset cb_reset, - ObjPoolCBFree cb_free) +AVObjPool *av_objpool_alloc( + AVObjPoolCBAlloc cb_alloc, + AVObjPoolCBReset cb_reset, + AVObjPoolCBFree cb_free) { - ObjPool *op = av_mallocz(sizeof(*op)); + AVObjPool *op = av_mallocz(sizeof(*op)); if (!op) return NULL; @@ -51,9 +53,9 @@ ObjPool *objpool_alloc(ObjPoolCBAlloc cb_alloc, ObjPoolCBReset cb_reset, return op; } -void objpool_free(ObjPool **pop) +void av_objpool_free(AVObjPool **pop) { - ObjPool *op = *pop; + AVObjPool *op = *pop; if (!op) return; @@ -64,7 +66,7 @@ void objpool_free(ObjPool **pop) av_freep(pop); } -int objpool_get(ObjPool *op, void **obj) +int av_objpool_get(AVObjPool *op, void **obj) { if (op->pool_count) { *obj = op->pool[--op->pool_count]; @@ -75,7 +77,7 @@ int objpool_get(ObjPool *op, void **obj) return *obj ? 0 : AVERROR(ENOMEM); } -void objpool_release(ObjPool *op, void **obj) +void av_objpool_release(AVObjPool *op, void **obj) { if (!*obj) return; @@ -121,11 +123,11 @@ static void free_frame(void **obj) *obj = NULL; } -ObjPool *objpool_alloc_packets(void) +AVObjPool *av_objpool_alloc_packets(void) { - return objpool_alloc(alloc_packet, reset_packet, free_packet); + return av_objpool_alloc(alloc_packet, reset_packet, free_packet); } -ObjPool *objpool_alloc_frames(void) +AVObjPool *av_objpool_alloc_frames(void) { - return objpool_alloc(alloc_frame, reset_frame, free_frame); + return av_objpool_alloc(alloc_frame, reset_frame, free_frame); } diff --git a/fftools/objpool.h b/libavutil/objpool.h similarity index 56% rename from fftools/objpool.h rename to libavutil/objpool.h index 1b2aea6aca..a2d16e8687 100644 --- a/fftools/objpool.h +++ b/libavutil/objpool.h @@ -16,22 +16,24 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFTOOLS_OBJPOOL_H -#define FFTOOLS_OBJPOOL_H +#ifndef AVUTIL_OBJPOOL_H +#define AVUTIL_OBJPOOL_H -typedef struct ObjPool ObjPool; +typedef struct AVObjPool AVObjPool; -typedef void* (*ObjPoolCBAlloc)(void); -typedef void (*ObjPoolCBReset)(void *); -typedef void (*ObjPoolCBFree)(void **); +typedef void* (*AVObjPoolCBAlloc)(void); +typedef void (*AVObjPoolCBReset)(void *); +typedef void (*AVObjPoolCBFree)(void **); -void objpool_free(ObjPool **op); -ObjPool *objpool_alloc(ObjPoolCBAlloc cb_alloc, ObjPoolCBReset cb_reset, - ObjPoolCBFree cb_free); -ObjPool *objpool_alloc_packets(void); -ObjPool *objpool_alloc_frames(void); +void av_objpool_free(AVObjPool **op); +AVObjPool *av_objpool_alloc( + AVObjPoolCBAlloc cb_alloc, + AVObjPoolCBReset cb_reset, + AVObjPoolCBFree cb_free); +AVObjPool *av_objpool_alloc_packets(void); +AVObjPool *av_objpool_alloc_frames(void); -int objpool_get(ObjPool *op, void **obj); -void objpool_release(ObjPool *op, void **obj); +int av_objpool_get(AVObjPool *op, void **obj); +void av_objpool_release(AVObjPool *op, void **obj); -#endif // FFTOOLS_OBJPOOL_H +#endif // AVUTIL_OBJPOOL_H