diff --git a/src/dvb/dvb_support.h b/src/dvb/dvb_support.h index ae5ea75d..63b8f882 100644 --- 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 ded40915..c6d9066a 100644 --- 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 421644f3..644da8fb 100644 --- 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 136c4914..328845c1 100644 --- 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),