virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

lavfi/aevalsrc: duplicate last expression for the missing channels

Browse Source 
Use last expression for the missing channel expressions in case the
channel layout was specified. Enhance flexibility.
This commit is contained in:
Stefano Sabatini 2013-12-06 10:26:11 +01:00
parent 5b073da7a1
commit 405b3eb535
3 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/filters.texi
View File

@ -1896,7 +1896,8 @@ This source accepts the following options:
@item exprs @item exprs
Set the '|'-separated expressions list for each separate channel. In case the Set the '|'-separated expressions list for each separate channel. In case the
@option{channel_layout} option is not specified, the selected channel layout @option{channel_layout} option is not specified, the selected channel layout
depends on the number of provided expressions. depends on the number of provided expressions. Otherwise the last
specified expression is applied to the remaining output channels.
@item channel_layout, c @item channel_layout, c
Set the channel layout. The number of channels in the specified layout Set the channel layout. The number of channels in the specified layout

34
libavfilter/asrc_aevalsrc.c
View File

@ -85,7 +85,7 @@ static av_cold int init(AVFilterContext *ctx)
{ {
EvalContext *eval = ctx->priv; EvalContext *eval = ctx->priv;
char *args1 = av_strdup(eval->exprs); char *args1 = av_strdup(eval->exprs);
char *expr, *buf; char *expr, *last_expr, *buf;
int ret; int ret;
if (!args1) { if (!args1) {
@ -94,27 +94,39 @@ static av_cold int init(AVFilterContext *ctx)
goto end; goto end;
} }
#define ADD_EXPRESSION(expr_) do { \
if (!av_dynarray2_add((void **)&eval->expr, &eval->nb_channels, \
sizeof(*eval->expr), NULL)) { \
ret = AVERROR(ENOMEM); \
goto end; \
} \
eval->expr[eval->nb_channels-1] = NULL; \
ret = av_expr_parse(&eval->expr[eval->nb_channels - 1], expr_, \
var_names, NULL, NULL, \
NULL, NULL, 0, ctx); \
if (ret < 0) \
goto end; \
} while (0)
/* parse expressions */ /* parse expressions */
buf = args1; buf = args1;
while (expr = av_strtok(buf, "|", &buf)) { while (expr = av_strtok(buf, "|", &buf)) {
if (!av_dynarray2_add((void **)&eval->expr, &eval->nb_channels, sizeof(*eval->expr), NULL)) { ADD_EXPRESSION(expr);
ret = AVERROR(ENOMEM); last_expr = expr;
goto end;
}
eval->expr[eval->nb_channels-1] = NULL;
ret = av_expr_parse(&eval->expr[eval->nb_channels - 1], expr, var_names,
NULL, NULL, NULL, NULL, 0, ctx);
if (ret < 0)
goto end;
} }
if (eval->chlayout_str) { if (eval->chlayout_str) {
int n; int i, n;
ret = ff_parse_channel_layout(&eval->chlayout, NULL, eval->chlayout_str, ctx); ret = ff_parse_channel_layout(&eval->chlayout, NULL, eval->chlayout_str, ctx);
if (ret < 0) if (ret < 0)
goto end; goto end;
n = av_get_channel_layout_nb_channels(eval->chlayout); n = av_get_channel_layout_nb_channels(eval->chlayout);
if (n > eval->nb_channels) {
for (i = eval->nb_channels; i < n; i++)
ADD_EXPRESSION(last_expr);
}
if (n != eval->nb_channels) { if (n != eval->nb_channels) {
av_log(ctx, AV_LOG_ERROR, av_log(ctx, AV_LOG_ERROR,
"Mismatch between the specified number of channels '%d' " "Mismatch between the specified number of channels '%d' "

2
libavfilter/version.h
View File

@ -31,7 +31,7 @@
#define LIBAVFILTER_VERSION_MAJOR 3 #define LIBAVFILTER_VERSION_MAJOR 3
#define LIBAVFILTER_VERSION_MINOR 91 #define LIBAVFILTER_VERSION_MINOR 91
#define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_MICRO 101
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \ LIBAVFILTER_VERSION_MINOR, \