diff options
Diffstat (limited to 'libavfilter/trim.c')
-rw-r--r-- | libavfilter/trim.c | 60 |
1 files changed, 17 insertions, 43 deletions
diff --git a/libavfilter/trim.c b/libavfilter/trim.c index 9a0544d1d1..29c7c50178 100644 --- a/libavfilter/trim.c +++ b/libavfilter/trim.c @@ -1,18 +1,18 @@ /* - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -69,7 +69,6 @@ typedef struct TrimContext { int64_t next_pts; int eof; - int got_output; } TrimContext; static int init(AVFilterContext *ctx) @@ -89,37 +88,24 @@ static int config_input(AVFilterLink *inlink) inlink->time_base : (AVRational){ 1, inlink->sample_rate }; if (s->start_time != DBL_MAX) { - int64_t start_pts = lrintf(s->start_time / av_q2d(tb)); + int64_t start_pts = lrint(s->start_time / av_q2d(tb)); if (s->start_pts == AV_NOPTS_VALUE || start_pts < s->start_pts) s->start_pts = start_pts; } if (s->end_time != DBL_MAX) { - int64_t end_pts = lrintf(s->end_time / av_q2d(tb)); + int64_t end_pts = lrint(s->end_time / av_q2d(tb)); if (s->end_pts == AV_NOPTS_VALUE || end_pts > s->end_pts) s->end_pts = end_pts; } if (s->duration) - s->duration_tb = lrintf(s->duration / av_q2d(tb)); + s->duration_tb = lrint(s->duration / av_q2d(tb)); return 0; } -static int request_frame(AVFilterLink *outlink) +static int config_output(AVFilterLink *outlink) { - AVFilterContext *ctx = outlink->src; - TrimContext *s = ctx->priv; - int ret; - - s->got_output = 0; - while (!s->got_output) { - if (s->eof) - return AVERROR_EOF; - - ret = ff_request_frame(ctx->inputs[0]); - if (ret < 0) - return ret; - } - + outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP; return 0; } @@ -176,13 +162,12 @@ static int trim_filter_frame(AVFilterLink *inlink, AVFrame *frame) drop = 0; if (drop) { - s->eof = 1; + s->eof = inlink->closed = 1; goto drop; } } s->nb_frames++; - s->got_output = 1; return ff_filter_frame(ctx->outputs[0], frame); @@ -192,7 +177,7 @@ drop: return 0; } -#define FLAGS AV_OPT_FLAG_VIDEO_PARAM +#define FLAGS AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_FILTERING_PARAM static const AVOption trim_options[] = { COMMON_OPTS { "start_frame", "Number of the first frame that should be passed " @@ -203,12 +188,7 @@ static const AVOption trim_options[] = { }; #undef FLAGS -static const AVClass trim_class = { - .class_name = "trim", - .item_name = av_default_item_name, - .option = trim_options, - .version = LIBAVUTIL_VERSION_INT, -}; +AVFILTER_DEFINE_CLASS(trim); static const AVFilterPad trim_inputs[] = { { @@ -224,7 +204,7 @@ static const AVFilterPad trim_outputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, - .request_frame = request_frame, + .config_props = config_output, }, { NULL } }; @@ -316,7 +296,7 @@ static int atrim_filter_frame(AVFilterLink *inlink, AVFrame *frame) } if (drop) { - s->eof = 1; + s->eof = inlink->closed = 1; goto drop; } } @@ -346,7 +326,6 @@ static int atrim_filter_frame(AVFilterLink *inlink, AVFrame *frame) } else frame->nb_samples = end_sample; - s->got_output = 1; return ff_filter_frame(ctx->outputs[0], frame); drop: @@ -355,7 +334,7 @@ drop: return 0; } -#define FLAGS AV_OPT_FLAG_AUDIO_PARAM +#define FLAGS AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_FILTERING_PARAM static const AVOption atrim_options[] = { COMMON_OPTS { "start_sample", "Number of the first audio sample that should be " @@ -366,12 +345,7 @@ static const AVOption atrim_options[] = { }; #undef FLAGS -static const AVClass atrim_class = { - .class_name = "atrim", - .item_name = av_default_item_name, - .option = atrim_options, - .version = LIBAVUTIL_VERSION_INT, -}; +AVFILTER_DEFINE_CLASS(atrim); static const AVFilterPad atrim_inputs[] = { { @@ -387,7 +361,7 @@ static const AVFilterPad atrim_outputs[] = { { .name = "default", .type = AVMEDIA_TYPE_AUDIO, - .request_frame = request_frame, + .config_props = config_output, }, { NULL } }; |