Add AAC stream type.

diff --git a/src/dvb/dvb_support.h b/src/dvb/dvb_support.h
index ae5ea75dcdb6fe3fea28e5bd8ccdb35a81956768..63b8f882a4d59da9a489741351ef733a175365a3 100644 (file)
--- a/src/dvb/dvb_support.h
+++ b/src/dvb/dvb_support.h
@@ -44,6 +44,7 @@
 #define DVB_DESC_TELETEXT     0x56
 #define DVB_DESC_SUBTITLE     0x59
 #define DVB_DESC_AC3          0x6a
+#define DVB_DESC_AAC          0x7c
 
 int dvb_get_string(char *dst, size_t dstlen, const uint8_t *src, 
                   const size_t srclen);

diff --git a/src/psi.c b/src/psi.c
index ded4091515297240f1ad0a913aa2b290634ca412..c6d9066a0c57364abe698053c6ed55993fc8a20c 100644 (file)
--- a/src/psi.c
+++ b/src/psi.c
@@ -245,6 +245,9 @@ psi_parse_pmt(th_transport_t *t, uint8_t *ptr, int len, int chksvcid)
     case 0x1b:
       hts_stream_type = SCT_H264;
       break;
+
+    default:
+      break;
     }
 
     memset(lang, 0, 4);
@@ -281,6 +284,11 @@ psi_parse_pmt(th_transport_t *t, uint8_t *ptr, int len, int chksvcid)
          hts_stream_type = SCT_AC3;
        break;
 
+      case DVB_DESC_AAC:
+       if(estype == 0x11)
+         hts_stream_type = SCT_AAC;
+       break;
+
       default:
        break;
       }
@@ -539,6 +547,7 @@ static struct strtab streamtypetab[] = {
   { "CA",         SCT_CA },
   { "PMT",        SCT_PMT },
   { "PAT",        SCT_PAT },
+  { "AAC",        SCT_AAC },
 };
 
 

diff --git a/src/tvhead.h b/src/tvhead.h
index 421644f3699ab872280bf5c3781d716f08900a5f..644da8fb7d4eec4c7800af97d661136839962563 100644 (file)
--- a/src/tvhead.h
+++ b/src/tvhead.h
@@ -120,6 +120,7 @@ typedef enum {
   SCT_CA,
   SCT_PAT,
   SCT_PMT,
+  SCT_AAC,
 } streaming_component_type_t;
 
 
@@ -391,6 +392,13 @@ typedef struct th_transport {
    */ 
   int tht_refcount;
 
+  /**
+   *
+   */
+  int tht_flags;
+
+#define THT_DEBUG 0x1
+
   /**
    * Source type is used to determine if an output requesting
    * MPEG-TS can shortcut all the parsing and remuxing.

diff --git a/src/webui/extjs.c b/src/webui/extjs.c
index 136c49141adfca558875a43293e517b4542ea093..328845c1de64f300ffa0774336099b93f9c4d3f7 100644 (file)
--- a/src/webui/extjs.c
+++ b/src/webui/extjs.c
@@ -639,6 +639,12 @@ build_transport_msg(th_transport_t *t)
               st->st_pid);
       goto audio;
 
+    case SCT_AAC:
+      snprintf(audio + strlen(audio), sizeof(audio) - strlen(audio),
+              "%sAAC (PID:%d", strlen(audio) > 0 ? ", " : "",
+              st->st_pid);
+      goto audio;
+
     case SCT_CA:
       snprintf(scrambling + strlen(scrambling),
               sizeof(scrambling) - strlen(scrambling),