From: Anton Khirnov <anton@khirnov.net> To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 21/35] fftools: add an object pool Date: Thu, 16 Jun 2022 21:55:20 +0200 Message-ID: <20220616195534.5278-21-anton@khirnov.net> (raw) In-Reply-To: <20220616195534.5278-1-anton@khirnov.net> Allows to avoid constantly allocating and freeing objects like AVFrame or AVPacket. --- fftools/objpool.c | 131 ++++++++++++++++++++++++++++++++++++++++++++++ fftools/objpool.h | 37 +++++++++++++ 2 files changed, 168 insertions(+) create mode 100644 fftools/objpool.c create mode 100644 fftools/objpool.h diff --git a/fftools/objpool.c b/fftools/objpool.c new file mode 100644 index 0000000000..b1561ecd69 --- /dev/null +++ b/fftools/objpool.c @@ -0,0 +1,131 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <stdint.h> + +#include "libavcodec/packet.h" + +#include "libavutil/common.h" +#include "libavutil/error.h" +#include "libavutil/frame.h" +#include "libavutil/mem.h" + +#include "objpool.h" + +struct ObjPool { + void *pool[32]; + unsigned int pool_count; + + ObjPoolCBAlloc alloc; + ObjPoolCBReset reset; + ObjPoolCBFree free; +}; + +ObjPool *objpool_alloc(ObjPoolCBAlloc cb_alloc, ObjPoolCBReset cb_reset, + ObjPoolCBFree cb_free) +{ + ObjPool *op = av_mallocz(sizeof(*op)); + + if (!op) + return NULL; + + op->alloc = cb_alloc; + op->reset = cb_reset; + op->free = cb_free; + + return op; +} + +void objpool_free(ObjPool **pop) +{ + ObjPool *op = *pop; + + if (!op) + return; + + for (unsigned int i = 0; i < op->pool_count; i++) + op->free(&op->pool[i]); + + av_freep(pop); +} + +int objpool_get(ObjPool *op, void **obj) +{ + if (op->pool_count) { + *obj = op->pool[--op->pool_count]; + op->pool[op->pool_count] = NULL; + } else + *obj = op->alloc(); + + return *obj ? 0 : AVERROR(ENOMEM); +} + +void objpool_release(ObjPool *op, void **obj) +{ + if (!*obj) + return; + + op->reset(*obj); + + if (op->pool_count < FF_ARRAY_ELEMS(op->pool)) + op->pool[op->pool_count++] = *obj; + else + op->free(obj); + + *obj = NULL; +} + +static void *alloc_packet(void) +{ + return av_packet_alloc(); +} +static void *alloc_frame(void) +{ + return av_frame_alloc(); +} + +static void reset_packet(void *obj) +{ + return av_packet_unref(obj); +} +static void reset_frame(void *obj) +{ + return av_frame_unref(obj); +} + +static void free_packet(void **obj) +{ + AVPacket *pkt = *obj; + av_packet_free(&pkt); + *obj = NULL; +} +static void free_frame(void **obj) +{ + AVFrame *frame = *obj; + av_frame_free(&frame); + *obj = NULL; +} + +ObjPool *objpool_alloc_packets(void) +{ + return objpool_alloc(alloc_packet, reset_packet, free_packet); +} +ObjPool *objpool_alloc_frames(void) +{ + return objpool_alloc(alloc_frame, reset_frame, free_frame); +} diff --git a/fftools/objpool.h b/fftools/objpool.h new file mode 100644 index 0000000000..1b2aea6aca --- /dev/null +++ b/fftools/objpool.h @@ -0,0 +1,37 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef FFTOOLS_OBJPOOL_H +#define FFTOOLS_OBJPOOL_H + +typedef struct ObjPool ObjPool; + +typedef void* (*ObjPoolCBAlloc)(void); +typedef void (*ObjPoolCBReset)(void *); +typedef void (*ObjPoolCBFree)(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); + +int objpool_get(ObjPool *op, void **obj); +void objpool_release(ObjPool *op, void **obj); + +#endif // FFTOOLS_OBJPOOL_H -- 2.34.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".
next prev parent reply other threads:[~2022-06-16 20:06 UTC|newest] Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-06-16 19:55 [FFmpeg-devel] [PATCH 01/35] fftools/ffmpeg_mux: add private muxer context Anton Khirnov 2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 02/35] fftools/ffmpeg: add a helper function to access output file size Anton Khirnov 2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 03/35] fftools/ffmpeg: fix the type of limit_filesize Anton Khirnov 2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 04/35] fftools/ffmpeg: refactor limiting output file size with -fs Anton Khirnov 2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 05/35] fftools/ffmpeg: set want_sdp when initializing the muxer Anton Khirnov 2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 06/35] fftools/ffmpeg: write the header for stream-less outputs " Anton Khirnov 2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 07/35] fftools/ffmpeg: move closing the file into of_write_trailer() Anton Khirnov 2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 08/35] fftools/ffmpeg: refactor the code checking for bitexact output Anton Khirnov 2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 09/35] fftools/ffmpeg: access output file chapters through a wrapper Anton Khirnov 2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 10/35] fftools/ffmpeg: do not log to the muxer context Anton Khirnov 2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 11/35] fftools/ffmpeg: move the mux queue into muxer private data Anton Khirnov 2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 12/35] fftools/ffmpeg_mux: split queuing packets into a separate function Anton Khirnov 2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 13/35] fftools/ffmpeg_mux: split of_write_packet() Anton Khirnov 2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 14/35] fftools/ffmpeg: move output file opts into private context Anton Khirnov 2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 15/35] fftools/ffmpeg: move freeing 2pass input stats to a better place Anton Khirnov 2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 16/35] fftools/ffmpeg: use refcounted packets for encoded subtitles Anton Khirnov 2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 17/35] fftools/ffmpeg: do not send spurious EOF for streamcopy when looping Anton Khirnov 2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 18/35] fate/ffmpeg: add a test for interleaving video+subs Anton Khirnov 2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 19/35] fftools/ffmpeg: use last filter output pts to choose next output stream Anton Khirnov 2022-06-17 18:45 ` Michael Niedermayer 2022-06-23 15:32 ` [FFmpeg-devel] [PATCH] " Anton Khirnov 2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 20/35] fftools/ffmpeg: use pre-BSF DTS for choosing next output Anton Khirnov 2022-06-16 19:55 ` Anton Khirnov [this message] 2022-06-16 21:41 ` [FFmpeg-devel] [PATCH 21/35] fftools: add an object pool Andreas Rheinhardt 2022-07-22 15:39 ` [FFmpeg-devel] [PATCH 22/35] " Anton Khirnov 2022-07-22 17:58 ` Andreas Rheinhardt 2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 22/35] fftools/ffmpeg: rework -shortest implementation Anton Khirnov 2022-06-16 21:05 ` Andreas Rheinhardt 2022-06-17 10:25 ` Anton Khirnov 2022-06-23 10:04 ` [FFmpeg-devel] [PATCH] " Anton Khirnov 2022-07-13 10:50 ` Anton Khirnov 2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 23/35] fftools/ffmpeg_mux: reindent Anton Khirnov 2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 24/35] fftools/ffmpeg: use the sync queues to handle -frames Anton Khirnov 2022-06-16 20:33 ` Andreas Rheinhardt 2022-06-17 10:46 ` Anton Khirnov 2022-06-22 8:27 ` Andreas Rheinhardt 2022-06-22 17:26 ` Anton Khirnov 2022-06-23 22:12 ` Michael Niedermayer 2022-07-04 16:11 ` [FFmpeg-devel] [PATCH] " Anton Khirnov 2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 25/35] fftools/ffmpeg: stop using OutputStream.frame_number in print_report() Anton Khirnov 2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 26/35] fftools/ffmpeg: only set OutputStream.frame_number for video encoding Anton Khirnov 2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 27/35] fftools/ffmpeg: make the muxer AVFormatContext private to ffmpeg_mux.c Anton Khirnov 2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 28/35] fftools/ffmpeg_mux: return errors from of_submit_packet() Anton Khirnov 2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 29/35] fftools/ffmpeg_mux: return errors from submit_packet() Anton Khirnov 2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 30/35] fftools/ffmpeg_mux: return errors from write_packet() Anton Khirnov 2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 31/35] fftools/ffmpeg_mux: do not call exit_program() in print_sdp() Anton Khirnov 2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 32/35] fftools/ffmpeg: stop using av_stream_get_end_pts() Anton Khirnov 2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 33/35] fftools/ffmpeg: depend on threads Anton Khirnov 2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 34/35] fftools: add a multistream thread-safe queue Anton Khirnov 2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 35/35] fftools/ffmpeg: move each muxer to a separate thread Anton Khirnov 2022-06-17 10:27 ` [FFmpeg-devel] [PATCH 01/35] fftools/ffmpeg_mux: add private muxer context Anton Khirnov 2022-07-08 16:58 ` Michael Niedermayer 2022-07-13 10:58 ` Anton Khirnov 2022-07-13 22:12 ` Michael Niedermayer 2022-07-14 5:37 ` Anton Khirnov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220616195534.5278-21-anton@khirnov.net \ --to=anton@khirnov.net \ --cc=ffmpeg-devel@ffmpeg.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git