Changeset 39899

Timestamp:

02/05/17 12:29:25 (7 years ago)

Author:

gost

Message:

[titan] add new audio codec

Location:

titan/titan

Files:

• audiotrack.h (modified) (1 diff)
• dvb.h (modified) (7 diffs)
• struct.h (modified) (1 diff)

titan/titan/audiotrack.h

@@ -155 +155 @@
                 case MPEGA: tmpstr = ostrcat(tmpstr, " (STEREO)", 1, 0); break;
                 case DTS: tmpstr = ostrcat(tmpstr, " (DTS)", 1, 0); break;
+                case DTSHD: tmpstr = ostrcat(tmpstr, " (DTSHD)", 1, 0); break;
                 case LPCM: tmpstr = ostrcat(tmpstr, " (LPCM)", 1, 0); break;
                 case AAC: tmpstr = ostrcat(tmpstr, " (AAC)", 1, 0); break;

titan/titan/dvb.h

@@ -464 +464 @@
         int i, sectionlength, programinfolength, esinfolength, ret = 0;
         unsigned short pos, descriptortag, descriptorlength;
-        int isac3 = 0, isdts = 0, isaac = 0;
+        int isac3 = 0, isdts = 0, isaac = 0 isddp = 0;
         int audiocodec = 0, videocodec = 0;
         int firstaudiopid = -1, firstaudiocodec = -1, audiochange = 1;
@@ -514 +514 @@
                 pid = ((tmpbuf[1] & 0x1F) << 8) | (tmpbuf[2] & 0xff);
                 esinfolength = ((tmpbuf[3] & 0x0F) << 8) | (tmpbuf[4] & 0xff);
-                isac3 = 0; isdts = 0; isaac = 0, audiocodec = 0, videocodec = 0;
+                isac3 = 0; isdts = 0; isaac = 0; isddp = 0, audiocodec = 0, videocodec = 0;
                 char langdesc[4] = "---";
                 int y = 0, descriptorcount = 0;
@@ -563 +563 @@
                                         isdts = 1;
                                         break;
+//                      case 0x??;  ToDo
+//                              isddp = 1;
+//                              break;
                                 case 0x56: //teletext
                                         for (y = 0; y < descriptorlength / 5; y++)
@@ -643 +646 @@
                         case 0x82: // DTS (2)
                         case 0xA2: // DTS (2)
-                        //case 0x86: // DTS-HD
-                        //case 0xA6: // DTS-HD
+                        case 0x85: // DTS-HD HRA
+                        case 0x86: // DTS-HD MA
+                        case 0xA6: // DTS-HD
                         case 0x06:
                                 if(descriptorcount == 0 && streamtype == 0x06 && prevaudio != NULL)
@@ -653 +657 @@
                                 prevaudio = NULL;
                                 //if(streamtype == 0x81) esInfo->stream_type = 0x6;
-                                if(streamtype == 0x06 && !isac3 && !isdts && !isaac)
+                                if(streamtype == 0x06 && !isac3 && !isdts && !isaac && !isddp)
                                         continue;
 
@@ -664 +668 @@
                                         else if(isaac)
                                                 audiocodec = AAC;
+                                        else if(isddp)
+                                                audiocodec = DDP;
                                 }
                                 else if(streamtype == 0x0F)
@@ -675 +681 @@
                                 else if(streamtype == 0x82 || streamtype == 0xA2)
                                         audiocodec = DTS;
+                                else if(streamtype == 0x85 || (streamtype == 0x86 || streamtype == 0xA6)
+                                        audiocodec = DTSHD;
                                 else
                                         audiocodec = MPEGA;

titan/titan/struct.h

@@ -255 +255 @@
 enum {TV, RADIO};
 enum {RECDIRECT, RECTIMER, RECTIMESHIFT, RECSTREAM, RECPLAY, RECSTREAMENC};
-enum {AC3 = 0, MPEGA = 1, DTS = 2, LPCM = 6, AAC = 8, AACHE = 9};
 #ifdef DREAMBOX
 enum {MPEGV = 0, MPEG4V = 4, H264 = 1, VC1 = 10, H265 = 22};
+enum {AC3 = 0, MPEGA = 1, DTS = 2, LPCM = 6, AAC = 8, AACHE = 9, DTSHD = 16, DDP = 7};
 #else
+enum {AC3 = 0, MPEGA = 1, DTS = 2, LPCM = 6, AAC = 8, AACHE = 9, DTSHD = 16, DDP = 34};
 enum {MPEGV = 0, MPEG4V = 4, H264 = 1, VC1 = 10, H265 = 7};
 #endif