virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

lavfi/select: make select_frame() return void

Browse Source 
Set select->select internally to the function, avoid lossy double->int
conversion causing spurious frame drop (e.g. in case the evaluation
result is positive and less than 1).
This commit is contained in:
Stefano Sabatini
2013-04-15 18:28:57 +02:00
parent 0b3bd78714
commit 565c50ac7b
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/f_select.c
View File

@@ -247,7 +247,7 @@ static double get_scene_score(AVFilterContext *ctx, AVFrame *frame)
#define D2TS(d) (isnan(d) ? AV_NOPTS_VALUE : (int64_t)(d)) #define D2TS(d) (isnan(d) ? AV_NOPTS_VALUE : (int64_t)(d))
#define TS2D(ts) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts)) #define TS2D(ts) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts))
static int select_frame(AVFilterContext *ctx, AVFrame *frame) static void select_frame(AVFilterContext *ctx, AVFrame *frame)
{ {
SelectContext *select = ctx->priv; SelectContext *select = ctx->priv;
AVFilterLink *inlink = ctx->inputs[0]; AVFilterLink *inlink = ctx->inputs[0];
@@ -284,7 +284,7 @@ static int select_frame(AVFilterContext *ctx, AVFrame *frame)
break; break;
} }
res = av_expr_eval(select->expr, select->var_values, NULL); select->select = res = av_expr_eval(select->expr, select->var_values, NULL);
av_log(inlink->dst, AV_LOG_DEBUG, av_log(inlink->dst, AV_LOG_DEBUG,
"n:%f pts:%f t:%f key:%d", "n:%f pts:%f t:%f key:%d",
select->var_values[VAR_N], select->var_values[VAR_N],
@@ -322,15 +322,13 @@ static int select_frame(AVFilterContext *ctx, AVFrame *frame)
select->var_values[VAR_N] += 1.0; select->var_values[VAR_N] += 1.0;
select->var_values[VAR_PREV_PTS] = select->var_values[VAR_PTS]; select->var_values[VAR_PREV_PTS] = select->var_values[VAR_PTS];
select->var_values[VAR_PREV_T] = select->var_values[VAR_T]; select->var_values[VAR_PREV_T] = select->var_values[VAR_T];
return res;
} }
static int filter_frame(AVFilterLink *inlink, AVFrame *frame) static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
{ {
SelectContext *select = inlink->dst->priv; SelectContext *select = inlink->dst->priv;
select->select = select_frame(inlink->dst, frame); select_frame(inlink->dst, frame);
if (select->select) if (select->select)
return ff_filter_frame(inlink->dst->outputs[0], frame); return ff_filter_frame(inlink->dst->outputs[0], frame);