gmane.comp.video.libav.devel

Re: [PATCH] movenc: Don't write the 'wave' atom or itschild 'enda' for lpcm audio.

Justin Ruggles — 2012-05-25T02:55:21

even better.

-Justin

[PATCH] movenc: Don't write the 'wave' atom or itschild 'enda' for lpcm audio.

Alex Converse — 2012-05-25T02:26:00

It's left over from stsd v0. QuickTime 7 no longer writes 'wave' or 'enda'
when 'lpcm' is the audio tag.
---
 libavformat/movenc.c |   21 +--------------------
 1 files changed, 1 insertions(+), 20 deletions(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 35c03dd..fa6e957 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
< at >< at > -264,14 +264,6 < at >< at > static int mov_write_extradata_tag(AVIOContext *pb, MOVTrack *track)
     return track->enc->extradata_size;
 }
 
-static int mov_write_enda_tag(AVIOContext *pb)
-{
-    avio_wb32(pb, 10);
-    ffio_wfourcc(pb, "enda");
-    avio_wb16(pb, 1); /* little endian */
-    return 10;
-}
-
 static void put_descr(AVIOContext *pb, int tag, unsigned int size)
 {
     int i = 3;
< at >< at > -334,14 +326,6 < at >< at > static int mov_write_esds_tag(AVIOContext *pb, MOVTrack *track) // Basic
     return update_size(pb, pos);
 }
 
-static int mov_pcm_le_gt16(enum CodecID codec_id)
-{
-    return codec_id == CODEC_ID_PCM_S24LE ||
-           codec_id == CODEC_ID_PCM_S32LE ||
-           codec_id == CODEC_ID_PCM_F32LE ||
-           codec_id == CODEC_ID_PCM_F64LE;
-}
-
 static int mov_write_ms_tag(AVIOContext *pb, MOVTrack *track)
 {
     int64_t pos = avio_tell(pb);
< at >< at > -403,8 +387,6 < at >< at > static int mov_write_wave_tag(AVIOContext *pb, MOVTrack *track)
         ffio_wfourcc(pb, "mp4a");
         avio_wb32(pb, 0);
         mov_write_esds_tag(pb, track);
-    } else if (mov_pcm_le_gt16(track->enc->codec_id)) {
-        mov_write_enda_tag(pb);
     } else if (track->enc->codec_id == CODEC_ID_AMR_NB) {
         mov_write_amr_tag(pb, track);
     } else if (track->enc->codec_id == CODEC_ID_AC3) {
< at >< at > -641,8 +623,7 < at >< at > static int mov_write_audio_tag(AVIOContext *pb, MOVTrack *track)
         track->enc->codec_id == CODEC_ID_AMR_NB ||
         track->enc->codec_id == CODEC_ID_ALAC ||
         track->enc->codec_id == CODEC_ID_ADPCM_MS ||
-        track->enc->codec_id == CODEC_ID_ADPCM_IMA_WAV ||
-        mov_pcm_le_gt16(track->enc->codec_id)))
+        track->enc->codec_id == CODEC_ID_ADPCM_IMA_WAV))
         mov_write_wave_tag(pb, track);
     else if(track->tag == MKTAG('m','p','4','a'))
         mov_write_esds_tag(pb, track);

Re: [PATCH] vp8: move block coeff arithcoder on stack.

Ronald S. Bultje — 2012-05-25T00:41:33

Hi,

On Fri, Apr 22, 2011 at 5:49 PM, Ronald S. Bultje <rsbultje-Re5JQEeQqe8AvxtiuMwx3w< at >public.gmane.org> wrote:

Late, but still applicable, I'm pinging this because I'd like to push
it, Alexander OK'ed it so I'll push unless there's objections.

Ronald

Re: IGMP v3

Martin Storsjö — 2012-05-24T21:20:18


Here's a rebased version. I haven't touched at all yet, it doesn't compile 
on OS X, but seems to compile on Linux. I'll try to have a closer look at 
it later...

// Martin

Re: [PATCH 2/2] rtmp: Pass the proper return code in rtmp_handshake

Martin Storsjö — 2012-05-24T21:15:11


Pushed these two.

// Martin

Re: [PATCH 3/3] lavr: add x86-optimized function for mixing 2 to 1 s16p with q8 coeffs

Justin Ruggles — 2012-05-24T21:09:49

ping.

-Justin

Re: [PATCH 2/3] lavr: add x86-optimized functions for mixing 2 to 1 s16p with float coeffs

Justin Ruggles — 2012-05-24T21:09:35

ping.

-Justin

[PATCH 2/2] avprobe: provide JSON output

Luca Barbato — 2012-05-24T19:35:36

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

diff --git a/avprobe.c b/avprobe.c
index e79bdab..8b2533e 100644
--- a/avprobe.c
+++ b/avprobe.c
< at >< at > -35,6 +35,7 < at >< at > const int program_birth_year = 2007;
 static int do_show_format  = 0;
 static AVDictionary *fmt_entries_to_show = NULL;
 static int nb_fmt_entries_to_show;
+static int do_output_json  = 0;
 static int do_show_packets = 0;
 static int do_show_streams = 0;
 
