---
doc/filters.texi | 3 ---
libavfilter/vf_select.c | 45 +++++++++++++++++++++------------------------
2 files changed, 21 insertions(+), 27 deletions(-)
diff --git a/doc/filters.texi b/doc/filters.texi
index e41d24a..9a02926 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -1757,9 +1757,6 @@ the frame is bottom-field-first
@item key
1 if the filtered frame is a key-frame, 0 otherwise
-@item pos
-the position in the file of the filtered frame, -1 if the information
-is not available (e.g. for synthetic video)
@end table
The default value of the select expression is "1".
diff --git a/libavfilter/vf_select.c b/libavfilter/vf_select.c
index 674151d..7839e44 100644
--- a/libavfilter/vf_select.c
+++ b/libavfilter/vf_select.c
@@ -108,7 +108,6 @@ enum var_name {
VAR_PREV_SELECTED_N,
VAR_KEY,
- VAR_POS,
VAR_VARS_NB
};
@@ -134,7 +133,7 @@ static av_cold int init(AVFilterContext *ctx, const char
*args)
return ret;
}
- select->pending_frames =
av_fifo_alloc(FIFO_SIZE*sizeof(AVFilterBufferRef*));
+ select->pending_frames = av_fifo_alloc(FIFO_SIZE*sizeof(AVFrame*));
if (!select->pending_frames) {
av_log(ctx, AV_LOG_ERROR, "Failed to allocate pending frames
buffer.\n");
return AVERROR(ENOMEM);
@@ -181,35 +180,33 @@ static int config_input(AVFilterLink *inlink)
#define D2TS(d) (isnan(d) ? AV_NOPTS_VALUE : (int64_t)(d))
#define TS2D(ts) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts))
-static int select_frame(AVFilterContext *ctx, AVFilterBufferRef *picref)
+static int select_frame(AVFilterContext *ctx, AVFrame *frame)
{
SelectContext *select = ctx->priv;
AVFilterLink *inlink = ctx->inputs[0];
double res;
if (isnan(select->var_values[VAR_START_PTS]))
- select->var_values[VAR_START_PTS] = TS2D(picref->pts);
+ select->var_values[VAR_START_PTS] = TS2D(frame->pts);
if (isnan(select->var_values[VAR_START_T]))
- select->var_values[VAR_START_T] = TS2D(picref->pts) *
av_q2d(inlink->time_base);
+ select->var_values[VAR_START_T] = TS2D(frame->pts) *
av_q2d(inlink->time_base);
- select->var_values[VAR_PTS] = TS2D(picref->pts);
- select->var_values[VAR_T ] = TS2D(picref->pts) *
av_q2d(inlink->time_base);
- select->var_values[VAR_POS] = picref->pos == -1 ? NAN : picref->pos;
- select->var_values[VAR_PREV_PTS] = TS2D(picref ->pts);
+ select->var_values[VAR_PTS] = TS2D(frame->pts);
+ select->var_values[VAR_T ] = TS2D(frame->pts) * av_q2d(inlink->time_base);
+ select->var_values[VAR_PREV_PTS] = TS2D(frame->pts);
select->var_values[VAR_INTERLACE_TYPE] =
- !picref->video->interlaced ? INTERLACE_TYPE_P :
- picref->video->top_field_first ? INTERLACE_TYPE_T : INTERLACE_TYPE_B;
- select->var_values[VAR_PICT_TYPE] = picref->video->pict_type;
+ !frame->interlaced_frame ? INTERLACE_TYPE_P :
+ frame->top_field_first ? INTERLACE_TYPE_T : INTERLACE_TYPE_B;
+ select->var_values[VAR_PICT_TYPE] = frame->pict_type;
res = av_expr_eval(select->expr, select->var_values, NULL);
av_log(inlink->dst, AV_LOG_DEBUG,
- "n:%d pts:%d t:%f pos:%d interlace_type:%c key:%d pict_type:%c "
+ "n:%d pts:%d t:%f interlace_type:%c key:%d pict_type:%c "
"-> select:%f\n",
(int)select->var_values[VAR_N],
(int)select->var_values[VAR_PTS],
select->var_values[VAR_T],
- (int)select->var_values[VAR_POS],
select->var_values[VAR_INTERLACE_TYPE] == INTERLACE_TYPE_P ? 'P' :
select->var_values[VAR_INTERLACE_TYPE] == INTERLACE_TYPE_T ? 'T' :
select->var_values[VAR_INTERLACE_TYPE] == INTERLACE_TYPE_B ? 'B' :
'?',
@@ -228,7 +225,7 @@ static int select_frame(AVFilterContext *ctx,
AVFilterBufferRef *picref)
return res;
}
-static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *frame)
+static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
{
SelectContext *select = inlink->dst->priv;
@@ -239,7 +236,7 @@ static int filter_frame(AVFilterLink *inlink,
AVFilterBufferRef *frame)
if (!av_fifo_space(select->pending_frames)) {
av_log(inlink->dst, AV_LOG_ERROR,
"Buffering limit reached, cannot cache more frames\n");
- avfilter_unref_bufferp(&frame);
+ av_frame_free(&frame);
} else
av_fifo_generic_write(select->pending_frames, &frame,
sizeof(frame), NULL);
@@ -248,7 +245,7 @@ static int filter_frame(AVFilterLink *inlink,
AVFilterBufferRef *frame)
return ff_filter_frame(inlink->dst->outputs[0], frame);
}
- avfilter_unref_bufferp(&frame);
+ av_frame_free(&frame);
return 0;
}
@@ -260,10 +257,10 @@ static int request_frame(AVFilterLink *outlink)
select->select = 0;
if (av_fifo_size(select->pending_frames)) {
- AVFilterBufferRef *picref;
+ AVFrame *frame;
- av_fifo_generic_read(select->pending_frames, &picref, sizeof(picref),
NULL);
- return ff_filter_frame(outlink, picref);
+ av_fifo_generic_read(select->pending_frames, &frame, sizeof(frame),
NULL);
+ return ff_filter_frame(outlink, frame);
}
while (!select->select) {
@@ -294,20 +291,20 @@ static int poll_frame(AVFilterLink *outlink)
select->cache_frames = 0;
}
- return av_fifo_size(select->pending_frames)/sizeof(AVFilterBufferRef *);
+ return av_fifo_size(select->pending_frames)/sizeof(AVFrame*);
}
static av_cold void uninit(AVFilterContext *ctx)
{
SelectContext *select = ctx->priv;
- AVFilterBufferRef *picref;
+ AVFrame *frame;
av_expr_free(select->expr);
select->expr = NULL;
while (select->pending_frames &&
- av_fifo_generic_read(select->pending_frames, &picref,
sizeof(picref), NULL) == sizeof(picref))
- avfilter_unref_buffer(picref);
+ av_fifo_generic_read(select->pending_frames, &frame, sizeof(frame),
NULL) == sizeof(frame))
+ av_frame_free(&frame);
av_fifo_free(select->pending_frames);
select->pending_frames = NULL;
}
--
1.7.10.4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
