From patchwork Sat Feb 12 11:57:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergio Acereda X-Patchwork-Id: 34258 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:14aa:0:0:0:0 with SMTP id bz10csp4003050nkb; Sat, 12 Feb 2022 03:59:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJw7VlppGmkKvK8H4yRlY0aFHlHlkeYphMtSqOMmHQsdv5clxXHkgPnsaAoFafjzqY7Jfd44 X-Received: by 2002:a05:6402:34d3:: with SMTP id w19mr6330304edc.377.1644667160920; Sat, 12 Feb 2022 03:59:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644667160; cv=none; d=google.com; s=arc-20160816; b=wJtts8l4QJ9e+3N6HmKL6HBW5SYXUAC7CY8IjegcME6u/PmOBYVXoL225s0epcIzp+ seGJGGYeHazPONRRIDDZkx6yQUC5aN9/HwDx6cIE2lKGua/re8j/7g9iJInjZvBy1Nnj 24OkUDQ/nSFNS0zh83Pt3PeYLCmj6Hs+eaTi8U69skL6zBOEyEyd9WSWBdizVcY9Cjkc l21Pzt3B2+OOh2/E0ckOgQKy6QJfmg2g7CVqwzte5xBBbZC0ViCbI4U+o58T3PO3ufQX G3NyQbh3YCD7q/RROd/IlKLH7GhbiFIIMRXmh1eEj8TpA1YZqlcfUJ3ujW+tyanEspns m20g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=ZeD+LX4RgbzPMk6zQwQ4k68vBBO0KKBiBTMlx+7GN7g=; b=WyQLkTB/S/2mZRm1p8bSFfBP+oroEYzeTxN8Y6pQ4+jr/FAPWGMPVkbJ0ctbm5Rz4Y IhXbXU73wjUg6uqspwPn6PnJSqz9jQ6B61/gA8FK4ouxLKu1Kk3+xyqEi0ziDnOJSrJq BR6APY2MzVQ22b0fF6UcWw2nz0QVbkIAh7GM27aAMkvDVcJ//Vkvgw7Jfkt2BUyQsMId m+gl8MFos5CyhK0idei/gSfwipd4FwPH+tra7PYzdppUj0qpQ+NYf/U9UgvPn1I29P6N 1xw0Ah8NC+MZW4SsdSzkubDOT+dDlA2uWUl9De48TVJmZ0gYkArG8FrttCrFanymyUNK y0NQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=DWiXCyJY; 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 v18si1676164edc.420.2022.02.12.03.59.20; Sat, 12 Feb 2022 03:59:20 -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=DWiXCyJY; 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 99B0668B2A8; Sat, 12 Feb 2022 13:59:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 62F8F68B213 for ; Sat, 12 Feb 2022 13:59:11 +0200 (EET) Received: by mail-wr1-f49.google.com with SMTP id s10so5785446wrb.1 for ; Sat, 12 Feb 2022 03:59:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=FIs0WEV7QlNjR1RJoYSVjmuD1UfmQgNo3o0xk8Hogbw=; b=DWiXCyJYoPun2hr8YFyhq+LNRX3hDzQlP3u2UWKJkB0STKWwHLWCFYps+jdlRpGefR AQgjg26rcLGPv0DU2ffmSXbmRx81OY13Hn3TPqQv7j6Nrr3txWBQ7M1nojwgr3WKThbG nyHzj8TxNMdre91eEG/APRjVcF2sVeZOfOYy1ypJr0cyUQS4AObVL3B5D1kScQ2jLW5n F6njFcUKfjPW2KIKYYg9drTn6RKMhM54Fe2zgEwqMrqkOFvStnMZBPuNK2Us2W7wCcDf 1mf1M09eRa2rRXsDQWnCV2Jkv2svQ/P9KFb4I+mtxO5DShUV41xdCHj+wAIL7ZnF44uX ImcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=FIs0WEV7QlNjR1RJoYSVjmuD1UfmQgNo3o0xk8Hogbw=; b=1Jk8Wgb+TqRTkIZ/dkLnB8hMuBnfsJTgqCgAq2OguVjy1eecBb4b4xOB2jIF3OrSZL GjHfTEk/XlxblQQ/SDKUtfE5X0jtJPxkHRaHwooaL/W9Bryy6t6TT9o4yFLG0cAA4pSJ 52W41R2hYynEy6UGI51VufVKSRT9deJPl8X9icvHknwGByq1USGA3XZ4ch0/M3c+kQQA bBfPi78uQUqRvVgkUGruZrkMZwXwl9KkWYLtoIouht4ENg5LJ9D+VWlVqYKQI5LbO60b wQ4p4/5JjqzM+kOlxRIy+h4RlRJ/iEf6KMNgFWxfupmKfCYOlwY0uOIFA0YoiZTLNdat esMg== X-Gm-Message-State: AOAM531tr9U3fgsoMUYLyiC5w9drz2uk2DgV9fFANu14RdWX46P0CafC Web9fV9Kxfyyv/qMVGFqYe7b30Kf1g+TUw== X-Received: by 2002:a5d:6506:: with SMTP id x6mr4735135wru.164.1644667150520; Sat, 12 Feb 2022 03:59:10 -0800 (PST) Received: from localhost.localdomain (132.red-81-34-167.dynamicip.rima-tde.net. [81.34.167.132]) by smtp.gmail.com with ESMTPSA id l31sm1052153wms.0.2022.02.12.03.59.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Feb 2022 03:59:09 -0800 (PST) From: Sergio Acereda To: ffmpeg-devel@ffmpeg.org Date: Sat, 12 Feb 2022 12:57:11 +0100 Message-Id: <20220212115709.45936-1-sergio.acereda@gmail.com> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 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 Cc: Sergio Acereda Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: T/oVLTpn/Qks This patch should allow playing an image sequence in backwards direction, without needing to apply a reverse filter. ffmpeg -i sequence%05d.png forward.mkv ffmpeg -reverse 1 -i sequence%05d.png backward.mkv Signed-off-by: Sergio Acereda --- libavformat/img2.h | 1 + libavformat/img2dec.c | 40 +++++++++++++++++++++++++++------------- 2 files changed, 28 insertions(+), 13 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..f7ad85be08 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,13 @@ 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 +281,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 +314,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 +420,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 +562,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; } @@ -585,6 +594,7 @@ static int img_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp { VideoDemuxData *s1 = s->priv_data; AVStream *st = s->streams[0]; + int bad = s1->reverse? (timestamp < s1->img_last) : (timestamp > s1->img_last); if (s1->ts_from_file) { int index = av_index_search_timestamp(st, timestamp, flags); @@ -592,12 +602,15 @@ static int img_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp return -1; s1->img_number = ffstream(st)->index_entries[index].pos; return 0; - } - - if (timestamp < 0 || !s1->loop && timestamp > s1->img_last - s1->img_first) + } else if (timestamp < 0 || !s1->loop && bad) return -1; - s1->img_number = timestamp%(s1->img_last - s1->img_first + 1) + s1->img_first; - s1->pts = timestamp; + else { + int dir = s1->reverse? -1 : 1; + int span = 1 + dir * (s1->img_last - s1->img_first); + int rel = timestamp % span; + s1->img_number = s1->img_first + dir * rel; + s1->pts = timestamp; + } return 0; } @@ -619,6 +632,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" },