Commit d7407827 authored by Michael Niedermayer's avatar Michael Niedermayer

avfilter/video: Add ff_default_get_video_buffer2() to set specific alignment

Reviewed-by: 's avatarPaul B Mahol <onemda@gmail.com>
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent a3d790f1
...@@ -38,13 +38,12 @@ AVFrame *ff_null_get_video_buffer(AVFilterLink *link, int w, int h) ...@@ -38,13 +38,12 @@ AVFrame *ff_null_get_video_buffer(AVFilterLink *link, int w, int h)
return ff_get_video_buffer(link->dst->outputs[0], w, h); return ff_get_video_buffer(link->dst->outputs[0], w, h);
} }
AVFrame *ff_default_get_video_buffer(AVFilterLink *link, int w, int h) AVFrame *ff_default_get_video_buffer2(AVFilterLink *link, int w, int h, int align)
{ {
AVFrame *frame = NULL; AVFrame *frame = NULL;
int pool_width = 0; int pool_width = 0;
int pool_height = 0; int pool_height = 0;
int pool_align = 0; int pool_align = 0;
int align = av_cpu_max_align();
enum AVPixelFormat pool_format = AV_PIX_FMT_NONE; enum AVPixelFormat pool_format = AV_PIX_FMT_NONE;
if (link->hw_frames_ctx && if (link->hw_frames_ctx &&
...@@ -94,6 +93,11 @@ AVFrame *ff_default_get_video_buffer(AVFilterLink *link, int w, int h) ...@@ -94,6 +93,11 @@ AVFrame *ff_default_get_video_buffer(AVFilterLink *link, int w, int h)
return frame; return frame;
} }
AVFrame *ff_default_get_video_buffer(AVFilterLink *link, int w, int h)
{
return ff_default_get_video_buffer2(link, w, h, av_cpu_max_align());
}
AVFrame *ff_get_video_buffer(AVFilterLink *link, int w, int h) AVFrame *ff_get_video_buffer(AVFilterLink *link, int w, int h)
{ {
AVFrame *ret = NULL; AVFrame *ret = NULL;
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include "avfilter.h" #include "avfilter.h"
AVFrame *ff_default_get_video_buffer(AVFilterLink *link, int w, int h); AVFrame *ff_default_get_video_buffer(AVFilterLink *link, int w, int h);
AVFrame *ff_default_get_video_buffer2(AVFilterLink *link, int w, int h, int align);
AVFrame *ff_null_get_video_buffer(AVFilterLink *link, int w, int h); AVFrame *ff_null_get_video_buffer(AVFilterLink *link, int w, int h);
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment