aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-rtmpt.c
diff options
context:
space:
mode:
authorwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2011-02-25 19:17:17 +0000
committerwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2011-02-25 19:17:17 +0000
commitac165d782d1a5ea7597b5c215e14114f24ebb979 (patch)
tree5fcfea695b39e90d70f8b93fa363a70e9a415098 /epan/dissectors/packet-rtmpt.c
parentfe26f623b66039e59744c8127c5f497ae788b8c1 (diff)
From Herbert Oppmann: Fix "RTMP dissector unknown audio codec"
" The [...] variable rtmpt_audio_codecs should be enhanced. According to [Flash Developer's Guide] 10 = HE-AAC and 11 = Speex are missing. There is also [Adobe "RTMP Specification V1.0] which additionally lists 3 = INTEL (not used), 7 = G711A, 8 = G711U and 9 = NellyMoser 16kHz. " From me: All but 'Intel (not used)' added to the list of audio codecs git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36073 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-rtmpt.c')
-rw-r--r--epan/dissectors/packet-rtmpt.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/epan/dissectors/packet-rtmpt.c b/epan/dissectors/packet-rtmpt.c
index 29bbbf2df2..8b319c832b 100644
--- a/epan/dissectors/packet-rtmpt.c
+++ b/epan/dissectors/packet-rtmpt.c
@@ -296,12 +296,19 @@ static const value_string rtmpt_tag_vals[] = {
{ 0, NULL }
};
+/* [Spec] http://www.adobe.com/content/dam/Adobe/en/devnet/rtmp/pdf/rtmp_specification_1.0.pdf */
+/* [DevG] http://help.adobe.com/en_US/flashmediaserver/devguide/index.html "working with Live Video" */
static const value_string rtmpt_audio_codecs[] = {
- { 0, "Uncompressed" },
- { 1, "ADPCM" },
- { 2, "MP3" },
- { 5, "Nellymoser 8kHz Mono" },
- { 6, "Nellymoser 8kHz Stereo" },
+ { 0, "Uncompressed" }, /* [DevG] */
+ { 1, "ADPCM" }, /* [DevG] */
+ { 2, "MP3" }, /* [DevG] */
+ { 5, "Nellymoser 8kHz Mono" }, /* [DevG] */
+ { 6, "Nellymoser 8kHz Stereo" }, /* [DevG] */
+ { 7, "G711A" }, /* [Spec] */
+ { 8, "G711U" }, /* [Spec] */
+ { 9, "Nellymoser 16kHz" }, /* [Spec] */
+ { 10, "HE-AAC" }, /* [DevG] */
+ { 11, "SPEEX" }, /* [DevG] */
{ 0, NULL }
};