[FFmpeg-devel] [PATCH] ffprobe: parse arguments for -print_format writer

[Stefano Sabatini]

This allows -print_format to accept string of the form WRITER=OPTIONS,
as required by the pending compact writer patch.
---
 doc/ffprobe.texi |    8 ++++++++
 ffprobe.c        |   34 ++++++++++++++++++++++++++--------
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/doc/ffprobe.texi b/doc/ffprobe.texi
index 59643c2..5d5b5de 100644
--- a/doc/ffprobe.texi
+++ b/doc/ffprobe.texi
@@ -83,6 +83,14 @@ options "-unit -prefix -byte_binary_prefix -sexagesimal".
 @item -print_format @var{format}
 Set the output printing format.
 
+It accepts a string of the form:
+ at example
+ at var{writer_name}[=@var{writer_options}]
+ at end example
+
+ at var{writer_name} specify the name of the writer, and
+ at var{writer_options} specify the options to be passed to the writer.
+
 See the Writers section below.
 
 @item -show_format
diff --git a/ffprobe.c b/ffprobe.c
index f1f77d0..ddb783b 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -23,6 +23,7 @@
 
 #include "libavformat/avformat.h"
 #include "libavcodec/avcodec.h"
+#include "libavutil/avstring.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/dict.h"
@@ -737,21 +738,34 @@ static int probe_file(const char *filename)
     AVFormatContext *fmt_ctx;
     int ret;
     Writer *w;
+    const char *buf = print_format;
+    char *w_str = NULL, *w_args = NULL;
     WriterContext *wctx;
 
     writer_register_all();
 
-    w = writer_get_by_name(print_format);
-    if (!w) {
-        fprintf(stderr, "Invalid output format '%s'\n", print_format);
-        return AVERROR(EINVAL);
+    if (buf) {
+        w_str = av_get_token(&buf, "=");
+        if (*buf == '=') {
+            buf++;
+            w_args = av_get_token(&buf, "");
+        }
     }
 
-    if ((ret = writer_open(&wctx, w, NULL, NULL)) < 0)
-        return ret;
+    if (!w_str)
+        w_str = av_strdup("default");
 
+    w = writer_get_by_name(w_str);
+    if (!w) {
+        av_log(NULL, AV_LOG_ERROR, "Invalid output format '%s'\n", w_str);
+        ret = AVERROR(EINVAL);
+        goto end;
+    }
+
+    if ((ret = writer_open(&wctx, w, w_args, NULL)) < 0)
+        goto end;
     if ((ret = open_input_file(&fmt_ctx, filename)))
-        return ret;
+        goto end;
 
     writer_print_header(wctx);
     PRINT_CHAPTER(packets);
@@ -762,7 +776,11 @@ static int probe_file(const char *filename)
     av_close_input_file(fmt_ctx);
     writer_close(&wctx);
 
-    return 0;
+end:
+    av_free(w_str);
+    av_free(w_args);
+
+    return ret;
 }
 
 static void show_usage(void)
-- 
1.7.2.5