vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Sun Apr 29 
23:07:10 2012 +0200| [3222e1a7d47b1bc83aa608e0315d09953d054a3b] | committer: 
Jean-Baptiste Kempf

Map wf_tag of GSM-AMR

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3222e1a7d47b1bc83aa608e0315d09953d054a3b
---

 include/vlc_codecs.h |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/include/vlc_codecs.h b/include/vlc_codecs.h
index 6daa57c..9694974 100644
--- a/include/vlc_codecs.h
+++ b/include/vlc_codecs.h
@@ -255,6 +255,9 @@ ATTR_PACKED
 #define WAVE_FORMAT_FFMPEG_AAC          0x706D
 #define WAVE_FORMAT_DIVIO_AAC           0x4143 /* Divio's AAC */
 
+#define WAVE_FORMAT_GSM_AMR_FIXED       0x7A21 /* Fixed bitrate, no SID */
+#define WAVE_FORMAT_GSM_AMR             0x7A22 /* Variable bitrate, including 
SID */
+
 /* Need to check these */
 #define WAVE_FORMAT_DK3                 0x0061
 #define WAVE_FORMAT_DK4                 0x0062
@@ -376,6 +379,8 @@ wave_format_tag_to_fourcc[] =
     { WAVE_FORMAT_VORB_3PLUS, VLC_FOURCC( 'v', 'o', '3', '+' ), "Vorbis 3+ 
Audio" },
     { WAVE_FORMAT_SPEEX,      VLC_CODEC_SPEEX,                  "Speex Audio" 
},
     { WAVE_FORMAT_FLAC,       VLC_CODEC_FLAC,                   "FLAC Audio" },
+    { WAVE_FORMAT_GSM_AMR_FIXED, VLC_CODEC_AMR_NB,              "GSM-AMR Audio 
CBR, no SID" },
+    { WAVE_FORMAT_GSM_AMR,    VLC_CODEC_AMR_NB,                 "GSM-AMR Audio 
VBR, SID" },
     { WAVE_FORMAT_UNKNOWN,    VLC_FOURCC( 'u', 'n', 'd', 'f' ), "Unknown" }
 };
 

_______________________________________________
vlc-commits mailing list
[email protected]
http://mailman.videolan.org/listinfo/vlc-commits

Reply via email to