From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 5242847002 for ; Wed, 25 Oct 2023 15:11:42 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2E56868CA6B; Wed, 25 Oct 2023 18:11:40 +0300 (EEST) 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 CB53268C92E for ; Wed, 25 Oct 2023 18:11:32 +0300 (EEST) Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:b231:465::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 4SFspB3SjBz9tLh for ; Wed, 25 Oct 2023 17:11:30 +0200 (CEST) Message-ID: Date: Wed, 25 Oct 2023 20:41:13 +0530 MIME-Version: 1.0 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20231022115608.766-1-ffmpeg@gyani.pro> From: Gyan Doshi In-Reply-To: <20231022115608.766-1-ffmpeg@gyani.pro> X-Rspamd-Queue-Id: 4SFspB3SjBz9tLh Subject: Re: [FFmpeg-devel] [PATCH v2] 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 2023-10-22 05:26 pm, Gyan Doshi wrote: > 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. > > Option added to vidstabdetect to specify file format and open files in > both filters with the correct attributes. Plan to push tomorrow barring objections. Regards, Gyan > --- > doc/filters.texi | 13 +++++++++++++ > libavfilter/vf_vidstabdetect.c | 15 ++++++++++++++- > libavfilter/vf_vidstabtransform.c | 2 +- > 3 files changed, 28 insertions(+), 2 deletions(-) > > diff --git a/doc/filters.texi b/doc/filters.texi > index f5032ddf74..cc5d0d3f12 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 > 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..f49d302b80 100644 > --- a/libavfilter/vf_vidstabtransform.c > +++ b/libavfilter/vf_vidstabtransform.c > @@ -193,7 +193,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, "rb"); > if (!f) { > int ret = AVERROR(errno); > av_log(ctx, AV_LOG_ERROR, "cannot open input file %s\n", tc->input); _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".