har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vsrc_buffer: remove dependency on AVFrame

Browse Source 
Rename av_vsrc_buffer_add_frame to
av_vsrc_buffer_add_video_buffer_ref(), and change its inteface to make
it accept in input an AVFilterBufferRef rather than an AVFrame.

This way the interface can be used without requiring the
inclusion/installation of libavcodec headers.
This commit is contained in:
Stefano Sabatini 2011-05-07 21:35:08 +02:00
parent 3c7650a83d
commit 6070b7e1c5
3 changed files with 35 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ffmpeg.c
View File

@ -1643,13 +1643,20 @@ static int output_packet(AVInputStream *ist, int ist_index,
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
if(ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { if(ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
for(i=0;i<nb_ostreams;i++) { for(i=0;i<nb_ostreams;i++) {
AVFilterBufferRef *picref;
ost = ost_table[i]; ost = ost_table[i];
if (ost->input_video_filter && ost->source_index == ist_index) { if (ost->input_video_filter && ost->source_index == ist_index) {
if (!picture.sample_aspect_ratio.num) if (!picture.sample_aspect_ratio.num)
picture.sample_aspect_ratio = ist->st->sample_aspect_ratio; picture.sample_aspect_ratio = ist->st->sample_aspect_ratio;
picture.pts = ist->pts; picture.pts = ist->pts;
// add it to be filtered
av_vsrc_buffer_add_frame2(ost->input_video_filter, &picture, ""); //TODO user setable params picref = avfilter_get_video_buffer_ref_from_arrays(
picture.data, picture.linesize, AV_PERM_WRITE,
picture.width, picture.height, picture.format);
avfilter_copy_frame_props(picref, &picture);
av_vsrc_buffer_add_video_buffer_ref2(ost->input_video_filter, picref, ""); //TODO user setable params
picref->buf->data[0] = NULL;
avfilter_unref_buffer(picref);
} }
} }
} }

55
libavfilter/vsrc_buffer.c
View File

@ -29,8 +29,7 @@
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
typedef struct { typedef struct {
AVFrame frame; AVFilterBufferRef *picref;
int has_frame;
int h, w; int h, w;
enum PixelFormat pix_fmt; enum PixelFormat pix_fmt;
AVRational time_base; ///< time_base to set in the output link AVRational time_base; ///< time_base to set in the output link
@ -38,13 +37,14 @@ typedef struct {
char sws_param[256]; char sws_param[256];
} BufferSourceContext; } BufferSourceContext;
int av_vsrc_buffer_add_frame2(AVFilterContext *buffer_filter, AVFrame *frame, int av_vsrc_buffer_add_video_buffer_ref2(AVFilterContext *buffer_filter, AVFilterBufferRef *picref,
const char *sws_param) const char *sws_param)
{ {
BufferSourceContext *c = buffer_filter->priv; BufferSourceContext *c = buffer_filter->priv;
AVFilterLink *outlink = buffer_filter->outputs[0];
int ret; int ret;
if (c->has_frame) { if (c->picref) {
av_log(buffer_filter, AV_LOG_ERROR, av_log(buffer_filter, AV_LOG_ERROR,
"Buffering several frames is not supported. " "Buffering several frames is not supported. "
"Please consume all available frames before adding a new one.\n" "Please consume all available frames before adding a new one.\n"
@ -56,14 +56,14 @@ int av_vsrc_buffer_add_frame2(AVFilterContext *buffer_filter, AVFrame *frame,
snprintf(c->sws_param, 255, "%d:%d:%s", c->w, c->h, sws_param); snprintf(c->sws_param, 255, "%d:%d:%s", c->w, c->h, sws_param);
} }
if (frame->width != c->w || frame->height != c->h || frame->format != c->pix_fmt) { if (picref->video->w != c->w || picref->video->h != c->h || picref->format != c->pix_fmt) {
AVFilterContext *scale= buffer_filter->outputs[0]->dst; AVFilterContext *scale= buffer_filter->outputs[0]->dst;
AVFilterLink *link; AVFilterLink *link;
av_log(buffer_filter, AV_LOG_INFO, av_log(buffer_filter, AV_LOG_INFO,
"Buffer video input changed from size:%dx%d fmt:%s to size:%dx%d fmt:%s\n", "Buffer video input changed from size:%dx%d fmt:%s to size:%dx%d fmt:%s\n",
c->w, c->h, av_pix_fmt_descriptors[c->pix_fmt].name, c->w, c->h, av_pix_fmt_descriptors[c->pix_fmt].name,
frame->width, frame->height, av_pix_fmt_descriptors[frame->format].name); picref->video->w, picref->video->h, av_pix_fmt_descriptors[picref->format].name);
if(!scale || strcmp(scale->filter->name,"scale")){ if(!scale || strcmp(scale->filter->name,"scale")){
AVFilter *f= avfilter_get_by_name("scale"); AVFilter *f= avfilter_get_by_name("scale");
@ -89,26 +89,28 @@ int av_vsrc_buffer_add_frame2(AVFilterContext *buffer_filter, AVFrame *frame,
scale->filter->init(scale, c->sws_param, NULL); scale->filter->init(scale, c->sws_param, NULL);
} }
c->pix_fmt = scale->inputs[0]->format = frame->format; c->pix_fmt = scale->inputs[0]->format = picref->format;
c->w = scale->inputs[0]->w = frame->width; c->w = scale->inputs[0]->w = picref->video->w;
c->h = scale->inputs[0]->h = frame->height; c->h = scale->inputs[0]->h = picref->video->h;
link= scale->outputs[0]; link= scale->outputs[0];
if ((ret = link->srcpad->config_props(link)) < 0) if ((ret = link->srcpad->config_props(link)) < 0)
return ret; return ret;
} }
c->frame = *frame; c->picref = avfilter_get_video_buffer(outlink, AV_PERM_WRITE,
memcpy(c->frame.data , frame->data , sizeof(frame->data)); picref->video->w, picref->video->h);
memcpy(c->frame.linesize, frame->linesize, sizeof(frame->linesize)); av_image_copy(c->picref->data, c->picref->linesize,
c->has_frame = 1; picref->data, picref->linesize,
picref->format, picref->video->w, picref->video->h);
avfilter_copy_buffer_ref_props(c->picref, picref);
return 0; return 0;
} }
int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame) int av_vsrc_buffer_add_video_buffer_ref(AVFilterContext *buffer_filter, AVFilterBufferRef *picref)
{ {
return av_vsrc_buffer_add_frame2(buffer_filter, frame, ""); return av_vsrc_buffer_add_video_buffer_ref2(buffer_filter, picref, "");
} }
static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque) static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
@ -164,31 +166,18 @@ static int config_props(AVFilterLink *link)
static int request_frame(AVFilterLink *link) static int request_frame(AVFilterLink *link)
{ {
BufferSourceContext *c = link->src->priv; BufferSourceContext *c = link->src->priv;
AVFilterBufferRef *picref;
if (!c->has_frame) { if (!c->picref) {
av_log(link->src, AV_LOG_ERROR, av_log(link->src, AV_LOG_ERROR,
"request_frame() called with no available frame!\n"); "request_frame() called with no available frame!\n");
//return -1; //return -1;
} }
/* This picture will be needed unmodified later for decoding the next avfilter_start_frame(link, avfilter_ref_buffer(c->picref, ~0));
* frame */
picref = avfilter_get_video_buffer(link, AV_PERM_WRITE | AV_PERM_PRESERVE |
AV_PERM_REUSE2,
link->w, link->h);
av_image_copy(picref->data, picref->linesize,
c->frame.data, c->frame.linesize,
picref->format, link->w, link->h);
avfilter_copy_frame_props(picref, &c->frame);
avfilter_start_frame(link, avfilter_ref_buffer(picref, ~0));
avfilter_draw_slice(link, 0, link->h, 1); avfilter_draw_slice(link, 0, link->h, 1);
avfilter_end_frame(link); avfilter_end_frame(link);
avfilter_unref_buffer(picref); avfilter_unref_buffer(c->picref);
c->picref = NULL;
c->has_frame = 0;
return 0; return 0;
} }
@ -196,7 +185,7 @@ static int request_frame(AVFilterLink *link)
static int poll_frame(AVFilterLink *link) static int poll_frame(AVFilterLink *link)
{ {
BufferSourceContext *c = link->src->priv; BufferSourceContext *c = link->src->priv;
return !!(c->has_frame); return !!(c->picref);
} }
AVFilter avfilter_vsrc_buffer = { AVFilter avfilter_vsrc_buffer = {

5
libavfilter/vsrc_buffer.h
View File

@ -27,12 +27,11 @@
* memory buffer source API for video * memory buffer source API for video
*/ */
#include "libavcodec/avcodec.h" /* AVFrame */
#include "avfilter.h" #include "avfilter.h"
int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame); int av_vsrc_buffer_add_video_buffer_ref(AVFilterContext *buffer_filter, AVFilterBufferRef *picref);
int av_vsrc_buffer_add_frame2(AVFilterContext *buffer_filter, AVFrame *frame, int av_vsrc_buffer_add_video_buffer_ref2(AVFilterContext *buffer_filter, AVFilterBufferRef *picref,
const char *sws_param); const char *sws_param);
#endif /* AVFILTER_VSRC_BUFFER_H */ #endif /* AVFILTER_VSRC_BUFFER_H */