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 6B0A44773B for ; Sun, 22 Oct 2023 11:34:13 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9BD1468CA50; Sun, 22 Oct 2023 14:34:10 +0300 (EEST) Received: from btbn.de (btbn.de [136.243.74.85]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A303168C6AB for ; Sun, 22 Oct 2023 14:34:04 +0300 (EEST) Received: from [authenticated] by btbn.de (Postfix) with ESMTPSA id 482C13498B9 for ; Sun, 22 Oct 2023 13:34:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rothenpieler.org; s=mail; t=1697974443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jvxNKPsOH9TRvcRbZ/P7fegZrHzPMjGpGIKjW20X7hY=; b=Ltk23+Eq81rCEfKc8sZ8IBZV65QPEgXWARdkIaWrbuGYnsMk0s9X0RKirmGz8m09Vaic0P yXYJ0BC5fXI0svDJm+I1vGChhehZuspcU0iRM9PcxBPJd1+X9cztEEl6s31UHnUZfnD6Ia yvXD1a9qIrLZE/Rb3Ym5EgljPhojAIHInQfa9FSeS41s5M7kfxdO5EeHz1tuU4fPZKuXes Dsgql9TruTfcnVrz0gvDDGc5SsbvIFhPdHY0NyOjNjIagn0G5sQn+xiY4OzcI4e6/8Bf0x SGQvitsPEPHNBmMo5djY2uu5uU1C4Zo3Wkqan2EeONq3fsHz3wVWJalkkmwmeg== Message-ID: <95d85244-d4c4-4f51-ad45-22a53a744a49@rothenpieler.org> Date: Sun, 22 Oct 2023 13:34:02 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20231022112446.306-1-ffmpeg@gyani.pro> Content-Language: en-US From: Timo Rothenpieler In-Reply-To: <20231022112446.306-1-ffmpeg@gyani.pro> Subject: Re: [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 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 22.10.2023 13:24, 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. > > 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); Can't it just always open it in binary mode, and work fine no matter what format it is? The library does have auto-detection logic in place after all. The user having to know the format and passing it as an option to the filter seems a bit annoying. > 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".