lavfi: merge all filtering code into ff_filter_frame.

1 files changed, 0 insertions, 201 deletions

diff --git a/libavfilter/video.c b/libavfilter/video.c
index bd2d32a191..a493204df2 100644
--- a/libavfilter/video.c
+++ b/libavfilter/video.c
@@ -158,204 +158,3 @@ AVFilterBufferRef *ff_get_video_buffer(AVFilterLink *link, int perms, int w, int
 
     return ret;
 }
-
-static int default_start_frame(AVFilterLink *inlink, AVFilterBufferRef *picref)
-{
-    AVFilterLink *outlink = NULL;
-
-    if (inlink->dstpad->filter_frame)
-        return 0;
-
-    if (inlink->dst->nb_outputs)
-        outlink = inlink->dst->outputs[0];
-
-    if (outlink && (inlink->dstpad->start_frame || inlink->dstpad->end_frame)) {
-        AVFilterBufferRef *buf_out;
-        outlink->out_buf = ff_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h);
-        if (!outlink->out_buf)
-            return AVERROR(ENOMEM);
-
-        avfilter_copy_buffer_ref_props(outlink->out_buf, picref);
-        outlink->out_buf->video->w = outlink->w;
-        outlink->out_buf->video->h = outlink->h;
-        buf_out = avfilter_ref_buffer(outlink->out_buf, ~0);
-        if (!buf_out)
-            return AVERROR(ENOMEM);
-
-        return ff_start_frame(outlink, buf_out);
-    }
-    return 0;
-}
-
-static void clear_link(AVFilterLink *link)
-{
-    avfilter_unref_bufferp(&link->cur_buf);
-    avfilter_unref_bufferp(&link->src_buf);
-    avfilter_unref_bufferp(&link->out_buf);
-    link->cur_buf_copy = NULL; /* we do not own the reference */
-}
-
-/* XXX: should we do the duplicating of the picture ref here, instead of
- * forcing the source filter to do it? */
-int ff_start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
-{
-    int (*start_frame)(AVFilterLink *, AVFilterBufferRef *);
-    AVFilterPad *src = link->srcpad;
-    AVFilterPad *dst = link->dstpad;
-    int ret, perms;
-    AVFilterCommand *cmd= link->dst->command_queue;
-    int64_t pts;
-
-    FF_TPRINTF_START(NULL, start_frame); ff_tlog_link(NULL, link, 0); ff_tlog(NULL, " "); ff_tlog_ref(NULL, picref, 1);
-
-    if (strcmp(link->dst->filter->name, "scale")) {
-        av_assert1(picref->format                     == link->format);
-        av_assert1(picref->video->w                   == link->w);
-        av_assert1(picref->video->h                   == link->h);
-    }
-
-    if (link->closed) {
-        avfilter_unref_buffer(picref);
-        return AVERROR_EOF;
-    }
-
-    if (!(start_frame = dst->start_frame))
-        start_frame = default_start_frame;
-
-    av_assert1((picref->perms & src->min_perms) == src->min_perms);
-    picref->perms &= ~ src->rej_perms;
-    perms = picref->perms;
-
-    if (picref->linesize[0] < 0)
-        perms |= AV_PERM_NEG_LINESIZES;
-    /* prepare to copy the picture if it has insufficient permissions */
-    if ((dst->min_perms & perms) != dst->min_perms || dst->rej_perms & perms) {
-        av_log(link->dst, AV_LOG_DEBUG,
-                "frame copy needed (have perms %x, need %x, reject %x)\n",
-                picref->perms,
-                link->dstpad->min_perms, link->dstpad->rej_perms);
-
-        link->cur_buf = ff_get_video_buffer(link, dst->min_perms, link->w, link->h);
-        if (!link->cur_buf) {
-            avfilter_unref_bufferp(&picref);
-            return AVERROR(ENOMEM);
-        }
-
-        link->src_buf = picref;
-        avfilter_copy_buffer_ref_props(link->cur_buf, link->src_buf);
-
-        /* copy palette if required */
-        if (av_pix_fmt_desc_get(link->format)->flags & PIX_FMT_PAL)
-            memcpy(link->cur_buf->data[1], link->src_buf-> data[1], AVPALETTE_SIZE);
-    }
-    else
-        link->cur_buf = picref;
-
-    link->cur_buf_copy = link->cur_buf;
-
-    while(cmd && cmd->time <= picref->pts * av_q2d(link->time_base)){
-        av_log(link->dst, AV_LOG_DEBUG,
-               "Processing command time:%f command:%s arg:%s\n",
-               cmd->time, cmd->command, cmd->arg);
-        avfilter_process_command(link->dst, cmd->command, cmd->arg, 0, 0, cmd->flags);
-        ff_command_queue_pop(link->dst);
-        cmd= link->dst->command_queue;
-    }
-    pts = link->cur_buf->pts;
-    ret = start_frame(link, link->cur_buf);
-    ff_update_link_current_pts(link, pts);
-    if (ret < 0)
-        clear_link(link);
-    else
-        /* incoming buffers must not be freed in start frame,
-           because they can still be in use by the automatic copy mechanism */
-        av_assert1(link->cur_buf_copy->buf->refcount > 0);
-
-    return ret;
-}
-
-static int default_end_frame(AVFilterLink *inlink)
-{
-    AVFilterLink *outlink = NULL;
-
-    if (inlink->dstpad->filter_frame) {
-        int ret = inlink->dstpad->filter_frame(inlink, inlink->cur_buf);
-        inlink->cur_buf = NULL;
-        return ret;
-    }
-
-    if (inlink->dst->nb_outputs)
-        outlink = inlink->dst->outputs[0];
-
-    if (outlink) {
-        if (inlink->dstpad->filter_frame) {
-            int ret = inlink->dstpad->filter_frame(inlink, inlink->cur_buf);
-            inlink->cur_buf = NULL;
-            return ret;
-        } else if (inlink->dstpad->start_frame || inlink->dstpad->end_frame){
-            return ff_end_frame(outlink);
-        } else {
-            int ret = ff_filter_frame(outlink, inlink->cur_buf);
-            inlink->cur_buf = NULL;
-            return ret;
-        }
-    }
-    return 0;
-}
-
-int ff_end_frame(AVFilterLink *link)
-{
-    int (*end_frame)(AVFilterLink *);
-    int ret;
-
-    if (!(end_frame = link->dstpad->end_frame))
-        end_frame = default_end_frame;
-
-    ret = end_frame(link);
-
-    clear_link(link);
-
-    return ret;
-}
-
-int ff_draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
-{
-    uint8_t *src[4], *dst[4];
-    int i, j, vsub;
-
-    FF_TPRINTF_START(NULL, draw_slice); ff_tlog_link(NULL, link, 0); ff_tlog(NULL, " y:%d h:%d dir:%d\n", y, h, slice_dir);
-
-    /* copy the slice if needed for permission reasons */
-    if (link->src_buf) {
-        const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(link->format);
-        vsub = desc->log2_chroma_h;
-
-        for (i = 0; i < 4; i++) {
-            if (link->src_buf->data[i]) {
-                src[i] = link->src_buf-> data[i] +
-                    (y >> (i==1 || i==2 ? vsub : 0)) * link->src_buf-> linesize[i];
-                dst[i] = link->cur_buf_copy->data[i] +
-                    (y >> (i==1 || i==2 ? vsub : 0)) * link->cur_buf_copy->linesize[i];
-            } else
-                src[i] = dst[i] = NULL;
-        }
-
-        for (i = 0; i < 4; i++) {
-            int planew =
-                av_image_get_linesize(link->format, link->cur_buf_copy->video->w, i);
-
-            if (!src[i]) continue;
-
-            for (j = 0; j < h >> (i==1 || i==2 ? vsub : 0); j++) {
-                memcpy(dst[i], src[i], planew);
-                src[i] += link->src_buf->linesize[i];
-                dst[i] += link->cur_buf_copy->linesize[i];
-            }
-        }
-    }
-
-        /* incoming buffers must not be freed in start frame,
-           because they can still be in use by the automatic copy mechanism */
-        av_assert1(link->cur_buf_copy->buf->refcount > 0);
-    return 0;
-}