highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '7433feb82f75827884d909de34d341a1c4401d4a'

Browse Source 
* commit '7433feb82f75827884d909de34d341a1c4401d4a':
  lavfi: Make default get_video_buffer work with hardware frames

Merged-by: Matthieu Bouron <matthieu.bouron@gmail.com>
This commit is contained in:
Matthieu Bouron
2017-03-29 23:11:10 +02:00
parent 247d0339ca 7433feb82f
commit b265e5ba50
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libavfilter/video.c
View File

@@ -25,6 +25,7 @@
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libavutil/buffer.h" #include "libavutil/buffer.h"
#include "libavutil/hwcontext.h"
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "libavutil/mem.h" #include "libavutil/mem.h"
@@ -47,6 +48,21 @@ AVFrame *ff_default_get_video_buffer(AVFilterLink *link, int w, int h)
int pool_align = 0; int pool_align = 0;
enum AVPixelFormat pool_format = AV_PIX_FMT_NONE; 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) { if (!link->frame_pool) {
link->frame_pool = ff_frame_pool_video_init(av_buffer_allocz, w, h, link->frame_pool = ff_frame_pool_video_init(av_buffer_allocz, w, h,
link->format, BUFFER_ALIGN); link->format, BUFFER_ALIGN);