wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed metadata print option to accept general urls

Browse source 
This is an - once again - updated patch, that uses avio_write instead
of avio_puts to stream clean text output without null characters. Works
now for me as intended.

Changes metadata filter to accept general urls as file argument without
breaking former behaviour. As a byproduct, it also allows for writing to
file "-" if specified as "file:-".

Example:

ffmpeg -i test.wav -filter_complex "silencedetect=n=-40dB:d=0.1,ametadata=mode=print:file='pipe\:4'" -f null

Signed-off-by: Sami Hult <sami.hult@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Sami Hult 2016-07-08 12:53:15 +00:00 • committed by Michael Niedermayer
parent e98ab799be
commit d4c8e93190
3 changed files with 46 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

48
libavfilter/f_metadata.c
View file

@ -31,6 +31,7 @@
#include "libavutil/internal.h"
#include "libavutil/opt.h"
#include "libavutil/timestamp.h"
#include "libavformat/avio.h"
#include "avfilter.h"
#include "audio.h"
#include "formats.h"
@ -80,7 +81,7 @@ typedef struct MetadataContext {
AVExpr *expr;
double var_values[VAR_VARS_NB];
FILE *file;
AVIOContext* avio_context;
char *file_str;
int (*compare)(struct MetadataContext *s,
@ -180,8 +181,11 @@ static void print_file(AVFilterContext *ctx, const char *msg, ...)
va_list argument_list;
va_start(argument_list, msg);
if (msg)
vfprintf(s->file, msg, argument_list);
if (msg) {
char buf[128];
vsnprintf(buf, sizeof(buf), msg, argument_list);
avio_write(s->avio_context, buf, av_strnlen(buf, sizeof(buf)));
}
va_end(argument_list);
}
@ -236,25 +240,29 @@ static av_cold int init(AVFilterContext *ctx)
}
}
if (s->file_str) {
if (!strcmp(s->file_str, "-")) {
s->file = stdout;
} else {
s->file = fopen(s->file_str, "w");
if (!s->file) {
int err = AVERROR(errno);
char buf[128];
av_strerror(err, buf, sizeof(buf));
av_log(ctx, AV_LOG_ERROR, "Could not open file %s: %s\n",
s->file_str, buf);
return err;
}
}
if (s->mode == METADATA_PRINT && s->file_str) {
s->print = print_file;
} else {
s->print = print_log;
}
s->avio_context = NULL;
if (s->file_str) {
if (!strcmp("-", s->file_str)) {
ret = avio_open(&s->avio_context, "pipe:1", AVIO_FLAG_WRITE);
} else {
ret = avio_open(&s->avio_context, s->file_str, AVIO_FLAG_WRITE);
}
if (ret < 0) {
char buf[128];
av_strerror(ret, buf, sizeof(buf));
av_log(ctx, AV_LOG_ERROR, "Could not open %s: %s\n",
s->file_str, buf);
return ret;
}
}
return 0;
}
@ -262,9 +270,9 @@ static av_cold void uninit(AVFilterContext *ctx)
{
MetadataContext *s = ctx->priv;
if (s->file && s->file != stdout)
fclose(s->file);
s->file = NULL;
if (s->avio_context) {
avio_closep(&s->avio_context);
}
}
static int filter_frame(AVFilterLink *inlink, AVFrame *frame)