virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Cosmetics: fix style nits.

Browse Source 
Originally committed as revision 25207 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2010-09-26 11:09:43 +00:00
parent 02b424d9c8
commit b0f65613ac
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libavfilter/vf_yadif.c
View File

@ -164,23 +164,24 @@ static AVFilterBufferRef *get_video_buffer(AVFilterLink *link, int perms, int w,
return picref; return picref;
} }
static void return_frame(AVFilterContext *ctx, int is_second){ static void return_frame(AVFilterContext *ctx, int is_second)
{
YADIFContext *yadif = ctx->priv; YADIFContext *yadif = ctx->priv;
AVFilterLink *link= ctx->outputs[0]; AVFilterLink *link= ctx->outputs[0];
int tff = yadif->parity == -1 ? yadif->cur->video->top_field_first : (yadif->parity^1); int tff = yadif->parity == -1 ? yadif->cur->video->top_field_first : (yadif->parity^1);
if(is_second) if (is_second)
yadif->out = avfilter_get_video_buffer(link, AV_PERM_WRITE | AV_PERM_PRESERVE | yadif->out = avfilter_get_video_buffer(link, AV_PERM_WRITE | AV_PERM_PRESERVE |
AV_PERM_REUSE, link->w, link->h); AV_PERM_REUSE, link->w, link->h);
filter(ctx, yadif->out, tff ^ !is_second, tff); filter(ctx, yadif->out, tff ^ !is_second, tff);
if(is_second) if (is_second)
avfilter_start_frame(ctx->outputs[0], yadif->out); avfilter_start_frame(ctx->outputs[0], yadif->out);
avfilter_draw_slice(ctx->outputs[0], 0, link->h, 1); avfilter_draw_slice(ctx->outputs[0], 0, link->h, 1);
avfilter_end_frame(ctx->outputs[0]); avfilter_end_frame(ctx->outputs[0]);
yadif->frame_pending= (yadif->mode&1) && !is_second; yadif->frame_pending = (yadif->mode&1) && !is_second;
} }
static void start_frame(AVFilterLink *link, AVFilterBufferRef *picref) static void start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
@ -188,7 +189,7 @@ static void start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
AVFilterContext *ctx = link->dst; AVFilterContext *ctx = link->dst;
YADIFContext *yadif = ctx->priv; YADIFContext *yadif = ctx->priv;
if(yadif->frame_pending) if (yadif->frame_pending)
return_frame(ctx, 1); return_frame(ctx, 1);
if (yadif->prev) if (yadif->prev)
@ -197,7 +198,7 @@ static void start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
yadif->cur = yadif->next; yadif->cur = yadif->next;
yadif->next = picref; yadif->next = picref;
if(!yadif->cur) if (!yadif->cur)
return; return;
if (!yadif->prev) if (!yadif->prev)
@ -215,7 +216,7 @@ static void end_frame(AVFilterLink *link)
AVFilterContext *ctx = link->dst; AVFilterContext *ctx = link->dst;
YADIFContext *yadif = ctx->priv; YADIFContext *yadif = ctx->priv;
if(!yadif->out) if (!yadif->out)
return; return;
return_frame(ctx, 0); return_frame(ctx, 0);
@ -226,17 +227,17 @@ static int request_frame(AVFilterLink *link)
AVFilterContext *ctx = link->src; AVFilterContext *ctx = link->src;
YADIFContext *yadif = ctx->priv; YADIFContext *yadif = ctx->priv;
if(yadif->frame_pending){ if (yadif->frame_pending) {
return_frame(ctx, 1); return_frame(ctx, 1);
return 0; return 0;
} }
do{ do {
int ret; int ret;
if ((ret = avfilter_request_frame(link->src->inputs[0]))) if ((ret = avfilter_request_frame(link->src->inputs[0])))
return ret; return ret;
}while(!yadif->cur); } while (!yadif->cur);
return 0; return 0;
} }
@ -246,12 +247,12 @@ static int poll_frame(AVFilterLink *link)
YADIFContext *yadif = link->src->priv; YADIFContext *yadif = link->src->priv;
int ret, val; int ret, val;
if(yadif->frame_pending) if (yadif->frame_pending)
return 1; return 1;
val= avfilter_poll_frame(link->src->inputs[0]); val = avfilter_poll_frame(link->src->inputs[0]);
if(val==1 && !yadif->next){ //FIXME change API to not requre this red tape if (val==1 && !yadif->next) { //FIXME change API to not requre this red tape
if ((ret = avfilter_request_frame(link->src->inputs[0])) < 0) if ((ret = avfilter_request_frame(link->src->inputs[0])) < 0)
return ret; return ret;
val = avfilter_poll_frame(link->src->inputs[0]); val = avfilter_poll_frame(link->src->inputs[0]);