March 2023 - ffmpeg-cvslog - lists.ffmpeg.org

doc/encoders: add an entry for the frame_length option from libfdk-aac
by James Almer 31 Mar '23

31 Mar '23

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Fri Mar 31 08:51:58 2023 -0300| [113f684271ff437c496aa3a59277a76908c0a0ae] | committer: James Almer doc/encoders: add an entry for the frame_length option from libfdk-aac Reviewed-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=113f684271ff437c4… --- doc/encoders.texi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/encoders.texi b/doc/encoders.texi index af3bd43cbe..3cb6fc1ce7 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -789,6 +789,11 @@ about 80-96 kbps/channel @end table Default value is 0. + +@item frame_length +Set the audio frame length in samples. Default value is the internal +default of the library. Refer to the library's documentation for information +about supported values. @end table @subsection Examples

1 0

avcodec/libfdk-accenc: Add option to set frame length when encoding with libfdk_aac
by Raphael Schlarb 31 Mar '23

31 Mar '23

ffmpeg | branch: master | Raphael Schlarb <info(a)raphael.schlarb.one> | Thu Mar 30 14:27:41 2023 +0200| [d2e1389285eb31581b3370508ddaf226f79148fe] | committer: James Almer avcodec/libfdk-accenc: Add option to set frame length when encoding with libfdk_aac Some specifications require the size of ld/eld frames to be 480 samples instead of the default 512. libfdk_aac provides an option to set an alternative frame size, but it's not exposed via the ffmpeg interface. This patch adds a frame_length option to solve this problem. Signed-off-by: Raphael Schlarb <info(a)raphael.schlarb.one> Reviewed-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d2e1389285eb31581… --- libavcodec/libfdk-aacenc.c | 11 +++++++++++ libavcodec/version.h | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c index eb97e0fb41..515e235baa 100644 --- a/libavcodec/libfdk-aacenc.c +++ b/libavcodec/libfdk-aacenc.c @@ -55,6 +55,7 @@ typedef struct AACContext { int metadata_mode; AACENC_MetaData metaDataSetup; int delay_sent; + int frame_length; AudioFrameQueue afq; } AACContext; @@ -78,6 +79,7 @@ static const AVOption aac_enc_options[] = { { "comp_profile", "The desired compression profile for AAC DRC", offsetof(AACContext, comp_profile), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 256, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM }, { "comp_target_ref", "Expected target reference level at decoder side in dB (for clipping prevention/limiter)", offsetof(AACContext, comp_target_ref), AV_OPT_TYPE_INT, { .i64 = 0.0 }, -31.75, 0, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM }, { "prog_ref", "The program reference level or dialog level in dB", offsetof(AACContext, prog_ref), AV_OPT_TYPE_INT, { .i64 = 0.0 }, -31.75, 0, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM }, + { "frame_length", "The desired frame length", offsetof(AACContext, frame_length), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1024, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM }, FF_AAC_PROFILE_OPTS { NULL } }; @@ -166,6 +168,15 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) } } + if (s->frame_length >= 0) { + if ((err = aacEncoder_SetParam(s->handle, AACENC_GRANULE_LENGTH, + s->frame_length)) != AACENC_OK) { + av_log(avctx, AV_LOG_ERROR, "Unable to set granule length: %s\n", + aac_get_error(err)); + goto error; + } + } + if ((err = aacEncoder_SetParam(s->handle, AACENC_SAMPLERATE, avctx->sample_rate)) != AACENC_OK) { av_log(avctx, AV_LOG_ERROR, "Unable to set the sample rate %d: %s\n", diff --git a/libavcodec/version.h b/libavcodec/version.h index 7acb261bb3..ecb096f38b 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #include "version_major.h" #define LIBAVCODEC_VERSION_MINOR 7 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \

1 0

lavfi/vf_vpp_qsv: only add the given output sw format to output pad
by Haihao Xiang 31 Mar '23

31 Mar '23

