From patchwork Fri Feb 11 15:27:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergio Acereda X-Patchwork-Id: 34233 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:14aa:0:0:0:0 with SMTP id bz10csp3302429nkb; Fri, 11 Feb 2022 07:28:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJwtNHipTXwoXfTRzLNpbrP5xuli7tK98cCXrjuMCZB2TmfUsUk6g+DgM/L/nL4KYCi2nR2s X-Received: by 2002:a17:907:1692:: with SMTP id hc18mr1898877ejc.23.1644593282421; Fri, 11 Feb 2022 07:28:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644593282; cv=none; d=google.com; s=arc-20160816; b=CNJw/4IzmNXAQa+WKyqKSQUMR3VvEUFnxd6HHGPN0s/4I69CeIsNOqYeqZwvgPbsMW vU8wCwSu9oZzBK6/AxhPs1/okUjmd0WgHQa9xPX8Ys0Y2ct83mDke1CBeX+qX/O5xJCx SSHhIeKkDcn9qZ3ms9KQ8orNtU1j0I6v55yHcBOCiSqXe1wITDjcWcI/Zt0dlrAlCbXq d4pHZ68VVid0H/upkT8Sht4tb83ba08LLLOwZP4PUSfQuMlTyfI9Qbtc1Zl0VOkHceF9 IgDFaPXFiyHnvpHp+mB2iWZllNkg6RtHq237nUp9jKzKEZFpelpJpJIHpKuKERG5HCqT lN8g== 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:to:date:message-id:mime-version:from :dkim-signature:delivered-to; bh=H+RYRnKF9HrxqyJ4djUlyX5IpgaYfTXgPOJ4+8WwGMY=; b=b2x0Jrl+7LGS2jcuKMB62KYNYPLILNMADlkAEf1zQJVlcaWoROSF5wpMZpwt00Yy3R UZBG/W8qjPQGliOM37lBbIsXbJyLIq0AlkhsRUHuTI7Z5byPLsZaGGVfPWTmqq4Yl5G1 VePeIod9EpmJUhhDUJw3KxryDkdb2eZue0UUfF4lDjpwOo9FgKerAT9VjYeUwPwwDXwA gJ3oshzW+3duAEDeGEgQI1Tu/ezVuxA0LUJpXjS0LYaOU81vxKSu9qcNIKBKkukSJ9d0 p1GR90FmtfZmj3J1x4Ppfm6qmPbwpJRIdCATdMRiD3vfk+i3Bml7BE/L4VhfWRv6Jk/Z 037g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=eNhXA5ND; 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 l6si16560612ejo.623.2022.02.11.07.28.01; Fri, 11 Feb 2022 07:28:02 -0800 (PST) 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=eNhXA5ND; 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 5E8E468B1BD; Fri, 11 Feb 2022 17:27:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CDF2A68B199 for ; Fri, 11 Feb 2022 17:27:51 +0200 (EET) Received: by mail-wr1-f52.google.com with SMTP id e3so15943732wra.0 for ; Fri, 11 Feb 2022 07:27:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:content-transfer-encoding:mime-version:subject:message-id:date :to; bh=l24D5Grn0UWTDrjsBRzVqj4dZZsfNy104uEBecGVzBk=; b=eNhXA5NDTT2+bkVoebgudPqbT5viASVT7FrdVDzlM1myq50cDYz9dj2Ek1er5YvAus Y/f4oSGTaGyoJU66toMjkbjqbUgVbQr3p1pbHM6t9YtSbqGAzgvLF55DipZxZ/LINrUb RFtTY/Vafij8Hp8BwR2o6GZgEo58biEYfYovtheziV6nPrKyjwNbO4QZj/5xbUM/u3xz PX5ivqfFts+q4qNTCmUBnHOql9ZClykyUCiDVwTLcoimW8y2/Y1lgTtkw2MPoWR/6YhW UfxQGqw6P0xd9lg2f4uvdnkIsenHAHmBWJ+tsWP35tE/VlsJbHOisIygf0SSKIJ0jnMo YLHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:content-transfer-encoding:mime-version :subject:message-id:date:to; bh=l24D5Grn0UWTDrjsBRzVqj4dZZsfNy104uEBecGVzBk=; b=eemHYhPkerUV8cmd+dXsCLKmtS7vw51kVOy9b+TMeSjg9MJI0Xh9/c7t242Wlw2rcA Q9l/GkrGuhgI5wBg9mYBC+aaDOUjh4bmVYjU0xvGnz4jyTcoa9O35do/oRyf7qIwOHyF fH788EKB0nQLYfRSfIneH8OyCuHugREsvSMby2Q5O4sMQhv5X/0Y6sTHZSDyD+NiW6Lr nChRNl+VlUqY0S/HNtn02YWlehLYGcC88qJ3++Am+w4WNMEfAsV4jXEmGuryLyucHA+l iayciMJKhRGkR2qxSmEZjpQ4sSM1E+t1Enuewr6EWN2ghuPPqXmUGxI5SgEl6PKYfblV czBA== X-Gm-Message-State: AOAM5333nf825SzvcP3BjYjrJXbOTArduUj16Mgu71G2QfR+LVKzdbhZ ebHXicPJgccI3B8EIRt+RFwbm1le8jo= X-Received: by 2002:a05:6000:184f:: with SMTP id c15mr1794210wri.218.1644593270342; Fri, 11 Feb 2022 07:27:50 -0800 (PST) Received: from [192.168.1.39] (132.red-81-34-167.dynamicip.rima-tde.net. [81.34.167.132]) by smtp.gmail.com with ESMTPSA id l7sm2110306wrs.46.2022.02.11.07.27.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Feb 2022 07:27:49 -0800 (PST) From: Sergio Acereda Mime-Version: 1.0 (Mac OS X Mail 11.5 \(3445.9.7\)) Message-Id: <8500927F-727E-426C-A6FB-1DD8684C1817@gmail.com> Date: Fri, 11 Feb 2022 16:27:48 +0100 To: ffmpeg-devel@ffmpeg.org X-Mailer: Apple Mail (2.3445.9.7) Subject: [FFmpeg-devel] [PATCH] [FFmpeg-devel, v2] avformat/img2dec: Option to play sequence backwards 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: bem2o+j93/BB This patch should allow to play a image sequence in backwards direction, without needing to apply a reverse filter. $ ffmpeg -i sequence%05.png forward.mkv $ ffmpeg -reverse 1 sequence%05.png backward.mkv Signed-off-by: Sergio Acereda --- libavformat/img2.h | 1 + libavformat/img2dec.c | 32 ++++++++++++++++++++++---------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/libavformat/img2.h b/libavformat/img2.h index 5fd8ff77fc..3d01c00537 100644 --- a/libavformat/img2.h +++ b/libavformat/img2.h @@ -59,6 +59,7 @@ typedef struct VideoDemuxData { #endif int start_number; int start_number_range; + int reverse; int frame_size; int ts_from_file; int export_path_metadata; /**< enabled when set to 1. */ diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index 8608252d83..90465441f1 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -105,10 +105,12 @@ static int is_glob(const char *path) * @param plast_index pointer to index updated with the last number in the range * @param path path which has to be matched by the image files in the range * @param start_index minimum accepted value for the first index in the range + * @param start_index_range range for looking at the first sequence number + * @param reverse play backwards * @return -1 if no image file could be found */ static int find_image_range(AVIOContext *pb, int *pfirst_index, int *plast_index, - const char *path, int start_index, int start_index_range) + const char *path, int start_index, int start_index_range, int reverse) { char buf[1024]; int range, last_index, range1, first_index; @@ -152,8 +154,14 @@ static int find_image_range(AVIOContext *pb, int *pfirst_index, int *plast_index break; last_index += range; } - *pfirst_index = first_index; - *plast_index = last_index; + if (reverse) { + *pfirst_index = last_index; + *plast_index = first_index; + } + else { + *pfirst_index = first_index; + *plast_index = last_index; + } return 0; fail: @@ -274,7 +282,7 @@ int ff_img_read_header(AVFormatContext *s1) } if ((s->pattern_type == PT_GLOB_SEQUENCE && !s->use_glob) || s->pattern_type == PT_SEQUENCE) { if (find_image_range(s1->pb, &first_index, &last_index, s->path, - s->start_number, s->start_number_range) < 0) { + s->start_number, s->start_number_range, s->reverse) < 0) { av_log(s1, AV_LOG_ERROR, "Could find no file with path '%s' and index in the range %d-%d\n", s->path, s->start_number, s->start_number + s->start_number_range - 1); @@ -307,7 +315,7 @@ int ff_img_read_header(AVFormatContext *s1) /* compute duration */ if (!s->ts_from_file) { st->start_time = 0; - st->duration = last_index - first_index + 1; + st->duration = abs(last_index - first_index) + 1; } } @@ -413,11 +421,12 @@ int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt) AVCodecParameters *par = s1->streams[0]->codecpar; if (!s->is_pipe) { + int bad = s->reverse? (s->img_number < s->img_last) : (s->img_number > s->img_last); /* loop over input */ - if (s->loop && s->img_number > s->img_last) { + if (s->loop && bad) { s->img_number = s->img_first; } - if (s->img_number > s->img_last) + if (bad) return AVERROR_EOF; if (s->pattern_type == PT_NONE) { av_strlcpy(filename_bytes, s->path, sizeof(filename_bytes)); @@ -554,8 +563,9 @@ int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt) } goto fail; } else { + int step = s->reverse? -1 : 1; s->img_count++; - s->img_number++; + s->img_number += step; s->pts++; return 0; } @@ -594,9 +604,10 @@ static int img_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp return 0; } - if (timestamp < 0 || !s1->loop && timestamp > s1->img_last - s1->img_first) + int bad = s1->reverse? (timestamp < s1->img_last) : (timestamp > s1->img_last); + if (timestamp < 0 || !s1->loop && bad) return -1; - s1->img_number = timestamp%(s1->img_last - s1->img_first + 1) + s1->img_first; + s1->img_number = timestamp%abs(s1->img_last - s1->img_first + 1) + s1->img_first; s1->pts = timestamp; return 0; } @@ -619,6 +630,7 @@ const AVOption ff_img_options[] = { { "none", "disable pattern matching", 0, AV_OPT_TYPE_CONST, {.i64=PT_NONE }, INT_MIN, INT_MAX, DEC, "pattern_type" }, { "start_number", "set first number in the sequence", OFFSET(start_number), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, DEC }, { "start_number_range", "set range for looking at the first sequence number", OFFSET(start_number_range), AV_OPT_TYPE_INT, {.i64 = 5}, 1, INT_MAX, DEC }, + { "reverse", "reverse direction", OFFSET(reverse), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 1, DEC }, { "ts_from_file", "set frame timestamp from file's one", OFFSET(ts_from_file), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 2, DEC, "ts_type" }, { "none", "none", 0, AV_OPT_TYPE_CONST, {.i64 = 0 }, 0, 2, DEC, "ts_type" }, { "sec", "second precision", 0, AV_OPT_TYPE_CONST, {.i64 = 1 }, 0, 2, DEC, "ts_type" },