From patchwork Sat Apr 2 10:59:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 35135 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp1048495pzb; Sat, 2 Apr 2022 03:57:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyEOZHvmLiE/nYyTfcEnaqw1squxuxJs5kmDYriNqoC0BD0OXf5ROiw75YjCN3JGtXIpAsf X-Received: by 2002:aa7:c251:0:b0:419:13da:368c with SMTP id y17-20020aa7c251000000b0041913da368cmr24598258edo.352.1648897058033; Sat, 02 Apr 2022 03:57:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648897058; cv=none; d=google.com; s=arc-20160816; b=BoyEF7qRhGhVUSC+QAHIxsEDU+zDIbXedgNiHx+tbtbKsVVysBxKQOsiV6ZR4J28kK 9P05K9rzq/9YeUDMZ4rt77Nn+Weummzy9iuHgFLG51zZhBfrT0xeYZUYMTOmk0Spdied 6gtdlzdp+Sx3lZNwD06e+RHD39JpvAims1/IqQSV6QL9hD07y9wGmgTM3fSqjhQPaLGF YVFIxwhWBWS7nej0vcN4P9cGvs0GJmMY57WsYT9UglxBq6zAOEpV6t8204V9Nly2cmi1 mmaIS8+1ODpMcsMvNisNXqRyjRgVXYZc4F7/WL/CcDVUy+2WJs7a6BXoA0Tms9q9TuDI 2Ljg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=RNyYr1TNZy7hn5gIEeeLhWYcL6wx1VTKk0xyNBUDLlw=; b=Q1+G8j7Z1JSJQNsyXsRHjF1X8WEPiuWTqv5JQgantJ7JGx9mE0zqqIItgedaHu3s61 66khk0z8Pk2dJpxtCrRAkUkWSVps9r3GMGHib5Lvc7a4KFYqyvJaJjM7B7GGyDFzv9jr PxRp6/tN1iHcZYPkCGnY+KxcM55C5dOLQMGldTbkA3fk7yVBbACByA43DFNz10wGb1/Q +VjVbBDSFajrrBNVGP4N6zqH8sWVwyC9I7eTH8omEH5x5t8wdE+G/l0kdTn0L+voL4Su Xt+nMgDTnwTG7JfxVEzhQtUKVbOrwcbUyc3nVVAyrdfHTFhPL9zOO/NxIeeLTCS8eVSV xaig== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=qfZnmgpd; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a3-20020a170906468300b006df76385b7esi3068375ejr.30.2022.04.02.03.57.37; Sat, 02 Apr 2022 03:57:38 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=qfZnmgpd; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5FE0F68B258; Sat, 2 Apr 2022 13:57:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ECBCD68AF88 for ; Sat, 2 Apr 2022 13:57:26 +0300 (EEST) Received: by mail-ej1-f41.google.com with SMTP id c10so10627753ejs.13 for ; Sat, 02 Apr 2022 03:57:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=vCjOJHfm+Lmf1j7FWzAv0PO9xpk/1vYAsIoh6wZfypg=; b=qfZnmgpdfwyntpokECrYxy06xo/9jc+fs325lraijGwYSzsSd6vQ/Pc7R8umQMk2EE QPd2QvHXGoTcTbWwwFr1nICdYEeLDYHpvH+2KxZ6Wt9CefASU+2ZakyifCBzdqMiTdBx ZQ0D/VwXk77HHySDFgfGXT11kbzkWu2Zu8tQ24jIKNliCJeWEvW/giDQiff2jvn4XYqE P6Yxrgt93zjoU18SDGrYVGVN9iXDwk5oPTPxCVU5st9eVN4u7os3agRP0yTNCYIO/OrB JS2OkiCg7OQGCPDCLEilymEV0UE5W5liG3Ddder99p3xE1lHtK7b8cmLMg130Cb2Lkj5 lWgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=vCjOJHfm+Lmf1j7FWzAv0PO9xpk/1vYAsIoh6wZfypg=; b=sAgQAW0K8yBhw0F3Tmq+LH5rL/HGBAArnXTvF4FS7ih/6qa+vHiO0XGRkNNmAqqeNg pH2mB9HS0V/9jO0xRDud2LZhtfTW2crEHzAOQmfQQLd5Br8m2aAu0XmOmFhGhlqG1P4s 25UGaz0Dzxi/I2077iKo7j/sKafEfSGUEYJvXQ/7dYVMRsi/hntLgXf1Aj1yTE5xB/Cd cup+hCXNsSG6hHYEKZ3FkaGSR6dWnP776na8cPYqRKxi2M30cGbJNyTDAlgLL5Z+4/51 fOtaKQoASdJJsiuyStIFHTVWtqbBhoku6THgHiNQFeDeweEgEBDOhBlUauZMvUmlpXnj X2+A== X-Gm-Message-State: AOAM531FmkUOA5RkxP+qkGWlJ/vqrFowM7hKuaQ0b1+LUvoQcxmZpVJL 4EkiFIc6rvawonhYe7FTDP0Vc+GB4Dc= X-Received: by 2002:a17:907:d2a:b0:6df:8b4b:2b3b with SMTP id gn42-20020a1709070d2a00b006df8b4b2b3bmr3293189ejc.575.1648897045961; Sat, 02 Apr 2022 03:57:25 -0700 (PDT) Received: from localhost.localdomain ([95.168.118.51]) by smtp.gmail.com with ESMTPSA id u10-20020a170906b10a00b006e1004406easm1988886ejy.93.2022.04.02.03.57.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Apr 2022 03:57:25 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 2 Apr 2022 12:59:33 +0200 Message-Id: <20220402105934.134893-1-onemda@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avfilter/src_movie: switch to activate() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: rMjgGkf+CvIf Signed-off-by: Paul B Mahol --- libavfilter/src_movie.c | 84 ++++++++++++++++++++++++----------------- 1 file changed, 50 insertions(+), 34 deletions(-) diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index 711854c23c..8c7ea5686a 100644 --- a/libavfilter/src_movie.c +++ b/libavfilter/src_movie.c @@ -46,6 +46,7 @@ #include "audio.h" #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "internal.h" #include "video.h" @@ -55,6 +56,7 @@ typedef struct MovieStream { AVCodecContext *codec_ctx; int64_t discontinuity_threshold; int64_t last_pts; + int got_eof; } MovieStream; typedef struct MovieContext { @@ -70,6 +72,8 @@ typedef struct MovieContext { int64_t discontinuity_threshold; int64_t ts_offset; int dec_threads; + int got_eagain; + int got_wanted; AVFormatContext *format_ctx; @@ -100,7 +104,6 @@ static const AVOption movie_options[]= { }; static int movie_config_output_props(AVFilterLink *outlink); -static int movie_request_frame(AVFilterLink *outlink); static AVStream *find_stream(void *log, AVFormatContext *avf, const char *spec) { @@ -314,7 +317,6 @@ static av_cold int movie_common_init(AVFilterContext *ctx) if (!pad.name) return AVERROR(ENOMEM); pad.config_props = movie_config_output_props; - pad.request_frame = movie_request_frame; if ((ret = ff_append_outpad_free_name(ctx, &pad)) < 0) return ret; if ( movie->st[i].st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO && @@ -554,47 +556,61 @@ static int movie_push_frame(AVFilterContext *ctx, unsigned out_id) return 0; } -static int movie_request_frame(AVFilterLink *outlink) +static int activate(AVFilterContext *ctx) { - AVFilterContext *ctx = outlink->src; MovieContext *movie = ctx->priv; - unsigned out_id = FF_OUTLINK_IDX(outlink); + int ret = 0; + + /* check all decoders for available output */ + for (int i = 0; i < ctx->nb_outputs; i++) { + if (ff_outlink_frame_wanted(ctx->outputs[i])) + movie->got_wanted++; + + ret = movie_push_frame(ctx, i); + if (ret == AVERROR(EAGAIN)) + movie->got_eagain++; + else if (ret == AVERROR_EOF) + movie->st[i].got_eof++; + else if (ret < 0) + return ret; + } - while (1) { - int got_eagain = 0, got_eof = 0; - int ret = 0; + if (movie->got_eagain || movie->got_wanted) { + /* all decoders require more input -> read a new packet */ + movie->got_eagain = 0; + movie->got_wanted = 0; + ret = movie_decode_packet(ctx); + if (ret < 0 && ret != AVERROR(EAGAIN)) + return ret; + ff_filter_set_ready(ctx, 100); + return 0; + } else { + int nb_eofs = 0; - /* check all decoders for available output */ for (int i = 0; i < ctx->nb_outputs; i++) { - ret = movie_push_frame(ctx, i); - if (ret == AVERROR(EAGAIN)) - got_eagain++; - else if (ret == AVERROR_EOF) - got_eof++; - else if (ret < 0) - return ret; - else if (i == out_id) - return 0; + if (movie->st[i].got_eof && movie->loop_count == 1) + ff_outlink_set_status(ctx->outputs[i], AVERROR_EOF, movie->st[i].last_pts); + nb_eofs++; } - if (got_eagain) { - /* all decoders require more input -> read a new packet */ - ret = movie_decode_packet(ctx); + if (nb_eofs != ctx->nb_outputs) { + ff_filter_set_ready(ctx, 100); + return 0; + } + + if (movie->loop_count != 1) { + ret = rewind_file(ctx); if (ret < 0) return ret; - } else if (got_eof) { - /* all decoders flushed */ - if (movie->loop_count != 1) { - ret = rewind_file(ctx); - if (ret < 0) - return ret; - movie->loop_count -= movie->loop_count > 1; - av_log(ctx, AV_LOG_VERBOSE, "Stream finished, looping.\n"); - continue; - } - return AVERROR_EOF; + movie->loop_count -= movie->loop_count > 1; + av_log(ctx, AV_LOG_VERBOSE, "Stream finished, looping.\n"); + for (int i = 0; i < ctx->nb_outputs; i++) + movie->st[i].got_eof = 0; } + return 0; } + + return FFERROR_NOT_READY; } static int process_command(AVFilterContext *ctx, const char *cmd, const char *args, @@ -651,7 +667,7 @@ const AVFilter ff_avsrc_movie = { .init = movie_common_init, .uninit = movie_uninit, FILTER_QUERY_FUNC(movie_query_formats), - + .activate = activate, .inputs = NULL, .outputs = NULL, .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS, @@ -670,7 +686,7 @@ const AVFilter ff_avsrc_amovie = { .init = movie_common_init, .uninit = movie_uninit, FILTER_QUERY_FUNC(movie_query_formats), - + .activate = activate, .inputs = NULL, .outputs = NULL, .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS,