gmane.comp.video.libav.devel

Re: [PATCH] avprobe: display the codec profile in show_stream()

Anton Khirnov — 2012-05-26T05:50:29

On Fri, 25 May 2012 15:53:05 -0700, Luca Barbato <lu_zero-aBrp7R+bbdUdnm+yROfE0A< at >public.gmane.org> wrote:

LGTM

Re: [PATCH] avprobe: fix function prototype

Luca Barbato — 2012-05-25T23:41:13

I'll stab that part on a later commit later.

lu

Re: [PATCH] avprobe: fix function prototype

Martin Storsjö — 2012-05-25T23:32:36


Ok if you mention it in the commit message.

// Martin

Re: [PATCH] avprobe: fix function prototype

Luca Barbato — 2012-05-25T23:30:35

Making it consistent with the previous option mostly.

lu

Re: [PATCH] avprobe: fix function prototype

Martin Storsjö — 2012-05-25T23:13:49


This change is unrelated, right? Ok without this part, unless there's a 
reason for it?

// Martin

[PATCH] avprobe: display the codec profile inshow_stream()

Luca Barbato — 2012-05-25T22:53:05

From: Christian Schmidt <schmidt-IABvq36EpHazQB+pC5nmwQ< at >public.gmane.org>

---
 avprobe.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/avprobe.c b/avprobe.c
index 3015763..cd0fdd7 100644
--- a/avprobe.c
+++ b/avprobe.c
< at >< at > -540,6 +540,7 < at >< at > static void show_stream(AVFormatContext *fmt_ctx, int stream_idx)
     AVStream *stream = fmt_ctx->streams[stream_idx];
     AVCodecContext *dec_ctx;
     AVCodec *dec;
+    const char *profile;
     char val_str[128];
     AVRational display_aspect_ratio;
 
< at >< at > -566,6 +567,10 < at >< at > static void show_stream(AVFormatContext *fmt_ctx, int stream_idx)
         probe_str("codec_tag", tag_string(val_str, sizeof(val_str),
                                           dec_ctx->codec_tag));
 
