[FFmpeg-devel] [PATCH]Audio support for mplayer -demuxer lavf and vivo

[Carl Eugen Hoyos]

On Thursday 29 November 2012 02:54:07 pm Paul B Mahol wrote:
> >> >> > Is AV_CODEC_ID_VIVO_SIREN ok?
> >
> > AV_CODEC_ID_SIREN
>
> Agree.

New patch attached.

Please comment, Carl Eugen
-------------- next part --------------
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index b6a4b0e..3ed6a15 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -439,6 +439,7 @@ enum AVCodecID {
     AV_CODEC_ID_SONIC_LS    = MKBETAG('S','O','N','L'),
     AV_CODEC_ID_PAF_AUDIO   = MKBETAG('P','A','F','A'),
     AV_CODEC_ID_OPUS        = MKBETAG('O','P','U','S'),
+    AV_CODEC_ID_SIREN7      = MKBETAG('S','I','R', 7 ),
     AV_CODEC_ID_TAK         = MKBETAG('t','B','a','K'),
 
     /* subtitle codecs */
diff --git a/libavformat/vivo.c b/libavformat/vivo.c
index e3487f6..415ecc4 100644
--- a/libavformat/vivo.c
+++ b/libavformat/vivo.c
@@ -229,6 +229,13 @@ static int vivo_read_header(AVFormatContext *s)
         vst->codec->codec_id = CODEC_ID_H263;
         ast->codec->codec_id = CODEC_ID_G723_1;
         ast->codec->bits_per_coded_sample = 8;
+        ast->codec->block_align = 24;
+        ast->codec->bit_rate = 6400;
+    } else {
+        ast->codec->codec_id = AV_CODEC_ID_SIREN7;
+        ast->codec->bits_per_coded_sample = 16;
+        ast->codec->block_align = 40;
+        ast->codec->bit_rate = 16000;
     }
 
     ast->start_time        = 0;