ffmpeg | branch: master | Haihao Xiang <haihao.xiang(a)intel.com> | Wed Mar 8 13:10:48 2023 +0800| [412d43b09a2e21c6c76ca87cc5f05a504a1fee1a] | committer: Haihao Xiang lavfi/vf_vpp_qsv: only add the given output sw format to output pad Otherwise the output format is not changed when output is in system memory. For example, the output format is still p010le in the following case: $ ffmpeg -qsv_device /dev/dri/renderD128 -f lavfi -i testsrc -vf "format=p010le,vpp_qsv=extra_hw_frames=8:format=nv12" -f null - ... Output #0, null, to 'pipe:': Metadata: encoder : Lavf60.4.100 Stream #0:0: Video: wrapped_avframe, p010le(tv, progressive), 320x240 [SAR 1:1 DAR 4:3], q=2-31, 200 kb/s, 25 fps, 25 tbn Signed-off-by: Haihao Xiang <haihao.xiang(a)intel.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=412d43b09a2e21c6c… --- libavfilter/vf_vpp_qsv.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/libavfilter/vf_vpp_qsv.c b/libavfilter/vf_vpp_qsv.c index 76f0bc3df1..334a86551b 100644 --- a/libavfilter/vf_vpp_qsv.c +++ b/libavfilter/vf_vpp_qsv.c @@ -714,7 +714,8 @@ static const AVOption vpp_options[] = { static int vpp_query_formats(AVFilterContext *ctx) { - int ret; + VPPContext *vpp = ctx->priv; + int ret, i = 0; static const enum AVPixelFormat in_pix_fmts[] = { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NV12, @@ -727,17 +728,25 @@ static int vpp_query_formats(AVFilterContext *ctx) AV_PIX_FMT_QSV, AV_PIX_FMT_NONE }; - static const enum AVPixelFormat out_pix_fmts[] = { - AV_PIX_FMT_NV12, - AV_PIX_FMT_P010, - AV_PIX_FMT_QSV, - AV_PIX_FMT_NONE - }; + static enum AVPixelFormat out_pix_fmts[4]; ret = ff_formats_ref(ff_make_format_list(in_pix_fmts), &ctx->inputs[0]->outcfg.formats); if (ret < 0) return ret; + + /* User specifies the output format */ + if (vpp->out_format == AV_PIX_FMT_NV12 || + vpp->out_format == AV_PIX_FMT_P010) + out_pix_fmts[i++] = vpp->out_format; + else { + out_pix_fmts[i++] = AV_PIX_FMT_NV12; + out_pix_fmts[i++] = AV_PIX_FMT_P010; + } + + out_pix_fmts[i++] = AV_PIX_FMT_QSV; + out_pix_fmts[i++] = AV_PIX_FMT_NONE; + return ff_formats_ref(ff_make_format_list(out_pix_fmts), &ctx->outputs[0]->incfg.formats); }

1 0

avfilter/af_rubberband: use correct array for multichannels
by Paul B Mahol 30 Mar '23

30 Mar '23

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Mar 30 14:06:45 2023 +0200| [b75159682a5838a53b436da5535daabfe1b66595] | committer: Paul B Mahol avfilter/af_rubberband: use correct array for multichannels > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b75159682a5838a53… --- libavfilter/af_rubberband.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/af_rubberband.c b/libavfilter/af_rubberband.c index 34a1605667..c56bf5d82f 100644 --- a/libavfilter/af_rubberband.c +++ b/libavfilter/af_rubberband.c @@ -100,7 +100,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) if (s->first_pts == AV_NOPTS_VALUE) s->first_pts = in->pts; - rubberband_process(s->rbs, (const float *const *)in->data, in->nb_samples, ff_outlink_get_status(inlink)); + rubberband_process(s->rbs, (const float *const *)in->extended_data, in->nb_samples, ff_outlink_get_status(inlink)); s->nb_samples_in += in->nb_samples; nb_samples = rubberband_available(s->rbs); @@ -113,7 +113,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) out->pts = s->first_pts + av_rescale_q(s->nb_samples_out, (AVRational){ 1, outlink->sample_rate }, outlink->time_base); - nb_samples = rubberband_retrieve(s->rbs, (float *const *)out->data, nb_samples); + nb_samples = rubberband_retrieve(s->rbs, (float *const *)out->extended_data, nb_samples); out->nb_samples = nb_samples; ret = ff_filter_frame(outlink, out); s->nb_samples_out += nb_samples;

