From patchwork Thu Feb 10 09:31:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergio Acereda X-Patchwork-Id: 34213 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:14aa:0:0:0:0 with SMTP id bz10csp2165627nkb; Thu, 10 Feb 2022 01:31:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJxrHm8MViHnesYKIr+/RJ5JzC4YRGaLSVQmTHGZEkGjKiT2E22RG66+7bzqd75rsdygP8FK X-Received: by 2002:a17:906:5349:: with SMTP id j9mr1931996ejo.368.1644485476657; Thu, 10 Feb 2022 01:31:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644485476; cv=none; d=google.com; s=arc-20160816; b=ks4x5JSbT7CPCaVZUVl/UeUysHyx/5MAExURxCErmjAJUyqMqXW5upAordtS7T4BX0 0fMi2z+SqbGBiXU5CE1Kg3yZirDDJmft+OBkwn9Bvf4U9clH14lTWv4qnpHZq3/zfIeK fNfObGOvRjVgyg/X1z8YPL7IgWZT0DaHaZm1diFGVcvuRap/pbtHx8XZY+zAHWTb6FCw AaezXSLTfTauXAVtybbgQ6QsAb0u1wI8XP+fh7Y92Y6Zfrp+lohySCea6T532wg7myny hmj34QltMp23CmfN79lX/5Fo/Ask2fN262YxeEWzI77hRdb0YsZoBi55oUJHb6BGCgCm k3Pw== 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=Bov2In5s90LHYXg1HWgTQE81p92QvpOBNV6J5O2Gb0k=; b=L4YB64+UsIszNcsjQrQTZwLrG3PCVB9qLU0XMWmaZ3BfVizAXxQCPJQmhbixPT9ZvX qJbDUpZwcK3Ia5ogC89s4DOxdJ5/WkGhkkKMstT1rPA8Y9LWYz1GXbivCQIWES6LBEvQ s4bL790yKOwSsoVEdWeZZWpjlODFWR1c4NtWmmNUVKZpcc5EeEQ966jiyPZ9gTeDGZVe KLftKz8+APCVkeGWDdqqVMUlJaEQUaUtmCIoLQihQASpCEGzIGaex+tGCG/CGJgnPVOU wk6BSDBYwPK5aTs4JspFcXbeVCHOG5g2r3iJJU3L5+9Df12RPW0v5LZikNccbLgFxv5P bPvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="Oi+bpu/M"; 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 i2si16174283ejw.952.2022.02.10.01.31.15; Thu, 10 Feb 2022 01:31:16 -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="Oi+bpu/M"; 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 3203E68B0AD; Thu, 10 Feb 2022 11:31:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A277668AD97 for ; Thu, 10 Feb 2022 11:31:04 +0200 (EET) Received: by mail-wr1-f45.google.com with SMTP id w11so8422091wra.4 for ; Thu, 10 Feb 2022 01:31:04 -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=/U0caJsHWUauSVoPARIKddloWvvYoxqQrAE4lywC34Y=; b=Oi+bpu/MLAzJyYrYe+TSvnXpcvoRMNbmvBKfVdEPEhdxsCM8KqtjVGThgreXofh1r6 lpq/mpMpTE9tRzwCRTB5/YTdHEbtF4Qwztwck1paLt+euX36H/7ZS0BUYge/LFq6gyEe 2vOL9frt+D53mRl1jXKt0I5RKME3AZoDxVZQo+Us5tqplSiMUmS9zPGzSuVFdood8kcf CvgmyordNqwkIEQyqMAJ3hAGULuIC9lj7zdX3n6vf2anpub/8UxDTWHOP97gDIvvP7bJ O6WYfmLolF7SS7gOge4aR6NzM74624esHfP+TngtptPKCVrgEVrKkbz+l1svWPdwvlYy zvNg== 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=/U0caJsHWUauSVoPARIKddloWvvYoxqQrAE4lywC34Y=; b=JSjiHpJuIIoiQn2i9WgtvUYiF7bA9Z/PLu6ngMRpWjIzJPzL21IhrOkVnXWNDrR3Av LTw6sks3hRtHW467HbeGe7ga8t/+GDvIuHrk8ySwGQwLI9COuBwaVuIw1n3pUlleE/zN xfz58RhTOlAVV6SIOCUgwdNsOu+H34KXQotxU0oog0oZTqKMjgRyA4/rQnVrpLk0wvaq zm41p6GTDaxQdk4S+um4eW4oNj7586hVZdw2lR8veesNCewGvS4mDZc+R0xiFL0qUK1M 06xnQqqQ8KYaOQM9pMak6/Op4O2qbTTQZKj+W1Ciitd6cGBIQFNSPdpJLElPbCXs67HT aa4Q== X-Gm-Message-State: AOAM532XKfKo5G6zEc/cTRb9AWj6KnLM5TUTOgPTjScweJMIieEw3PQE Cv6zr3xZ/5pctzoSJwJO3e5wOxNnxBQ= X-Received: by 2002:a05:6000:128d:: with SMTP id f13mr5331475wrx.675.1644485463644; Thu, 10 Feb 2022 01:31:03 -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 k28sm1046201wms.23.2022.02.10.01.31.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Feb 2022 01:31:03 -0800 (PST) From: Sergio Acereda Mime-Version: 1.0 (Mac OS X Mail 11.5 \(3445.9.7\)) Message-Id: <29BFC8DD-910E-4AE4-A5F0-65CB449147BF@gmail.com> Date: Thu, 10 Feb 2022 10:31:00 +0100 To: ffmpeg-devel@ffmpeg.org X-Mailer: Apple Mail (2.3445.9.7) Subject: [FFmpeg-devel] [PATCH] 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: fuxH0zWuuNCc Signed-off-by: Sergio Acereda --- 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 --- 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" },