< at >< at > -97,6 +98,7 < at >< at > typedef struct {
 
 static AVIOContext *avp_out = NULL;
 static OutputContext octx;
+#define AVP_INDENT() avio_printf(avp_out, "%*c", octx.level * 2, ' ')
 
 /*
  * Default format, INI
< at >< at > -190,6 +192,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(avp_out, "{");
+}
+static void json_print_footer(void)
+{
+    avio_printf(avp_out, "}\n");
+}
+
+static void json_print_array_header(const char *name)
+{
+    if (octx.prefix[octx.level -1].nb_elems)
+        avio_printf(avp_out, ",\n");
+    AVP_INDENT();
+    avio_printf(avp_out, "\"%s\" : ", name);
+    avio_printf(avp_out, "[\n");
+}
+
+static void json_print_array_footer(const char *name)
+{
+    avio_printf(avp_out, "\n");
+    AVP_INDENT();
+    avio_printf(avp_out, "]");
+}
+
+static void json_print_object_header(const char *name)
+{
+    if (octx.prefix[octx.level -1].nb_elems)
+        avio_printf(avp_out, ",\n");
+    AVP_INDENT();
+    if (octx.prefix[octx.level -1].type == OBJECT)
+        avio_printf(avp_out, "\"%s\" : ", name);
+    avio_printf(avp_out, "{\n");
+}
+
+static void json_print_object_footer(const char *name)
+{
+    avio_printf(avp_out, "\n");
+    AVP_INDENT();
+    avio_printf(avp_out, "}");
+}
+
+static void json_print_integer(const char *key, int64_t value)
+{
+    if (octx.prefix[octx.level -1].nb_elems)
+        avio_printf(avp_out, ",\n");
+    AVP_INDENT();
+    avio_printf(avp_out, "\"%s\" : %"PRId64"", key, value);
+}
+
+static void json_escape_print(const char *s)
+{
+    int i = 0;
+    char c = 0;
+
+    while (c = s[i++]) {
+        switch (c) {
+        case '\r': avio_printf(avp_out, "%s", "\\r"); break;
+        case '\n': avio_printf(avp_out, "%s", "\\n"); break;
+        case '\f': avio_printf(avp_out, "%s", "\\f"); break;
+        case '\b': avio_printf(avp_out, "%s", "\\b"); break;
+        case '\t': avio_printf(avp_out, "%s", "\\t"); break;
+        case '\\':
+        case '"' : avio_w8(avp_out, '\\');
+        default:
+            if ((unsigned char)c < 32)
+                avio_printf(avp_out, "\\u00%02x", c & 0xff);
+            else
+                avio_w8(avp_out, c);
+        break;
+        }
+    }
+}
+
+static void json_print_string(const char *key, const char *value)
+{
+    if (octx.prefix[octx.level -1].nb_elems)
+        avio_printf(avp_out, ",\n");
+    AVP_INDENT();
+    avio_w8(avp_out, '\"');
+    json_escape_print(key);
+    avio_printf(avp_out, "\" : \"");
+    json_escape_print(value);
+    avio_w8(avp_out, '\"');
+}
+
+/*
  * Simple Formatter for single entries.
  */
 
< at >< at > -653,6 +745,20 < at >< at > static int opt_format(const char *opt, const char *arg)
     return 0;
 }
 
