From patchwork Sun Oct 22 11:24:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan Doshi X-Patchwork-Id: 44311 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1b28:b0:15d:8365:d4b8 with SMTP id ch40csp834400pzb; Sun, 22 Oct 2023 04:25:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEcIRZHTOItJe3+9zHAjbxi/bJ1+7UFnjr9eqWlxua/A9s02NvVbpL4kkL/+VkQWXbsUhFd X-Received: by 2002:a05:6402:51cf:b0:53e:4cd9:2df6 with SMTP id r15-20020a05640251cf00b0053e4cd92df6mr5464276edd.25.1697973918713; Sun, 22 Oct 2023 04:25:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697973918; cv=none; d=google.com; s=arc-20160816; b=UDJpQn2p6OoDxv9hZkk+ZVsOlvi7+SwlnAi9CroaunKq+mnw/PVsa8xgISLXTZS3Gy Lb24l99bJgsOD2c263GKDC1Oe1LnHXOoQbtQMCb9bM1zgfMmAPSunorGVb06h8+UQEQb Q7HVuv9pagbbhwaSByMxRg4Jj/tVI3Q1W3px+TvCqFZ1C0ttZzkXbBQVggmnMbAFyyKC Dzwox6Aq3DAIT3e+NbFFywPicXiooL3Y0uuRzfUhpfD1t/OeCNoKGYIeN9Qkz+KAAPQj FM+JorYdKoN69KR5x26/4sQZnllh6gV9DnhpLMm74fWV+sjJNvR+7HY9SyrsMYdpUXEx TCng== 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 :delivered-to; bh=0egyMiVP3WGOslKAjh1wwn/MsBM1imterDJOWpNgGlM=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=CxUJQ1ACpbK37SFf8uOpRXXoCZYQCAnuj7Ml1AXp4boYPdFzPZX1/SUJbxXzUUzr6d pHHjRXDzhBjqQsIuhp8OA5HzqfA/bUrKiQ5SbIom2c8eSC6GTCrLvDbffqeLATSTMHUX UfodGrYOW/QmtEqse9lg+8xv2dKQxWTK6lizFzJoKt3/Xdcc0F1qq+7GCgrv4JvG4htO wPmW2wg7Pf13n7/Rsc6dTMdP/C6ypAXOHcABVp1tGdsP7esCPlyHLIqImTI93pKLhcOE 3xrpd1j+7fDXQOLdtJ22cIP2yoaeZY7IYSds5iEzGhJqMvLi7eqAgbzaVAaDEDP967pH GcAg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r13-20020a05640251cd00b0053de0d1db07si2395804edd.65.2023.10.22.04.25.18; Sun, 22 Oct 2023 04:25:18 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0253668CA4B; Sun, 22 Oct 2023 14:25:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [80.241.56.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6B3BF68B68F for ; Sun, 22 Oct 2023 14:25:07 +0300 (EEST) Received: from smtp1.mailbox.org (smtp1.mailbox.org [10.196.197.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4SCwwK1Hzlz9sWx for ; Sun, 22 Oct 2023 13:25:05 +0200 (CEST) From: Gyan Doshi To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Oct 2023 16:54:46 +0530 Message-Id: <20231022112446.306-1-ffmpeg@gyani.pro> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avfilter/vidstab: add option for file format specification 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: bnEBJdzwgcU1 The vidstab library added support in Nov 2020 for writing/reading the transforms data in binary in addition to ASCII. The library default was changed to binary format but no changes were made to the AVfilters resulting in data file for writing or reading being always opened as text. This effectively broke the filters. Options added to vidstab{detect,transform} to specify file format and open files with the correct attributes. --- doc/filters.texi | 26 ++++++++++++++++++++++++++ libavfilter/vf_vidstabdetect.c | 15 ++++++++++++++- libavfilter/vf_vidstabtransform.c | 15 ++++++++++++++- 3 files changed, 54 insertions(+), 2 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index f5032ddf74..806448f063 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -24618,6 +24618,19 @@ If set to 0, it is disabled. The frames are counted starting from 1. Show fields and transforms in the resulting frames. It accepts an integer in the range 0-2. Default value is 0, which disables any visualization. + +@item fileformat +Format for the transforms data file to be written. +Acceptable values are + +@table @samp +@item ascii +Human-readable plain text + +@item binary +Binary format, roughly 40% smaller than @code{ascii}. (@emph{default}) +@end table + @end table @subsection Examples @@ -24772,6 +24785,19 @@ Use also @code{tripod} option of @ref{vidstabdetect}. Increase log verbosity if set to 1. Also the detected global motions are written to the temporary file @file{global_motions.trf}. Default value is 0. + +@item fileformat +Format of the transforms data file to be read. +Acceptable values are + +@table @samp +@item ascii +Human-readable plain text + +@item binary +Binary format (@emph{default}) +@end table + @end table @subsection Examples diff --git a/libavfilter/vf_vidstabdetect.c b/libavfilter/vf_vidstabdetect.c index a2c6d89503..aa050afab9 100644 --- a/libavfilter/vf_vidstabdetect.c +++ b/libavfilter/vf_vidstabdetect.c @@ -40,6 +40,7 @@ typedef struct StabData { VSMotionDetectConfig conf; char *result; + int fileformat; FILE *f; } StabData; @@ -58,6 +59,11 @@ static const AVOption vidstabdetect_options[] = { {"show", "0: draw nothing; 1,2: show fields and transforms", OFFSETC(show), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 2, FLAGS}, {"tripod", "virtual tripod mode (if >0): motion is compared to a reference" " reference frame (frame # is the value)", OFFSETC(virtualTripod), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, FLAGS}, +#ifdef LIBVIDSTAB_FILE_FORMAT_VERSION + { "fileformat", "transforms data file format", OFFSET(fileformat), AV_OPT_TYPE_INT, {.i64 = BINARY_SERIALIZATION_MODE}, ASCII_SERIALIZATION_MODE, BINARY_SERIALIZATION_MODE, FLAGS, "file_format"}, + { "ascii", "ASCII text", 0, AV_OPT_TYPE_CONST, {.i64 = ASCII_SERIALIZATION_MODE }, 0, 0, FLAGS, "file_format"}, + { "binary", "binary", 0, AV_OPT_TYPE_CONST, {.i64 = BINARY_SERIALIZATION_MODE}, 0, 0, FLAGS, "file_format"}, +#endif {NULL} }; @@ -94,6 +100,13 @@ static int config_input(AVFilterLink *inlink) VSFrameInfo fi; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); int is_planar = desc->flags & AV_PIX_FMT_FLAG_PLANAR; + const char *file_mode = "w"; + +#ifdef LIBVIDSTAB_FILE_FORMAT_VERSION + md->serializationMode = s->fileformat; + if (s->fileformat == BINARY_SERIALIZATION_MODE) + file_mode = "wb"; +#endif vsFrameInfoInit(&fi, inlink->w, inlink->h, ff_av2vs_pixfmt(ctx, inlink->format)); @@ -129,7 +142,7 @@ static int config_input(AVFilterLink *inlink) av_log(ctx, AV_LOG_INFO, " show = %d\n", s->conf.show); av_log(ctx, AV_LOG_INFO, " result = %s\n", s->result); - s->f = avpriv_fopen_utf8(s->result, "w"); + s->f = avpriv_fopen_utf8(s->result, file_mode); if (s->f == NULL) { av_log(ctx, AV_LOG_ERROR, "cannot open transform file %s\n", s->result); return AVERROR(EINVAL); diff --git a/libavfilter/vf_vidstabtransform.c b/libavfilter/vf_vidstabtransform.c index 8a66a463b4..780bf1064d 100644 --- a/libavfilter/vf_vidstabtransform.c +++ b/libavfilter/vf_vidstabtransform.c @@ -42,6 +42,7 @@ typedef struct TransformContext { char *input; // name of transform file int tripod; int debug; + int fileformat; } TransformContext; #define OFFSET(x) offsetof(TransformContext, x) @@ -101,6 +102,12 @@ static const AVOption vidstabtransform_options[] = { AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, FLAGS}, {"debug", "enable debug mode and writer global motions information to file", OFFSET(debug), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, FLAGS}, +#ifdef LIBVIDSTAB_FILE_FORMAT_VERSION + { "fileformat", "transforms data file format", OFFSET(fileformat), + AV_OPT_TYPE_INT, {.i64 = BINARY_SERIALIZATION_MODE}, ASCII_SERIALIZATION_MODE, BINARY_SERIALIZATION_MODE, FLAGS, "file_format"}, + { "ascii", "ASCII text", 0, AV_OPT_TYPE_CONST, {.i64 = ASCII_SERIALIZATION_MODE }, 0, 0, FLAGS, "file_format"}, + { "binary", "binary", 0, AV_OPT_TYPE_CONST, {.i64 = BINARY_SERIALIZATION_MODE}, 0, 0, FLAGS, "file_format"}, +#endif {NULL} }; @@ -131,6 +138,12 @@ static int config_input(AVFilterLink *inlink) const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); int is_planar = desc->flags & AV_PIX_FMT_FLAG_PLANAR; + const char *file_mode = "r"; + +#ifdef LIBVIDSTAB_FILE_FORMAT_VERSION + if (tc->fileformat == BINARY_SERIALIZATION_MODE) + file_mode = "rb"; +#endif VSTransformData *td = &(tc->td); @@ -193,7 +206,7 @@ static int config_input(AVFilterLink *inlink) av_log(ctx, AV_LOG_INFO, " zoomspeed = %g\n", tc->conf.zoomSpeed); av_log(ctx, AV_LOG_INFO, " interpol = %s\n", getInterpolationTypeName(tc->conf.interpolType)); - f = avpriv_fopen_utf8(tc->input, "r"); + f = avpriv_fopen_utf8(tc->input, file_mode); if (!f) { int ret = AVERROR(errno); av_log(ctx, AV_LOG_ERROR, "cannot open input file %s\n", tc->input);