highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/af_sofalizer: warn if user gives unknown channel names

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2016-12-14 22:47:38 +01:00
parent c4afd4abce
commit 458fbee221
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/af_sofalizer.c
View File

@ -373,9 +373,8 @@ error:
return ret; return ret;
} }
static int parse_channel_name(char **arg, int *rchannel) static int parse_channel_name(char **arg, int *rchannel, char *buf)
{ {
char buf[8];
int len, i, channel_id = 0; int len, i, channel_id = 0;
int64_t layout, layout0; int64_t layout, layout0;
@ -409,12 +408,15 @@ static void parse_speaker_pos(AVFilterContext *ctx, int64_t in_channel_layout)
p = args; p = args;
while ((arg = av_strtok(p, "|", &tokenizer))) { while ((arg = av_strtok(p, "|", &tokenizer))) {
char buf[8];
float azim, elev; float azim, elev;
int out_ch_id; int out_ch_id;
p = NULL; p = NULL;
if (parse_channel_name(&arg, &out_ch_id)) if (parse_channel_name(&arg, &out_ch_id, buf)) {
av_log(ctx, AV_LOG_WARNING, "Failed to parse \'%s\' as channel name.\n", buf);
continue; continue;
}
if (sscanf(arg, "%f %f", &azim, &elev) == 2) { if (sscanf(arg, "%f %f", &azim, &elev) == 2) {
s->vspkrpos[out_ch_id].set = 1; s->vspkrpos[out_ch_id].set = 1;
s->vspkrpos[out_ch_id].azim = azim; s->vspkrpos[out_ch_id].azim = azim;