On Fri, Dec 11, 2015 at 7:07 PM, Michael Niedermayer <michae...@gmx.at>
wrote:
> On Fri, Dec 11, 2015 at 01:32:46PM +0100, Matthieu Bouron wrote:
> > From: Matthieu Bouron <matthieu.bou...@stupeflix.com>
> >
> > ---
> > libavutil/frame.c | 153
> +++++++++++++++++++++++++++++++++++++++++++++
> > libavutil/frame.h | 56 +++++++++++++++++
> > libavutil/frame_internal.h | 37 +++++++++++
> > 3 files changed, 246 insertions(+)
> > create mode 100644 libavutil/frame_internal.h
>
>
> make distclean ; ./configure --enable-shared --cc=clang && make -j12
>
> in file included from libavutil/frame.c:26:
> libavutil/frame_internal.h:35:3: error: redefinition of typedef
> 'AVVideoFramePool' is invalid in C [-Wtypedef-redefinition]
> } AVVideoFramePool;
> ^
> libavutil/frame.h:718:33: note: previous definition is here
> typedef struct AVVideoFramePool AVVideoFramePool;
> ^
> 1 error generated.
> make: *** [libavutil/frame.o] Error 1
> make: *** Waiting for unfinished jobs....
>
>
Fixed, new patch attached.
Thanks.
[...]
From 1d8bd643699f78cea70e647cc584b012d9d77df1 Mon Sep 17 00:00:00 2001
From: Matthieu Bouron <matthieu.bou...@stupeflix.com>
Date: Fri, 11 Dec 2015 09:55:27 +0100
Subject: [PATCH 1/2] lavu: add AVVideoFramePool
---
libavutil/frame.c | 153 +++++++++++++++++++++++++++++++++++++++++++++
libavutil/frame.h | 56 +++++++++++++++++
libavutil/frame_internal.h | 37 +++++++++++
3 files changed, 246 insertions(+)
create mode 100644 libavutil/frame_internal.h
diff --git a/libavutil/frame.c b/libavutil/frame.c
index f2097e9..8112993 100644
--- a/libavutil/frame.c
+++ b/libavutil/frame.c
@@ -23,8 +23,10 @@
#include "common.h"
#include "dict.h"
#include "frame.h"
+#include "frame_internal.h"
#include "imgutils.h"
#include "mem.h"
+#include "pixfmt.h"
#include "samplefmt.h"
MAKE_ACCESSORS(AVFrame, frame, int64_t, best_effort_timestamp)
@@ -732,3 +734,154 @@ const char *av_frame_side_data_name(enum AVFrameSideDataType type)
}
return NULL;
}
+
+AVVideoFramePool *av_video_frame_pool_init(AVBufferRef* (*alloc)(int size),
+ int width,
+ int height,
+ enum AVPixelFormat format,
+ int align)
+{
+ int i, ret;
+ AVVideoFramePool *pool;
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(format);
+
+ if (!desc)
+ return NULL;
+
+ pool = av_mallocz(sizeof(AVVideoFramePool));
+ if (!pool)
+ return NULL;
+
+ pool->width = width;
+ pool->height = height;
+ pool->format = format;
+ pool->align = align;
+
+ if ((ret = av_image_check_size(width, height, 0, NULL)) < 0) {
+ goto fail;
+ }
+
+ if (!pool->linesize[0]) {
+ for(i = 1; i <= align; i += i) {
+ ret = av_image_fill_linesizes(pool->linesize, pool->format,
+ FFALIGN(pool->width, i));
+ if (ret < 0) {
+ goto fail;
+ }
+ if (!(pool->linesize[0] & (pool->align - 1)))
+ break;
+ }
+
+ for (i = 0; i < 4 && pool->linesize[i]; i++) {
+ pool->linesize[i] = FFALIGN(pool->linesize[i], pool->align);
+ }
+ }
+
+ for (i = 0; i < 4 && pool->linesize[i]; i++) {
+ int h = FFALIGN(pool->height, 32);
+ if (i == 1 || i == 2)
+ h = FF_CEIL_RSHIFT(h, desc->log2_chroma_h);
+
+ pool->pools[i] = av_buffer_pool_init(pool->linesize[i] * h + 16 + 16 - 1,
+ alloc);
+ if (!pool->pools[i])
+ goto fail;
+ }
+
+ if (desc->flags & AV_PIX_FMT_FLAG_PAL ||
+ desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) {
+ pool->pools[1] = av_buffer_pool_init(AVPALETTE_SIZE, alloc);
+ if (!pool->pools[1])
+ goto fail;
+ }
+
+ return pool;
+
+fail:
+ av_video_frame_pool_uninit(&pool);
+ return NULL;
+}
+
+int av_video_frame_pool_get_config(AVVideoFramePool *pool,
+ int *width,
+ int *height,
+ enum AVPixelFormat *format,
+ int *align)
+{
+ if (!pool)
+ return AVERROR(EINVAL);
+
+ *width = pool->width;
+ *height = pool->height;
+ *format = pool->format;
+ *align = pool->align;
+
+ return 0;
+}
+
+
+AVFrame *av_video_frame_pool_get(AVVideoFramePool *pool)
+{
+ int i;
+ AVFrame *frame;
+ const AVPixFmtDescriptor *desc;
+
+ frame = av_frame_alloc();
+ if (!frame) {
+ return NULL;
+ }
+
+ desc = av_pix_fmt_desc_get(pool->format);
+ if (!desc) {
+ goto fail;
+ }
+
+ frame->width = pool->width;
+ frame->height = pool->height;
+ frame->format = pool->format;
+
+ for (i = 0; i < 4; i++) {
+ frame->linesize[i] = pool->linesize[i];
+ if (!pool->pools[i])
+ break;
+
+ frame->buf[i] = av_buffer_pool_get(pool->pools[i]);
+ if (!frame->buf[i]) {
+ goto fail;
+ }
+
+ frame->data[i] = frame->buf[i]->data;
+ }
+
+ if (desc->flags & AV_PIX_FMT_FLAG_PAL ||
+ desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) {
+ enum AVPixelFormat format =
+ pool->format == AV_PIX_FMT_PAL8 ? AV_PIX_FMT_BGR8 : pool->format;
+
+ av_assert0(frame->data[1] != NULL);
+ if (avpriv_set_systematic_pal2((uint32_t *)frame->data[1], format) < 0) {
+ goto fail;
+ }
+ }
+
+ frame->extended_data = frame->data;
+
+ return frame;
+fail:
+ av_frame_free(&frame);
+ return NULL;
+}
+
+void av_video_frame_pool_uninit(AVVideoFramePool **pool)
+{
+ int i;
+
+ if (!pool || !*pool)
+ return;
+
+ for (i = 0; i < 4; i++) {
+ av_buffer_pool_uninit(&(*pool)->pools[i]);
+ }
+
+ av_freep(pool);
+}
diff --git a/libavutil/frame.h b/libavutil/frame.h
index 9c6061a..60a2b17 100644
--- a/libavutil/frame.h
+++ b/libavutil/frame.h
@@ -710,4 +710,60 @@ const char *av_frame_side_data_name(enum AVFrameSideDataType type);
* @}
*/
+/**
+ * Video frame pool. This structure is opaque and not meant to be accessed
+ * directly. It is allocated with av_video_frame_pool_init() and freed with
+ * av_video_frame_pool_uninit().
+ */
+typedef struct AVVideoFramePool AVVideoFramePool;
+
+/**
+ * Allocate and initialize a video frame pool.
+ *
+ * @param alloc a function that will be used to allocate new frame buffers when
+ * the pool is empty. May be NULL, then the default allocator will be used
+ * (av_buffer_alloc()).
+ * @param width width of each frame in this pool
+ * @param height height of each frame in this pool
+ * @param format format of each frame in this pool
+ * @param align buffers alignement of each frame in this pool
+ * @return newly created video frame pool on success, NULL on error.
+ */
+AVVideoFramePool *av_video_frame_pool_init(AVBufferRef* (*alloc)(int size),
+ int width,
+ int height,
+ enum AVPixelFormat format,
+ int align);
+
+/**
+ * Deallocate the video frame pool. It is safe to call this function while
+ * some of the allocated video frame are still in use.
+ *
+ * @param pool pointer to the video frame pool to be freed. It will be set to NULL.
+ */
+void av_video_frame_pool_uninit(AVVideoFramePool **pool);
+
+/**
+ * Get the video frame pool configuration.
+ *
+ * @param width width of each frame in this pool
+ * @param height height of each frame in this pool
+ * @param format format of each frame in this pool
+ * @param align buffers alignement of each frame in this pool
+ * @return 0 on success, a negative AVERROR otherwise.
+ */
+int av_video_frame_pool_get_config(AVVideoFramePool *pool,
+ int *width,
+ int *height,
+ enum AVPixelFormat *format,
+ int *align);
+
+/**
+ * Allocate a new AVFrame, reussing old buffers from the pool when available.
+ * This function may be called simultaneously from multiple threads.
+ *
+ * @return a new AVFrame on success, NULL on error.
+ */
+AVFrame *av_video_frame_pool_get(AVVideoFramePool *pool);
+
#endif /* AVUTIL_FRAME_H */
diff --git a/libavutil/frame_internal.h b/libavutil/frame_internal.h
new file mode 100644
index 0000000..56ff0f6
--- /dev/null
+++ b/libavutil/frame_internal.h
@@ -0,0 +1,37 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * Copyright (c) 2015 Matthieu Bouron <matthieu.bouron stupeflix.com>
+ *
+ * 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 AVUTIL_FRAME_INTERNAL_H
+#define AVUTIL_FRAME_INTERNAL_H
+
+#include "buffer.h"
+
+struct AVVideoFramePool {
+
+ int width;
+ int height;
+ int format;
+ int align;
+ int linesize[4];
+ AVBufferPool *pools[4];
+
+};
+
+#endif /* AVUTIL_FRAME_INTERNAL_H */
--
2.6.3
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