+        /* print profile, if there is one */
+        if (dec && (profile = av_get_profile_name(dec, dec_ctx->profile)))
+            probe_str("profile", profile);
+
         switch (dec_ctx->codec_type) {
         case AVMEDIA_TYPE_VIDEO:
             probe_int("widt

Re: [PATCH 3/3] avconv: Display the error returned by avformat_write_header

Luca Barbato — 2012-05-25T22:30:27

Patch ok then.

lu

Re: [PATCH] rtpenc: Expose the ssrc as an avoption

Luca Barbato — 2012-05-25T22:27:21

OK.

Re: [PATCH 1/3] rtpenc_chain: Free the URLContext on failure

Luca Barbato — 2012-05-25T22:26:45

Seems fine and so patch 2.

Re: [PATCH 3/3] avconv: Display the error returned by avformat_write_header

Martin Storsjö — 2012-05-25T22:26:27


We have print_error in cmdutils.c, which prints it directly using av_log. 
Here we seem to fill the error string into a buffer which is printed 
later. (Anton might be able to comment on whether this is necessary or if 
we'd want to adjust it.)

A separate question is whether this is useful, or if the error codes are 
bogus more often than not - then this is just misleading... But if we 
start printing it, we have more motivation to actually fix the error 
codes.

// Martin

Re: [PATCH 3/3] avconv: Display the error returned by avformat_write_header

Luca Barbato — 2012-05-25T22:24:17

Don't we have already something for that around? The rest seems fine.

[PATCH] avprobe: fix function prototype

Luca Barbato — 2012-05-25T22:21:04

make opt_output_format return the correct value.
---
 avprobe.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/avprobe.c b/avprobe.c
index 5313894..3015763 100644
--- a/avprobe.c
+++ b/avprobe.c
< at >< at > -757,7 +757,7 < at >< at > static int opt_format(const char *opt, const char *arg)
     return 0;
 }
 
-static void opt_output_format(const char *opt, const char *arg)
+static int opt_output_format(const char *opt, const char *arg)
 {
 
     if (!strcmp(arg, "json")) {
< at >< at > -781,8 +781,9 < at >< at > static void opt_output_format(const char *opt, const char *arg)
         print_string  = ini_print_string;
     } else {
         av_log(NULL, AV_LOG_ERROR, "Unsupported formatter %s\n", arg);
-        exit(1);
+        return AVERROR(EINVAL);
     }
+    return 0;
 }
 
 static int opt_show_format_entry(const char *opt, const char *arg)
< at >< at > -835,7 +836,7 < at >< at > static void opt_pretty(void)
 static const OptionDef options[] = {
 #include "cmdutils_common_opts.h"
     { "f", HAS_ARG, {(void*)opt_format}, "force for

[PATCH] rtpenc: Expose the ssrc as an avoption

Martin Storsjö — 2012-05-25T22:03:10

This allows the caller to set it, and allows the caller to query
what it was set to.
---
 libavformat/rtpenc.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c
index 29fc2f4..71eeb7e 100644
--- a/libavformat/rtpenc.c
+++ b/libavformat/rtpenc.c
< at >< at > -33,6 +33,7 < at >< at >
 static const AVOption options[] = {
     FF_RTP_FLAG_OPTS(RTPMuxContext, flags)
     { "payload_type", "Specify RTP payload type", offsetof(RTPMuxContext, payload_type), AV_OPT_TYPE_INT, {.dbl = -1 }, -1, 127, AV_OPT_FLAG_ENCODING_PARAM },
+    { "ssrc", "Stream identifier", offsetof(RTPMuxContext, ssrc), AV_OPT_TYPE_INT, { 0 }, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM },
     { NULL },
 };
 
< at >< at > -101,7 +102,8 < at >< at > static int rtp_write_header(AVFormatContext *s1)
     s->base_timestamp = av_get_random_seed();
     s->timestamp = s->base_timestamp;
     s->cur_timestamp = 0;
-    s->ssrc = av_get_random_seed();
+    if (!s->ssrc)
+        s->ssrc = av_get_random_seed();
     s->firs

[PATCH 2/3] rtpenc_chain: Return an error codeinstead of just a plain pointer

Martin Storsjö — 2012-05-25T22:00:04

Also check the return value in sapenc.
---
 libavformat/movenchint.c   |    6 +++---
 libavformat/rtpenc_chain.c |   23 +++++++++++++++--------
 libavformat/rtpenc_chain.h |    4 ++--
 libavformat/rtsp.c         |    8 +++++---
 libavformat/sapenc.c       |    6 ++++--
 5 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/libavformat/movenchint.c b/libavformat/movenchint.c
index 579d040..5ef90f1 100644
--- a/libavformat/movenchint.c
+++ b/libavformat/movenchint.c
< at >< at > -43,9 +43,9 < at >< at > int ff_mov_init_hinting(AVFormatContext *s, int index, int src_index)
     track->enc->codec_type = AVMEDIA_TYPE_DATA;
     track->enc->codec_tag  = track->tag;
 
-    track->rtp_ctx = ff_rtp_chain_mux_open(s, src_st, NULL,
-                                           RTP_MAX_PACKET_SIZE);
-    if (!track->rtp_ctx)
+    ret = ff_rtp_chain_mux_open(&track->rtp_ctx, s, src_st, NULL,
+                                RTP_MAX_PACKET_SIZE);
+    if (ret < 0)
         goto fail;
 
     /* Copy the RTP AVStream timebase back to

[PATCH 3/3] avconv: Display the error returned byavformat_write_header

Martin Storsjö — 2012-05-25T22:00:05

---
 avconv.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/avconv.c b/avconv.c
index 5506869..5861f1b 100644
--- a/avconv.c
+++ b/avconv.c
< at >< at > -2863,8 +2863,12 < at >< at > static int transcode_init(void)
     for (i = 0; i < nb_output_files; i++) {
         oc = output_files[i]->ctx;
         oc->interrupt_callback = int_cb;
-        if (avformat_write_header(oc, &output_files[i]->opts) < 0) {
-            snprintf(error, sizeof(error), "Could not write header for output file #%d (incorrect codec parameters ?)", i);
+        if ((ret = avformat_write_header(oc, &output_files[i]->opts)) < 0) {
+            char errbuf[128];
+            const char *errbuf_ptr = errbuf;
+            if (av_strerror(ret, errbuf, sizeof(errbuf)) < 0)
+                errbuf_ptr = strerror(AVUNERROR(ret));
+            snprintf(error, sizeof(error), "Could not write header for output file #%d (incorrect codec parameters ?): %s", i, errbuf_ptr);
             ret = AVERROR(EINVAL);
             goto dump_for

[PATCH 1/3] rtpenc_chain: Free the URLContext onfailure

Martin Storsjö — 2012-05-25T22:00:03

If an URLContext is passed in, its ownership is given to this
function, and is either owned by the returned AVFormatContext
on a successful return, or freed on failure.
---
 libavformat/rtpenc_chain.c |   18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/libavformat/rtpenc_chain.c b/libavformat/rtpenc_chain.c
index 16b38d6..3b5ea6c 100644
--- a/libavformat/rtpenc_chain.c
+++ b/libavformat/rtpenc_chain.c
< at >< at > -28,25 +28,23 < at >< at >
 AVFormatContext *ff_rtp_chain_mux_open(AVFormatContext *s, AVStream *st,
                                        URLContext *handle, int packet_size)
 {
-    AVFormatContext *rtpctx;
+    AVFormatContext *rtpctx = NULL;
     int ret;
     AVOutputFormat *rtp_format = av_guess_format("rtp", NULL, NULL);
     uint8_t *rtpflags;
     AVDictionary *opts = NULL;
 
     if (!rtp_format)
-        return NULL;
+        goto fail;
 
     /* Allocate an AVFormatContext for each output stream */
     rtpctx = avformat_alloc_context();
     if (!rtpctx)
-        re

[PATCH 5/5] avprobe: changelog entry

Luca Barbato — 2012-05-25T20:00:21

---
 Changelog |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Changelog b/Changelog
index 252cd9e..822f062 100644
--- a/Changelog
+++ b/Changelog
< at >< at > -21,7 +21,7 < at >< at > version <next>:
 - add fps filter
 - audio split filter
 - audio mix filter
-
+- avprobe output is now standard INI or JSON.
 
 version 0.8:

[PATCH 3/5] avprobe: provide JSON output

Luca Barbato — 2012-05-25T20:00:19

JSON usage is quite widespread.
---
 avprobe.c |  120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 120 insertions(+), 0 deletions(-)

diff --git a/avprobe.c b/avprobe.c
index f3bb437..5313894 100644
--- a/avprobe.c
+++ b/avprobe.c
< at >< at > -97,6 +97,7 < at >< at > typedef struct {
 
 static AVIOContext *probe_out = NULL;
 static OutputContext octx;
+#define AVP_INDENT() avio_printf(probe_out, "%*c", octx.level * 2, ' ')
 
 /*
  * Default format, INI
< at >< at > -190,6 +191,96 < at >< at > static void ini_print_string(const char *key, const char *value)
 }
 
 /*
+ * Alternate format, JSON
+ */
+
+static void json_print_header(void)
+{
+    avio_printf(probe_out, "{");
+}
+static void json_print_footer(void)
+{
+    avio_printf(probe_out, "}\n");
+}
+
+static void json_print_array_header(const char *name)
+{
+    if (octx.prefix[octx.level -1].nb_elems)
+        avio_printf(probe_out, ",\n");
+    AVP_INDENT();
+    avio_printf(probe_out, "\"%s\" : ", name);
+    avio_printf(probe_out, "[\n");
+}
+
+static voi

[PATCH 4/5] avprobe: update documentation

Luca Barbato — 2012-05-25T20:00:20

Update the documentation according to the latest changes
---
 doc/avprobe.texi |   18 +++++-------------
 1 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/doc/avprobe.texi b/doc/avprobe.texi
index 67c5e20..af111e7 100644
--- a/doc/avprobe.texi
+++ b/doc/avprobe.texi
< at >< at > -41,19 +41,8 < at >< at > Options are used to list some of the formats supported by avprobe or
 for specifying which information to display, and for setting how
 avprobe will show it.
 
-avprobe output is designed to be easily parsable by a textual filter,
-and consists of one or more sections of the form:
-< at >example
-[SECTION]
-key1=val1
-...
-keyN=valN
-[/SECTION]
-< at >end example
-
-Metadata tags stored in the container or in the streams are recognized
-and printed in the corresponding "FORMAT" or "STREAM" section, and
-are prefixed by the string "TAG:".
+avprobe output is designed to be easily parsable by any INI or JSON
+parsers.
 
 < at >c man end
 
< at >< at > -69,6 +58,9 < at >< at > are prefixed by the string "TAG:".
 < at >item -f < at >var{format}
 Force format to

[PATCH 1/5] avprobe: improve formatting

Luca Barbato — 2012-05-25T20:00:17

Do not use decimals if not needed.
---
 avprobe.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/avprobe.c b/avprobe.c
index 6182875..5df6937 100644
--- a/avprobe.c
+++ b/avprobe.c
< at >< at > -90,11 +90,12 < at >< at > static char *value_string(char *buf, int buf_size, double val, const char *unit)
             val  /= pow(10, index * 3);
             prefix_string = decimal_unit_prefixes[index];
         }
-
-        snprintf(buf, buf_size, "%.3f %s%s", val, prefix_string,
+        snprintf(buf, buf_size, "%.*f%s%s",
+                 index ? 3 : 0, val,
+                 prefix_string,
                  show_value_unit ? unit : "");
     } else {
-        snprintf(buf, buf_size, "%f %s", val, show_value_unit ? unit : "");
+        snprintf(buf, buf_size, "%f%s", val, show_value_unit ? unit : "");
     }
 
     return buf;

[PATCH 2/5] avprobe: output proper INI format

Luca Barbato — 2012-05-25T20:00:18

Make the output valid INI serialization.
---
 avprobe.c |  502 +++++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 393 insertions(+), 109 deletions(-)

diff --git a/avprobe.c b/avprobe.c
index 5df6937..f3bb437 100644
--- a/avprobe.c
+++ b/avprobe.c
< at >< at > -64,6 +64,262 < at >< at > void exit_program(int ret)
     exit(ret);
 }
 
+/*
+ * The output is structured in array and objects that might contain items
+ * Array could require the objects within to not be named.
+ * Object could require the items within to be named.
+ *
+ * For flat representation the name of each section is saved on prefix so it
+ * can be rendered in order to represent nested structures (e.g. array of
+ * objects for the packets list).
+ *
+ * Within an array each element can need an unique identifier or an index.
+ *
+ * Nesting level is accounted separately.
+ */
+
+typedef enum {
+    ARRAY,
+    OBJECT
+} ProbeElementType;
+
+typedef struct {
+    const char *name;
+    ProbeElementType type;
+    int64_t index;
+    in