1 0

libavformat/tcp: add local_addr/local_port for network option
by jackarain 30 Mar '23

30 Mar '23

ffmpeg | branch: master | jackarain <jack.wgm(a)gmail.com> | Fri Mar 3 17:49:26 2023 +0800| [4d216654ca72dfd23fcafcc5195db0eb9bdd483b] | committer: Anton Khirnov libavformat/tcp: add local_addr/local_port for network option Signed-off-by: jackarain <jack.wgm(a)gmail.com> Signed-off-by: Anton Khirnov <anton(a)khirnov.net> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4d216654ca72dfd23… --- doc/protocols.texi | 6 ++++++ libavformat/network.c | 14 ++++++++++---- libavformat/network.h | 2 +- libavformat/tcp.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++-- libavformat/version.h | 2 +- 5 files changed, 69 insertions(+), 8 deletions(-) diff --git a/doc/protocols.texi b/doc/protocols.texi index 21ae6181a0..b3fad55591 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -1882,6 +1882,12 @@ The list of supported options follows. Listen for an incoming connection. 0 disables listen, 1 enables listen in single client mode, 2 enables listen in multi-client mode. Default value is 0. +@item local_addr=@var{addr} +Local IP address of a network interface used for tcp socket connect. + +@item local_port=@var{port} +Local port used for tcp socket connect. + @item timeout=@var{microseconds} Set raise error timeout, expressed in microseconds. diff --git a/libavformat/network.c b/libavformat/network.c index 21e20b3e9a..f752efc411 100644 --- a/libavformat/network.c +++ b/libavformat/network.c @@ -356,7 +356,7 @@ struct ConnectionAttempt { static int start_connect_attempt(struct ConnectionAttempt *attempt, struct addrinfo **ptr, int timeout_ms, URLContext *h, - void (*customize_fd)(void *, int), void *customize_ctx) + int (*customize_fd)(void *, int, int), void *customize_ctx) { struct addrinfo *ai = *ptr; int ret; @@ -371,8 +371,14 @@ static int start_connect_attempt(struct ConnectionAttempt *attempt, ff_socket_nonblock(attempt->fd, 1); - if (customize_fd) - customize_fd(customize_ctx, attempt->fd); + if (customize_fd) { + ret = customize_fd(customize_ctx, attempt->fd, ai->ai_family); + if (ret) { + closesocket(attempt->fd); + attempt->fd = -1; + return ret; + } + } while ((ret = connect(attempt->fd, ai->ai_addr, ai->ai_addrlen))) { ret = ff_neterrno(); @@ -402,7 +408,7 @@ static int start_connect_attempt(struct ConnectionAttempt *attempt, int ff_connect_parallel(struct addrinfo *addrs, int timeout_ms_per_address, int parallel, URLContext *h, int *fd, - void (*customize_fd)(void *, int), void *customize_ctx) + int (*customize_fd)(void *, int, int), void *customize_ctx) { struct ConnectionAttempt attempts[3]; struct pollfd pfd[3]; diff --git a/libavformat/network.h b/libavformat/network.h index 71c49a73fb..ca214087fc 100644 --- a/libavformat/network.h +++ b/libavformat/network.h @@ -336,6 +336,6 @@ void ff_log_net_error(void *ctx, int level, const char* prefix); */ int ff_connect_parallel(struct addrinfo *addrs, int timeout_ms_per_address, int parallel, URLContext *h, int *fd, - void (*customize_fd)(void *, int), void *customize_ctx); + int (*customize_fd)(void *, int, int), void *customize_ctx); #endif /* AVFORMAT_NETWORK_H */ diff --git a/libavformat/tcp.c b/libavformat/tcp.c index a11ccbb913..a889633457 100644 --- a/libavformat/tcp.c +++ b/libavformat/tcp.c @@ -36,6 +36,8 @@ typedef struct TCPContext { const AVClass *class; int fd; int listen; + char *local_port; + char *local_addr; int open_timeout; int rw_timeout; int listen_timeout; @@ -52,6 +54,8 @@ typedef struct TCPContext { #define E AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { { "listen", "Listen for incoming connections", OFFSET(listen), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 2, .flags = D|E }, + { "local_port", "Local port", OFFSET(local_port), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, .flags = D|E }, + { "local_addr", "Local address", OFFSET(local_addr), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, .flags = D|E }, { "timeout", "set timeout (in microseconds) of socket I/O operations", OFFSET(rw_timeout), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, { "listen_timeout", "Connection awaiting timeout (in milliseconds)", OFFSET(listen_timeout), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, { "send_buffer_size", "Socket send buffer size (in bytes)", OFFSET(send_buffer_size), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, @@ -70,9 +74,40 @@ static const AVClass tcp_class = { .version = LIBAVUTIL_VERSION_INT, }; -static void customize_fd(void *ctx, int fd) +static int customize_fd(void *ctx, int fd, int family) { TCPContext *s = ctx; + + if (s->local_addr || s->local_port) { + struct addrinfo hints = { 0 }, *ai, *cur_ai; + int ret; + + hints.ai_family = family; + hints.ai_socktype = SOCK_STREAM; + + ret = getaddrinfo(s->local_addr, s->local_port, &hints, &ai); + if (ret) { + av_log(ctx, AV_LOG_ERROR, + "Failed to getaddrinfo local addr: %s port: %s err: %s\n", + s->local_addr, s->local_port, gai_strerror(ret)); + return ret; + } + + cur_ai = ai; + while (cur_ai) { + ret = bind(fd, (struct sockaddr *)cur_ai->ai_addr, (int)cur_ai->ai_addrlen); + if (ret) + cur_ai = cur_ai->ai_next; + else + break; + } + freeaddrinfo(ai); + + if (ret) { + ff_log_net_error(ctx, AV_LOG_ERROR, "bind local failed"); + return ret; + } + } /* Set the socket's send or receive buffer sizes, if specified. If unspecified or setting fails, system default is used. */ if (s->recv_buffer_size > 0) { @@ -97,6 +132,8 @@ static void customize_fd(void *ctx, int fd) } } #endif /* !HAVE_WINSOCK2_H */ + + return 0; } /* return non zero if error */ @@ -129,6 +166,18 @@ static int tcp_open(URLContext *h, const char *uri, int flags) if (buf == endptr) s->listen = 1; } + if (av_find_info_tag(buf, sizeof(buf), "local_port", p)) { + av_freep(&s->local_port); + s->local_port = av_strdup(buf); + if (!s->local_addr) + return AVERROR(ENOMEM); + } + if (av_find_info_tag(buf, sizeof(buf), "local_addr", p)) { + av_freep(&s->local_addr); + s->local_addr = av_strdup(buf); + if (!s->local_addr) + return AVERROR(ENOMEM); + } if (av_find_info_tag(buf, sizeof(buf), "timeout", p)) { s->rw_timeout = strtol(buf, NULL, 10); } @@ -183,7 +232,7 @@ static int tcp_open(URLContext *h, const char *uri, int flags) } if (fd < 0) goto fail1; - customize_fd(s, fd); + customize_fd(s, fd, cur_ai->ai_family); } if (s->listen == 2) { diff --git a/libavformat/version.h b/libavformat/version.h index af7d0a1024..cc56b7cf5c 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,7 +32,7 @@ #include "version_major.h" #define LIBAVFORMAT_VERSION_MINOR 4 -#define LIBAVFORMAT_VERSION_MICRO 100 +#define LIBAVFORMAT_VERSION_MICRO 101 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \

1 0

doc/filters/paletteuse: mention none dithering value
by Stefano Sabatini 28 Mar '23

28 Mar '23

ffmpeg | branch: master | Stefano Sabatini <stefasab(a)gmail.com> | Sun Mar 26 20:49:09 2023 +0200| [0684e58886881a998f1a7b510d73600ff1df2b90] | committer: Stefano Sabatini doc/filters/paletteuse: mention none dithering value Fix issue: http://trac.ffmpeg.org/ticket/9950 > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0684e58886881a998… --- doc/filters.texi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/filters.texi b/doc/filters.texi index 62146e717f..913c4712aa 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -18652,6 +18652,8 @@ Frankie Sierra dithering v3 (error diffusion) Burkes dithering (error diffusion) @item atkinson Atkinson dithering by Bill Atkinson at Apple Computer (error diffusion) +@item none +Disable dithering. @end table Default is @var{sierra2_4a}.

1 0

doc/outdevs/sdl: update options documentation
by Stefano Sabatini 28 Mar '23

28 Mar '23

ffmpeg | branch: master | Stefano Sabatini <stefasab(a)gmail.com> | Sun Mar 26 20:43:26 2023 +0200| [64016356bc1ed934188bbf6b9e1332b08ecebb4e] | committer: Stefano Sabatini doc/outdevs/sdl: update options documentation Drop mention of missing icon_title option, document window_borderless option. Fix issue: http://trac.ffmpeg.org/ticket/9583 > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=64016356bc1ed9341… --- doc/outdevs.texi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/outdevs.texi b/doc/outdevs.texi index 49eb6f8b1f..93391dbed7 100644 --- a/doc/outdevs.texi +++ b/doc/outdevs.texi @@ -421,14 +421,14 @@ For more information about SDL, check: @table @option -@item icon_title -Set the name of the iconified SDL window, if not specified it is set -to the same value of @var{window_title}. +@item window_borderless +Set SDL window border off. +Default value is 0 (enable window border). @item window_enable_quit Enable quit action (using window button or keyboard key) when non-zero value is provided. -Default value is 1 (enable quit action) +Default value is 1 (enable quit action). @item window_fullscreen Set fullscreen mode when non-zero value is provided.

1 0

doc/outdevs/sdl: sort options by name
by Stefano Sabatini 28 Mar '23

28 Mar '23

ffmpeg | branch: master | Stefano Sabatini <stefasab(a)gmail.com> | Sun Mar 26 20:35:59 2023 +0200| [42d99d51324eabf2facdbc514b056de91a3c4c85] | committer: Stefano Sabatini doc/outdevs/sdl: sort options by name > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=42d99d51324eabf2f… --- doc/outdevs.texi | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/doc/outdevs.texi b/doc/outdevs.texi index aa41e29523..49eb6f8b1f 100644 --- a/doc/outdevs.texi +++ b/doc/outdevs.texi @@ -421,32 +421,32 @@ For more information about SDL, check: @table @option -@item window_title -Set the SDL window title, if not specified default to the filename -specified for the output device. - @item icon_title Set the name of the iconified SDL window, if not specified it is set to the same value of @var{window_title}. +@item window_enable_quit +Enable quit action (using window button or keyboard key) +when non-zero value is provided. +Default value is 1 (enable quit action) + +@item window_fullscreen +Set fullscreen mode when non-zero value is provided. +Default value is zero. + @item window_size Set the SDL window size, can be a string of the form @var{width}x@var{height} or a video size abbreviation. If not specified it defaults to the size of the input video, downscaled according to the aspect ratio. +@item window_title +Set the SDL window title, if not specified default to the filename +specified for the output device. + @item window_x @item window_y Set the position of the window on the screen. - -@item window_fullscreen -Set fullscreen mode when non-zero value is provided. -Default value is zero. - -@item window_enable_quit -Enable quit action (using window button or keyboard key) -when non-zero value is provided. -Default value is 1 (enable quit action) @end table @subsection Interactive commands

1 0

doc/filters/aspect: update documentation
by Stefano Sabatini 28 Mar '23

28 Mar '23

ffmpeg | branch: master | Stefano Sabatini <stefasab(a)gmail.com> | Sun Mar 26 20:14:08 2023 +0200| [47c56ff5540fd5e402e805c8878b8d5e59f40f96] | committer: Stefano Sabatini doc/filters/aspect: update documentation Drop mention of unsupported N:M syntax, dropped since 0ed61546c459. Also, drop reference of common expression constants, and fix description of a expression parameter. Fix issue: http://trac.ffmpeg.org/ticket/9974 > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=47c56ff5540fd5e40… --- doc/filters.texi | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 889de8b11a..62146e717f 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -20888,12 +20888,9 @@ It accepts the following parameters: @item r, ratio, dar (@code{setdar} only), sar (@code{setsar} only) Set the aspect ratio used by the filter. -The parameter can be a floating point number string, an expression, or -a string of the form @var{num}:@var{den}, where @var{num} and -@var{den} are the numerator and denominator of the aspect ratio. If -the parameter is not specified, it is assumed the value "0". -In case the form "@var{num}:@var{den}" is used, the @code{:} character -should be escaped. +The parameter can be a floating point number string, or an expression. If the +parameter is not specified, the value "0" is assumed, meaning that the same +input value is used. @item max Set the maximum integer value to use for expressing numerator and @@ -20902,19 +20899,14 @@ Default value is @code{100}. @end table -The parameter @var{sar} is an expression containing -the following constants: +The parameter @var{sar} is an expression containing the following constants: @table @option -@item E, PI, PHI -These are approximated values for the mathematical constants e -(Euler's number), pi (Greek pi), and phi (the golden ratio). - @item w, h The input width and height. @item a -These are the same as @var{w} / @var{h}. +Same as @var{w} / @var{h}. @item sar The input sample aspect ratio.

1 0

lavfi/aspect: apply style fixes
by Stefano Sabatini 28 Mar '23

28 Mar '23

ffmpeg | branch: master | Stefano Sabatini <stefasab(a)gmail.com> | Sun Mar 26 20:08:56 2023 +0200| [7d58df7bb2b01be7a8ed8f4dfec183e3f96dd764] | committer: Stefano Sabatini lavfi/aspect: apply style fixes > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7d58df7bb2b01be7a… --- libavfilter/vf_aspect.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_aspect.c b/libavfilter/vf_aspect.c index 0a10a5a176..b453de70c5 100644 --- a/libavfilter/vf_aspect.c +++ b/libavfilter/vf_aspect.c @@ -41,7 +41,8 @@ static const char *const var_names[] = { "w", "h", - "a", "dar", + "a", + "dar", "sar", "hsub", "vsub", @@ -51,7 +52,8 @@ static const char *const var_names[] = { enum var_name { VAR_W, VAR_H, - VAR_A, VAR_DAR, + VAR_A, + VAR_DAR, VAR_SAR, VAR_HSUB, VAR_VSUB, @@ -105,8 +107,8 @@ static int get_aspect_ratio(AVFilterLink *inlink, AVRational *aspect_ratio) /* evaluate new aspect ratio*/ ret = av_expr_parse_and_eval(&res, s->ratio_expr, - var_names, var_values, - NULL, NULL, NULL, NULL, NULL, 0, ctx); + var_names, var_values, + NULL, NULL, NULL, NULL, NULL, 0, ctx); if (ret < 0) { ret = av_parse_ratio(aspect_ratio, s->ratio_expr, s->max, 0, ctx); } else

1 0