+static void opt_output_json(void)
+{
+    print_header        = json_print_header;
+    print_footer        = json_print_footer;
+    print_array_header  = json_print_array_header;
+    print_array_footer  = json_print_array_footer;
+    print_object_header = json_print_object_header;
+    print_object_footer = json_print_object_footer;
+
+    print_integer = json_print_integer;
+    print_string  = json_print_string;
+
+}
+
 static int opt_show_format_entry(const char *opt, const char *arg)
 {
     do_show_format = 1;
< at >< at > -713,6 +819,7 < at >< at > static const OptionDef options[] = {
       "use sexagesimal format HOURS:MM:SS.MICROSECONDS for time units" },
     { "pretty", 0, {(void*)&opt_pretty},
       "prettify the format of displayed values, make it more human readable" },
+    { "json", OPT_BOOL, {(void*)&do_output_json}, "output a json document instead of an ini one" },
     { "show_format",  OPT_BOOL, {(void*)&do_show_format} , "show format/container info" },
     { "show_format_entry", HAS_ARG, {(void*)opt_show_format_entry},
       "show a particular entry from the format/container info", "entry" },
< at >< at > -764,6 +871,9 < at >< at > int main(int argc, char **argv)
     if (!avp_out)
         exit(1);
 
+    if (do_output_json)
+        opt_output_json();
+
     avp_header();
     ret = probe_file(input_filename);
     avp_footer();

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

Luca Barbato — 2012-05-24T19:35:35

Make the output valid INI serialization.
---

This time with a bit more structure.

I hope that is what Anton wanted.

 avprobe.c |  520 ++++++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 396 insertions(+), 124 deletions(-)

diff --git a/avprobe.c b/avprobe.c
index 6182875..e79bdab 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
+} AvpElementType;
+
+typedef struct {
+    const char *name;
+    AvpElementType type;
+    int64_t index;
+    int64_t nb_elems;
+} AvpElement;
+
+typedef struct {
+    AvpElement *prefix;
+    int level;
+} OutputContext;
+
+static AVIOContext *avp_out = NULL;
+static OutputContext octx;
+
+/*
+ * Default format, INI
+ *
+ * - all key and values are utf8
+ * - '.' is the subgroup separator
+ * - newlines and the following characters are escaped
+ * - '\' is the escape character
+ * - '#' is the comment
+ * - '=' is the key/value separators
+ * - ':' is not used but usually parsed as key/value separator
+ */
+
+static void ini_print_header(void)
+{
+    avio_printf(avp_out, "# avprobe output\n\n");
+}
+static void ini_print_footer(void)
+{
+    avio_w8(avp_out, '\n');
+}
+
+static void ini_escape_print(const char *s)
+{
+    int i = 0;
+    char c = 0;
+
+    while (c = s[i++]) {
+        switch (c) {
+        case '\r': avio_printf(avp_out, "%s", "\\r"); break;
+        case '\n': avio_printf(avp_out, "%s", "\\n"); break;
+        case '\f': avio_printf(avp_out, "%s", "\\f"); break;
+        case '\b': avio_printf(avp_out, "%s", "\\b"); break;
+        case '\t': avio_printf(avp_out, "%s", "\\t"); break;
+        case '\\':
+        case '#' :
+        case '=' :
+        case ':' : avio_w8(avp_out, '\\');
+        default:
+            if ((unsigned char)c < 32)
+                avio_printf(avp_out, "\\x00%02x", c & 0xff);
+            else
+                avio_w8(avp_out, c);
+        break;
+        }
+    }
+}
+
+static void ini_print_array_header(const char *name)
+{
+    if (octx.prefix[octx.level -1].nb_elems)
+        avio_printf(avp_out, "\n");
+}
+
+static void ini_print_object_header(const char *name)
+{
+    int i;
+    AvpElement *el = octx.prefix + octx.level -1;
+
+    if (el->nb_elems)
+        avio_printf(avp_out, "\n");
+
+    avio_printf(avp_out, "[");
+
+    for (i = 1; i < octx.level; i++) {
+        el = octx.prefix + i;
+        avio_printf(avp_out, "%s.", el->name);
+        if (el->index >= 0)
+            avio_printf(avp_out, "%"PRId64".", el->index);
+    }
+
+    avio_printf(avp_out, "%s", name);
+    if (el && el->type == ARRAY)
+        avio_printf(avp_out, ".%"PRId64"", el->nb_elems);
+    avio_printf(avp_out, "]\n");
+}
+
+static void ini_print_integer(const char *key, int64_t value)
+{
+    ini_escape_print(key);
+    avio_printf(avp_out, "=%"PRId64"\n", value);
+}
+
+
+static void ini_print_string(const char *key, const char *value)
+{
+    ini_escape_print(key);
+    avio_printf(avp_out, "=");
+    ini_escape_print(value);
+    avio_w8(avp_out, '\n');
+}
+
+/*
+ * Simple Formatter for single entries.
+ */
+
+static void show_format_entry_integer(const char *key, int64_t value)
+{
+    if (key && av_dict_get(fmt_entries_to_show, key, NULL, 0)) {
+        if (nb_fmt_entries_to_show > 1)
+            avio_printf(avp_out, "%s=", key);
+        avio_printf(avp_out, "%"PRId64"\n", value);
+    }
+}
+
+static void show_format_entry_string(const char *key, const char *value)
+{
+    if (key && av_dict_get(fmt_entries_to_show, key, NULL, 0)) {
+        if (nb_fmt_entries_to_show > 1)
+            avio_printf(avp_out, "%s=", key);
+        avio_printf(avp_out, "%s\n", value);
+    }
+}
+
+
+void (*print_header)(void) = ini_print_header;
+void (*print_footer)(void) = ini_print_footer;
+
+void (*print_array_header) (const char *name) = ini_print_array_header;
+void (*print_array_footer) (const char *name);
+void (*print_object_header)(const char *name) = ini_print_object_header;
+void (*print_object_footer)(const char *name);
+
+void (*print_integer) (const char *key, int64_t value)     = ini_print_integer;
+void (*print_string)  (const char *key, const char *value) = ini_print_string;
+
+
+static void avp_group_enter(const char *name, int type)
+{
+    int64_t count = -1;
+
+    octx.prefix =
+        av_realloc(octx.prefix, sizeof(AvpElement) * (octx.level + 1));
+
+    if (!octx.prefix || !name) {
+        fprintf(stderr, "Out of memory\n");
+        exit(1);
+    }
+
+    if (octx.level) {
+        AvpElement *parent = octx.prefix + octx.level -1;
+        if (parent->type == ARRAY)
+            count = parent->nb_elems;
+        parent->nb_elems++;
+    }
+
+    octx.prefix[octx.level++] = (AvpElement){name, type, count, 0};
+}
+
+static void avp_group_leave(void)
+{
+    --octx.level;
+}
+
+static void avp_header(void)
+{
+    if (print_header)
+        print_header();
+    avp_group_enter("root", OBJECT);
+}
+
+static void avp_footer(void)
+{
+    if (print_footer)
+        print_footer();
+    avp_group_leave();
+}
+
+
+static void avp_array_header(const char *name)
+{
+    if (print_array_header)
+        print_array_header(name);
+
+    avp_group_enter(name, ARRAY);
+}
+
+static void avp_array_footer(const char *name)
+{
+    avp_group_leave();
+    if (print_array_footer)
+        print_array_footer(name);
+}
+
+static void avp_object_header(const char *name)
+{
+    if (print_object_header)
+        print_object_header(name);
+
+    avp_group_enter(name, OBJECT);
+}
+
+static void avp_object_footer(const char *name)
+{
+    avp_group_leave();
+    if (print_object_footer)
+        print_object_footer(name);
+}
+
+static void avp_int(const char *key, int64_t value)
+{
+    print_integer(key, value);
+    octx.prefix[octx.level -1].nb_elems++;
+}
+
+static void avp_str(const char *key, const char *value)
+{
+    print_string(key, value);
+    octx.prefix[octx.level -1].nb_elems++;
+}
+
+static void avp_dict(AVDictionary *dict, const char *name)
+{
+    AVDictionaryEntry *entry = NULL;
+    if (!dict)
+        return;
+    avp_object_header(name);
+    while ((entry = av_dict_get(dict, "", entry, AV_DICT_IGNORE_SUFFIX))) {
+        avp_str(entry->key, entry->value);
+    }
+    avp_object_footer(name);
+}
+
 static char *value_string(char *buf, int buf_size, double val, const char *unit)
 {
     if (unit == unit_second_str && use_value_sexagesimal_format) {
< at >< at > -90,11 +346,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;
< at >< at > -112,7 +369,7 < at >< at > static char *time_value_string(char *buf, int buf_size, int64_t val,
     return buf;
 }
 
-static char *ts_value_string (char *buf, int buf_size, int64_t ts)
+static char *ts_value_string(char *buf, int buf_size, int64_t ts)
 {
     if (ts == AV_NOPTS_VALUE) {
         snprintf(buf, buf_size, "N/A");
< at >< at > -123,6 +380,21 < at >< at > static char *ts_value_string (char *buf, int buf_size, int64_t ts)
     return buf;
 }
 
+static char *rational_string(char *buf, int buf_size, const char *sep,
+                             const AVRational *rat)
+{
+    snprintf(buf, buf_size, "%d%s%d", rat->num, sep, rat->den);
+    return buf;
+}
+
+static char *tag_string(char *buf, int buf_size, int tag)
+{
+    snprintf(buf, buf_size, "0x%04x", tag);
+    return buf;
+}
+
+
+
 static const char *media_type_string(enum AVMediaType media_type)
 {
     switch (media_type) {
< at >< at > -140,25 +412,25 < at >< at > static void show_packet(AVFormatContext *fmt_ctx, AVPacket *pkt)
     char val_str[128];
     AVStream *st = fmt_ctx->streams[pkt->stream_index];
 
-    printf("[PACKET]\n");
-    printf("codec_type=%s\n", media_type_string(st->codec->codec_type));
-    printf("stream_index=%d\n", pkt->stream_index);
-    printf("pts=%s\n", ts_value_string(val_str, sizeof(val_str), pkt->pts));
-    printf("pts_time=%s\n", time_value_string(val_str, sizeof(val_str),
-                                              pkt->pts, &st->time_base));
-    printf("dts=%s\n", ts_value_string(val_str, sizeof(val_str), pkt->dts));
-    printf("dts_time=%s\n", time_value_string(val_str, sizeof(val_str),
-                                              pkt->dts, &st->time_base));
-    printf("duration=%s\n", ts_value_string(val_str, sizeof(val_str),
-                                            pkt->duration));
-    printf("duration_time=%s\n", time_value_string(val_str, sizeof(val_str),
-                                                   pkt->duration,
-                                                   &st->time_base));
-    printf("size=%s\n", value_string(val_str, sizeof(val_str),
-                                     pkt->size, unit_byte_str));
-    printf("pos=%"PRId64"\n", pkt->pos);
-    printf("flags=%c\n", pkt->flags & AV_PKT_FLAG_KEY ? 'K' : '_');
-    printf("[/PACKET]\n");
+    avp_object_header("packet");
+    avp_str("codec_type", media_type_string(st->codec->codec_type));
+    avp_int("stream_index", pkt->stream_index);
+    avp_str("pts", ts_value_string(val_str, sizeof(val_str), pkt->pts));
+    avp_str("pts_time", time_value_string(val_str, sizeof(val_str),
+                                               pkt->pts, &st->time_base));
+    avp_str("dts", ts_value_string(val_str, sizeof(val_str), pkt->dts));
+    avp_str("dts_time", time_value_string(val_str, sizeof(val_str),
+                                               pkt->dts, &st->time_base));
+    avp_str("duration", ts_value_string(val_str, sizeof(val_str),
+                                             pkt->duration));
+    avp_str("duration_time", time_value_string(val_str, sizeof(val_str),
+                                                    pkt->duration,
+                                                    &st->time_base));
+    avp_str("size", value_string(val_str, sizeof(val_str),
+                                      pkt->size, unit_byte_str));
+    avp_int("pos", pkt->pos);
+    avp_str("flags", pkt->flags & AV_PKT_FLAG_KEY ? "K" : "_");
+    avp_object_footer("packet");
 }
 
 static void show_packets(AVFormatContext *fmt_ctx)
< at >< at > -166,9 +438,10 < at >< at > static void show_packets(AVFormatContext *fmt_ctx)
     AVPacket pkt;
 
     av_init_packet(&pkt);
-
+    avp_array_header("packets");
     while (!av_read_frame(fmt_ctx, &pkt))
         show_packet(fmt_ctx, &pkt);
+    avp_array_footer("packets");
 }
 
 static void show_stream(AVFormatContext *fmt_ctx, int stream_idx)
< at >< at > -177,138 +450,121 < at >< at > static void show_stream(AVFormatContext *fmt_ctx, int stream_idx)
     AVCodecContext *dec_ctx;
     AVCodec *dec;
     char val_str[128];
-    AVDictionaryEntry *tag = NULL;
     AVRational display_aspect_ratio;
 
-    printf("[STREAM]\n");
+    avp_object_header("stream");
 
-    printf("index=%d\n", stream->index);
+    avp_int("index", stream->index);
 
     if ((dec_ctx = stream->codec)) {
         if ((dec = dec_ctx->codec)) {
-            printf("codec_name=%s\n", dec->name);
-            printf("codec_long_name=%s\n", dec->long_name);
+            avp_str("codec_name", dec->name);
+            avp_str("codec_long_name", dec->long_name);
         } else {
-            printf("codec_name=unknown\n");
+            avp_str("codec_name", "unknown");
         }
 
-        printf("codec_type=%s\n", media_type_string(dec_ctx->codec_type));
-        printf("codec_time_base=%d/%d\n",
-               dec_ctx->time_base.num, dec_ctx->time_base.den);
+        avp_str("codec_type", media_type_string(dec_ctx->codec_type));
+        avp_str("codec_time_base",
+                     rational_string(val_str, sizeof(val_str),
+                                     "/", &dec_ctx->time_base));
 
         /* print AVI/FourCC tag */
         av_get_codec_tag_string(val_str, sizeof(val_str), dec_ctx->codec_tag);
-        printf("codec_tag_string=%s\n", val_str);
-        printf("codec_tag=0x%04x\n", dec_ctx->codec_tag);
+        avp_str("codec_tag_string", val_str);
+        avp_str("codec_tag", tag_string(val_str, sizeof(val_str),
+                                             dec_ctx->codec_tag));
 
         switch (dec_ctx->codec_type) {
         case AVMEDIA_TYPE_VIDEO:
-            printf("width=%d\n", dec_ctx->width);
-            printf("height=%d\n", dec_ctx->height);
-            printf("has_b_frames=%d\n", dec_ctx->has_b_frames);
+            avp_int("width", dec_ctx->width);
+            avp_int("height", dec_ctx->height);
+            avp_int("has_b_frames", dec_ctx->has_b_frames);
             if (dec_ctx->sample_aspect_ratio.num) {
-                printf("sample_aspect_ratio=%d:%d\n",
-                       dec_ctx->sample_aspect_ratio.num,
-                       dec_ctx->sample_aspect_ratio.den);
+                avp_str("sample_aspect_ratio",
+                             rational_string(val_str, sizeof(val_str), ":",
+                             &dec_ctx->sample_aspect_ratio));
                 av_reduce(&display_aspect_ratio.num, &display_aspect_ratio.den,
                           dec_ctx->width  * dec_ctx->sample_aspect_ratio.num,
                           dec_ctx->height * dec_ctx->sample_aspect_ratio.den,
                           1024*1024);
-                printf("display_aspect_ratio=%d:%d\n",
-                       display_aspect_ratio.num, display_aspect_ratio.den);
+                avp_str("display_aspect_ratio",
+                             rational_string(val_str, sizeof(val_str), ":",
+                             &display_aspect_ratio));
             }
-            printf("pix_fmt=%s\n",
+            avp_str("pix_fmt",
                    dec_ctx->pix_fmt != PIX_FMT_NONE ? av_pix_fmt_descriptors[dec_ctx->pix_fmt].name
                                                     : "unknown");
-            printf("level=%d\n", dec_ctx->level);
+            avp_int("level", dec_ctx->level);
             break;
 
         case AVMEDIA_TYPE_AUDIO:
-            printf("sample_rate=%s\n", value_string(val_str, sizeof(val_str),
-                                                    dec_ctx->sample_rate,
-                                                    unit_hertz_str));
-            printf("channels=%d\n", dec_ctx->channels);
-            printf("bits_per_sample=%d\n",
-                   av_get_bits_per_sample(dec_ctx->codec_id));
+            avp_str("sample_rate",
+                         value_string(val_str, sizeof(val_str),
+                                      dec_ctx->sample_rate,
+                                      unit_hertz_str));
+            avp_int("channels", dec_ctx->channels);
+            avp_int("bits_per_sample",
+                          av_get_bits_per_sample(dec_ctx->codec_id));
             break;
         }
     } else {
-        printf("codec_type=unknown\n");
+        avp_str("codec_type", "unknown");
     }
 
     if (fmt_ctx->iformat->flags & AVFMT_SHOW_IDS)
-        printf("id=0x%x\n", stream->id);
-    printf("r_frame_rate=%d/%d\n",
-           stream->r_frame_rate.num, stream->r_frame_rate.den);
-    printf("avg_frame_rate=%d/%d\n",
-           stream->avg_frame_rate.num, stream->avg_frame_rate.den);
-    printf("time_base=%d/%d\n",
-           stream->time_base.num, stream->time_base.den);
-    printf("start_time=%s\n",
-           time_value_string(val_str, sizeof(val_str),
+        avp_int("id", stream->id);
+    avp_str("r_frame_rate",
+                 rational_string(val_str, sizeof(val_str), "/",
+                 &stream->r_frame_rate));
+    avp_str("avg_frame_rate",
+                 rational_string(val_str, sizeof(val_str), "/",
+                 &stream->avg_frame_rate));
+    avp_str("time_base",
+                 rational_string(val_str, sizeof(val_str), "/",
+                 &stream->time_base));
+    avp_str("start_time",
+                 time_value_string(val_str, sizeof(val_str),
                              stream->start_time, &stream->time_base));
-    printf("duration=%s\n",
-           time_value_string(val_str, sizeof(val_str),
-                             stream->duration, &stream->time_base));
+    avp_str("duration",
+                 time_value_string(val_str, sizeof(val_str),
+                                   stream->duration, &stream->time_base));
     if (stream->nb_frames)
-        printf("nb_frames=%"PRId64"\n", stream->nb_frames);
-
-    while ((tag = av_dict_get(stream->metadata, "", tag,
-                              AV_DICT_IGNORE_SUFFIX)))
-        printf("TAG:%s=%s\n", tag->key, tag->value);
+        avp_int("nb_frames", stream->nb_frames);
 
-    printf("[/STREAM]\n");
-}
+    avp_dict(stream->metadata, "tags");
 
-static void print_format_entry(const char *tag,
-                               const char *val)
-{
-    if (!fmt_entries_to_show) {
-        if (tag) {
-            printf("%s=%s\n", tag, val);
-        } else {
-            printf("%s\n", val);
-        }
-    } else if (tag && av_dict_get(fmt_entries_to_show, tag, NULL, 0)) {
-        if (nb_fmt_entries_to_show > 1)
-            printf("%s=", tag);
-        printf("%s\n", val);
-    }
+    avp_object_footer("stream");
 }
 
 static void show_format(AVFormatContext *fmt_ctx)
 {
-    AVDictionaryEntry *tag = NULL;
     char val_str[128];
     int64_t size = fmt_ctx->pb ? avio_size(fmt_ctx->pb) : -1;
 
-    print_format_entry(NULL, "[FORMAT]");
-    print_format_entry("filename",         fmt_ctx->filename);
+    avp_object_header("format");
+    avp_str("filename",         fmt_ctx->filename);
     snprintf(val_str, sizeof(val_str) - 1, "%d", fmt_ctx->nb_streams);
-    print_format_entry("nb_streams",       val_str);
-    print_format_entry("format_name",      fmt_ctx->iformat->name);
-    print_format_entry("format_long_name", fmt_ctx->iformat->long_name);
-    print_format_entry("start_time",
+    avp_str("nb_streams",       val_str);
+    avp_str("format_name",      fmt_ctx->iformat->name);
+    avp_str("format_long_name", fmt_ctx->iformat->long_name);
+    avp_str("start_time",
                        time_value_string(val_str, sizeof(val_str),
                                          fmt_ctx->start_time, &AV_TIME_BASE_Q));
-    print_format_entry("duration",
+    avp_str("duration",
                        time_value_string(val_str, sizeof(val_str),
                                          fmt_ctx->duration, &AV_TIME_BASE_Q));
-    print_format_entry("size",
+    avp_str("size",
                        size >= 0 ? value_string(val_str, sizeof(val_str),
                                                 size, unit_byte_str)
                                   : "unknown");
-    print_format_entry("bit_rate",
+    avp_str("bit_rate",
                        value_string(val_str, sizeof(val_str),
                                     fmt_ctx->bit_rate, unit_bit_per_second_str));
 
-    while ((tag = av_dict_get(fmt_ctx->metadata, "", tag,
-                              AV_DICT_IGNORE_SUFFIX))) {
-        snprintf(val_str, sizeof(val_str) - 1, "TAG:%s", tag->key);
-        print_format_entry(val_str, tag->value);
-    }
+    avp_dict(fmt_ctx->metadata, "tags");
 
-    print_format_entry(NULL, "[/FORMAT]");
+    avp_object_footer("format");
 }
 
 static int open_input_file(AVFormatContext **fmt_ctx_ptr, const char *filename)
< at >< at > -355,20 +611,6 < at >< at > static int open_input_file(AVFormatContext **fmt_ctx_ptr, const char *filename)
     return 0;
 }
 
-static void close_input_file(AVFormatContext **ctx_ptr)
-{
-    int i;
-    AVFormatContext *fmt_ctx = *ctx_ptr;
-
-    /* close decoder for each stream */
-    for (i = 0; i < fmt_ctx->nb_streams; i++) {
-        AVStream *stream = fmt_ctx->streams[i];
-
-        avcodec_close(stream->codec);
-    }
-    avformat_close_input(ctx_ptr);
-}
-
 static int probe_file(const char *filename)
 {
     AVFormatContext *fmt_ctx;
< at >< at > -377,17 +619,20 < at >< at > static int probe_file(const char *filename)
     if ((ret = open_input_file(&fmt_ctx, filename)))
         return ret;
 
-    if (do_show_packets)
-        show_packets(fmt_ctx);
+    if (do_show_format)
+        show_format(fmt_ctx);
 
-    if (do_show_streams)
+    if (do_show_streams) {
+        avp_array_header("streams");
         for (i = 0; i < fmt_ctx->nb_streams; i++)
             show_stream(fmt_ctx, i);
+        avp_array_footer("streams");
+    }
 
-    if (do_show_format)
-        show_format(fmt_ctx);
+    if (do_show_packets)
+        show_packets(fmt_ctx);
 
-    close_input_file(&fmt_ctx);
+    avformat_close_input(&fmt_ctx);
     return 0;
 }
 
< at >< at > -412,6 +657,15 < at >< at > static int opt_show_format_entry(const char *opt, const char *arg)
 {
     do_show_format = 1;
     nb_fmt_entries_to_show++;
+    print_header        = NULL;
+    print_footer        = NULL;
+    print_array_header  = NULL;
+    print_array_footer  = NULL;
+    print_object_header = NULL;
+    print_object_footer = NULL;
+
+    print_integer = show_format_entry_integer;
+    print_string  = show_format_entry_string;
     av_dict_set(&fmt_entries_to_show, arg, "", 0);
     return 0;
 }
< at >< at > -469,9 +723,21 < at >< at > static const OptionDef options[] = {
     { NULL, },
 };
 
+static int avp_buf_write(void *opaque, uint8_t *buf, int buf_size)
+{
+    printf("%.*s", buf_size, buf);
+    return 0;
+}
+
+#define AVP_BUFFSIZE 4096
+
 int main(int argc, char **argv)
 {
     int ret;
+    uint8_t *buffer = av_malloc(AVP_BUFFSIZE);
+
+    if (!buffer)
+        exit(1);
 
     parse_loglevel(argc, argv, options);
     av_register_all();
< at >< at > -493,10 +759,16 < at >< at > int main(int argc, char **argv)
         exit(1);
     }
 
-    ret = probe_file(input_filename);
+    avp_out = avio_alloc_context(buffer, AVP_BUFFSIZE, 1, NULL, NULL,
+                                 avp_buf_write, NULL);
+    if (!avp_out)
+        exit(1);
 
-    uninit_opts();
-    av_dict_free(&fmt_entries_to_show);
+    avp_header();
+    ret = probe_file(input_filename);
+    avp_footer();
+    avio_flush(avp_out);
+    avio_close(avp_out);
 
     avformat_network_deinit();

Re: IGMP v3

Martin Storsjö — 2012-05-24T19:13:37


Sorry, haven't gotten to this yet.

// Martin

Re: [PATCH] opt: add av_opt_set_bin()

Martin Storsjö — 2012-05-24T19:02:57


Looks correct to me. Since this changes public API, you need to document 
it in docs/APIchanges and bump the minor version of libavutil, too.

// Martin

[PATCH] opt: add av_opt_set_bin()

Samuel Pitoiset — 2012-05-24T17:10:13

Introduce a new function to set binary data through AVOption
---
 libavutil/opt.c |   28 ++++++++++++++++++++++++++++
 libavutil/opt.h |    1 +
 2 files changed, 29 insertions(+)

diff --git a/libavutil/opt.c b/libavutil/opt.c
index 7c53024..1bee3a3 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
< at >< at > -316,6 +316,34 < at >< at > int av_opt_set_q(void *obj, const char *name, AVRational val, int search_flags)
     return set_number(obj, name, val.num, val.den, 1, search_flags);
 }
 
+int av_opt_set_bin(void *obj, const char *name, const uint8_t *val, int len, int search_flags)
+{
+    void *target_obj;
+    const AVOption *o = av_opt_find2(obj, name, NULL, 0, search_flags, &target_obj);
+    uint8_t *ptr;
+    uint8_t **dst;
+    int *lendst;
+
+    if (!o || !target_obj)
+        return AVERROR_OPTION_NOT_FOUND;
+
+    if (o->type != AV_OPT_TYPE_BINARY)
+        return AVERROR(EINVAL);
+
+    ptr = av_malloc(len);
+    if (!ptr)
+        return AVERROR(ENOMEM);
+
+    dst = (uint8_t **)(((uint8_t *)target_obj) + o->offset);
+    lendst = (int *)(dst + 1);
+
+    *dst = ptr;
+    *lendst = len;
+    memcpy(ptr, val, len);
+
+    return 0;
+}
+
 #if FF_API_OLD_AVOPTIONS
 /**
  *
diff --git a/libavutil/opt.h b/libavutil/opt.h
index 1954940..8f800fc 100644
--- a/libavutil/opt.h
+++ b/libavutil/opt.h
< at >< at > -560,6 +560,7 < at >< at > int av_opt_set       (void *obj, const char *name, const char *val, int search_f
 int av_opt_set_int   (void *obj, const char *name, int64_t     val, int search_flags);
 int av_opt_set_double(void *obj, const char *name, double      val, int search_flags);
 int av_opt_set_q     (void *obj, const char *name, AVRational  val, int search_flags);
+int av_opt_set_bin   (void *obj, const char *name, const uint8_t *val, int size, int search_flags);
 /**
  * < at >}
  */

[PATCH] opt: Add av_opt_set_bin(),a new function which sets binary data via AVOptions

Samuel Pitoiset — 2012-05-24T17:07:57

---
 libavutil/opt.c |   28 ++++++++++++++++++++++++++++
 libavutil/opt.h |    1 +
 2 files changed, 29 insertions(+)

diff --git a/libavutil/opt.c b/libavutil/opt.c
index 7c53024..1bee3a3 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
< at >< at > -316,6 +316,34 < at >< at > int av_opt_set_q(void *obj, const char *name, AVRational val, int search_flags)
     return set_number(obj, name, val.num, val.den, 1, search_flags);
 }
 
+int av_opt_set_bin(void *obj, const char *name, const uint8_t *val, int len, int search_flags)
+{
+    void *target_obj;
+    const AVOption *o = av_opt_find2(obj, name, NULL, 0, search_flags, &target_obj);
+    uint8_t *ptr;
+    uint8_t **dst;
+    int *lendst;
+
+    if (!o || !target_obj)
+        return AVERROR_OPTION_NOT_FOUND;
+
+    if (o->type != AV_OPT_TYPE_BINARY)
+        return AVERROR(EINVAL);
+
+    ptr = av_malloc(len);
+    if (!ptr)
+        return AVERROR(ENOMEM);
+
+    dst = (uint8_t **)(((uint8_t *)target_obj) + o->offset);
+    lendst = (int *)(dst + 1);
+
+    *dst = ptr;
+    *lendst = len;
+    memcpy(ptr, val, len);
+
+    return 0;
+}
+
 #if FF_API_OLD_AVOPTIONS
 /**
  *
diff --git a/libavutil/opt.h b/libavutil/opt.h
index 1954940..8f800fc 100644
--- a/libavutil/opt.h
+++ b/libavutil/opt.h
< at >< at > -560,6 +560,7 < at >< at > int av_opt_set       (void *obj, const char *name, const char *val, int search_f
 int av_opt_set_int   (void *obj, const char *name, int64_t     val, int search_flags);
 int av_opt_set_double(void *obj, const char *name, double      val, int search_flags);
 int av_opt_set_q     (void *obj, const char *name, AVRational  val, int search_flags);
+int av_opt_set_bin   (void *obj, const char *name, const uint8_t *val, int size, int search_flags);
 /**
  * < at >}
  */

Re: [PATCH] opt: Add av_opt_set_bin(), a new function which sets binary data via AVOptions

Samuel Pitoiset — 2012-05-24T17:13:04

I need it in order to send custom POST data for implementing rtmpt.

Re: [PATCH] opt: Add av_opt_set_bin(), a new function which sets binary data via AVOptions

Luca Barbato — 2012-05-24T17:09:16

split the patch subject so it is

opt: add av_opt_set_bin()

Introduce a new function to set binary data through AVOption

Btw, why do you need it?

On 24/05/12 09:54, Samuel Pitoiset wrote:

[PATCH] opt: Add av_opt_set_bin(),a new function which sets binary data via AVOptions

Samuel Pitoiset — 2012-05-24T16:54:55

---
 libavutil/opt.c |   28 ++++++++++++++++++++++++++++
 libavutil/opt.h |    1 +
 2 files changed, 29 insertions(+)

diff --git a/libavutil/opt.c b/libavutil/opt.c
index 7c53024..1bee3a3 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
< at >< at > -316,6 +316,34 < at >< at > int av_opt_set_q(void *obj, const char *name, AVRational val, int search_flags)
     return set_number(obj, name, val.num, val.den, 1, search_flags);
 }
 
+int av_opt_set_bin(void *obj, const char *name, const uint8_t *val, int len, int search_flags)
+{
+    void *target_obj;
+    const AVOption *o = av_opt_find2(obj, name, NULL, 0, search_flags, &target_obj);
+    uint8_t *ptr;
+    uint8_t **dst;
+    int *lendst;
+
+    if (!o || !target_obj)
+        return AVERROR_OPTION_NOT_FOUND;
+
+    if (o->type != AV_OPT_TYPE_BINARY)
+        return AVERROR(EINVAL);
+
+    ptr = av_malloc(len);
+    if (!ptr)
+        return AVERROR(ENOMEM);
+
+    dst = (uint8_t **)(((uint8_t *)target_obj) + o->offset);
+    lendst = (int *)(dst + 1);
+
+    *dst = ptr;
+    *lendst = len;
+    memcpy(ptr, val, len);
+
+    return 0;
+}
+
 #if FF_API_OLD_AVOPTIONS
 /**
  *
diff --git a/libavutil/opt.h b/libavutil/opt.h
index 1954940..8f800fc 100644
--- a/libavutil/opt.h
+++ b/libavutil/opt.h
< at >< at > -560,6 +560,7 < at >< at > int av_opt_set       (void *obj, const char *name, const char *val, int search_f
 int av_opt_set_int   (void *obj, const char *name, int64_t     val, int search_flags);
 int av_opt_set_double(void *obj, const char *name, double      val, int search_flags);
 int av_opt_set_q     (void *obj, const char *name, AVRational  val, int search_flags);
+int av_opt_set_bin   (void *obj, const char *name, const uint8_t *val, int size, int search_flags);
 /**
  * < at >}
  */

Re: [PATCH] imc: some cosmetics

Diego Biurrun — 2012-05-24T16:31:55

imc: K&R formatting cosmetics

On Wed, May 23, 2012 at 06:59:53PM +0200, Kostya Shishkov wrote:

weird


int *


same


more


Indent the //.

Feel free to push eiththese issues addressed.

Diego

Convert a video

Bernhard Pöchtrager — 2012-05-24T14:31:10

Hello!
I want to change the libavformat/output-example.c to convert a video.
I add a new parameter. (forexample: ./output-example out.flv in.mpg) But
the problem is how to get the information of the file?
I think I need to get it in the variable  AVStream *video_st;
I searched in the source-code, but I couldn't find a way to load the
information.

    for (;;) {
        /* Compute current audio and video time. */
        if (audio_st)
            audio_pts = (double)audio_st->pts.val * audio_st->time_base.num
/ audio_st->time_base.den;
        else
            audio_pts = 0.0;

        if (video_st)
            video_pts = (double)video_st->pts.val * video_st->time_base.num
/
                        video_st->time_base.den;
        else
            video_pts = 0.0;

        if ((!audio_st || audio_pts >= STREAM_DURATION) &&
            (!video_st || video_pts >= STREAM_DURATION))
            break;

        /* write interleaved audio and video frames */
        if (!video_st || (video_st && audio_st && audio_pts < video_pts)) {
            write_audio_frame(oc, audio_st);
        } else {
            write_video_frame(oc, video_st);
        }
    }

I hope anybody can help

Thx Bernhard

Re: IGMP v3

aviad rozenhek — 2012-05-24T12:45:20


ping

Re: [PATCH 2/2] rtmp: Pass the proper return code in rtmp_handshake

Martin Storsjö — 2012-05-24T12:01:57


LGTM

// Martin

Re: [PATCH 1/2] rtmp: Check return codes of net IO operations

Martin Storsjö — 2012-05-24T12:01:42


LGTM

// Martin