diff options
Diffstat (limited to 'libavfilter/video.c')
-rw-r--r-- | libavfilter/video.c | 69 |
1 files changed, 49 insertions, 20 deletions
diff --git a/libavfilter/video.c b/libavfilter/video.c index 533946a74c..6f9020b9fe 100644 --- a/libavfilter/video.c +++ b/libavfilter/video.c @@ -1,24 +1,29 @@ /* - * This file is part of Libav. + * Copyright 2007 Bobby Bingham + * Copyright Stefano Sabatini <stefasab gmail com> + * Copyright Vitor Sessak <vitor1001 gmail com> * - * Libav is free software; you can redistribute it and/or + * 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. * - * Libav is distributed in the hope that it will be useful, + * 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 Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include <string.h> #include <stdio.h> +#include "libavutil/avassert.h" #include "libavutil/buffer.h" #include "libavutil/hwcontext.h" #include "libavutil/imgutils.h" @@ -28,43 +33,67 @@ #include "internal.h" #include "video.h" +#define BUFFER_ALIGN 32 + + AVFrame *ff_null_get_video_buffer(AVFilterLink *link, int w, int h) { return ff_get_video_buffer(link->dst->outputs[0], w, h); } -/* TODO: set the buffer's priv member to a context structure for the whole - * filter chain. This will allow for a buffer pool instead of the constant - * alloc & free cycle currently implemented. */ AVFrame *ff_default_get_video_buffer(AVFilterLink *link, int w, int h) { - AVFrame *frame = av_frame_alloc(); - int ret; - - if (!frame) - return NULL; + int pool_width = 0; + int pool_height = 0; + int pool_align = 0; + enum AVPixelFormat pool_format = AV_PIX_FMT_NONE; if (link->hw_frames_ctx && ((AVHWFramesContext*)link->hw_frames_ctx->data)->format == link->format) { + int ret; + AVFrame *frame = av_frame_alloc(); + + if (!frame) + return NULL; + ret = av_hwframe_get_buffer(link->hw_frames_ctx, frame, 0); + if (ret < 0) + av_frame_free(&frame); + + return frame; + } + + if (!link->frame_pool) { + link->frame_pool = ff_frame_pool_video_init(av_buffer_allocz, w, h, + link->format, BUFFER_ALIGN); + if (!link->frame_pool) + return NULL; } else { - frame->width = w; - frame->height = h; - frame->format = link->format; + if (ff_frame_pool_get_video_config(link->frame_pool, + &pool_width, &pool_height, + &pool_format, &pool_align) < 0) { + return NULL; + } + + if (pool_width != w || pool_height != h || + pool_format != link->format || pool_align != BUFFER_ALIGN) { - ret = av_frame_get_buffer(frame, 32); + ff_frame_pool_uninit((FFFramePool **)&link->frame_pool); + link->frame_pool = ff_frame_pool_video_init(av_buffer_allocz, w, h, + link->format, BUFFER_ALIGN); + if (!link->frame_pool) + return NULL; + } } - if (ret < 0) - av_frame_free(&frame); - return frame; + return ff_frame_pool_get(link->frame_pool); } AVFrame *ff_get_video_buffer(AVFilterLink *link, int w, int h) { AVFrame *ret = NULL; - FF_DPRINTF_START(NULL, get_video_buffer); ff_dlog_link(NULL, link, 0); + FF_TPRINTF_START(NULL, get_video_buffer); ff_tlog_link(NULL, link, 0); if (link->dstpad->get_video_buffer) ret = link->dstpad->get_video_buffer(link, w, h); |