Report AAC and AAC-LATM correctly. Always raw stream AAC audio as audio/aac.

diff --git a/src/htsp_server.c b/src/htsp_server.c
index a4b0d764503d22baefe2e86eb72f9a2c7078d76e..4ec0a90ff4874967661ff738a48c0bc466948c9f 100644 (file)
--- a/src/htsp_server.c
+++ b/src/htsp_server.c
@@ -4162,7 +4162,7 @@ htsp_subscription_start(htsp_subscription_t *hs, const streaming_start_t *ss)
 
     c = htsmsg_create_map();
     htsmsg_add_u32(c, "index", ssc->es_index);
-    if (ssc->es_type == SCT_MP4A)
+    if (ssc->es_type == SCT_AAC)
       type = "AAC"; /* override */
     else
       type = streaming_component_type2txt(ssc->es_type);

diff --git a/src/muxer.c b/src/muxer.c
index 1da9dead894cae4552f9d53d9c64f3f53168336c..bbf189c46a37f725f64dbec070c2a9cb2250ba91 100644 (file)
--- a/src/muxer.c
+++ b/src/muxer.c
@@ -52,7 +52,7 @@ static struct strtab container_audio_mime[] = {
   { "audio/mpeg",               MC_MPEG2AUDIO },
   { "audio/ac3",                MC_AC3 },
   { "audio/aac",                MC_AAC },
-  { "audio/mp4",                MC_MP4A },
+  { "audio/aac",                MC_MP4A },
   { "audio/ogg",                MC_VORBIS },
   { "audio/mp4",                MC_AVMP4 },
   { "application/octet-stream", MC_PASS },

diff --git a/src/streaming.c b/src/streaming.c
index bcd504412649c7188bd9f1ba4832b85d203c8f29..aac5221aebdac2510669e706078e0903580e80b7 100644 (file)
--- a/src/streaming.c
+++ b/src/streaming.c
@@ -573,11 +573,11 @@ static struct strtab streamtypetab[] = {
   { "AC3",        SCT_AC3 },
   { "TELETEXT",   SCT_TELETEXT },
   { "DVBSUB",     SCT_DVBSUB },
-  { "AAC",        SCT_AAC },
+  { "AAC-LATM",   SCT_AAC },
   { "MPEGTS",     SCT_MPEGTS },
   { "TEXTSUB",    SCT_TEXTSUB },
   { "EAC3",       SCT_EAC3 },
-  { "AAC-LATM",   SCT_MP4A },
+  { "AAC",        SCT_MP4A },
   { "VP8",        SCT_VP8 },
   { "VORBIS",     SCT_VORBIS },
   { "HEVC",       SCT_HEVC },
@@ -643,4 +643,4 @@ void streaming_done(void)
   tvh_mutex_lock(&global_lock);
   memoryinfo_unregister(&streaming_msg_memoryinfo);
   tvh_mutex_unlock(&global_lock);
-}
\ No newline at end of file
+}