X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Fpmt.cpp;h=a4c562090cbd2aa7103fb244ffb6db0c1b19f2aa;hp=e5e633160c82458480b0e10d3b5f718359a43ad1;hb=061c9d8919f7adc14d4e2ff01cd3d561d0b650b9;hpb=e7c018fc484ad4263c2e7156d1ab58d1f5f67bda

diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp
index e5e6331..a4c5620 100644
--- a/lib/dvb/pmt.cpp
+++ b/lib/dvb/pmt.cpp
@@ -18,6 +18,7 @@
 #include <dvbsi++/teletext_descriptor.h>
 #include <dvbsi++/video_stream_descriptor.h>
 #include <dvbsi++/registration_descriptor.h>
+#include <dvbsi++/ac3_descriptor.h>
 
 eDVBServicePMTHandler::eDVBServicePMTHandler()
 	:m_ca_servicePtr(0), m_dvb_scan(0), m_decode_demux_num(0xFF), m_no_pat_entry_delay(eTimer::create())
@@ -470,10 +471,32 @@ int eDVBServicePMTHandler::getProgramInfo(program &program)
 									isaudio = 1;
 									audio.type = audioStream::atAACHE; // MPEG4-AAC
 									break;
-								case AC3_DESCRIPTOR:
-									isaudio = 1;
-									audio.type = audioStream::atAC3;
-									break;
+                                                                case AC3_DESCRIPTOR:
+                                                                {    
+                                                                        Ac3Descriptor *ac = (Ac3Descriptor*)(*desc);
+                                                                        eDebug("ac->getAc3TypeFlag() : 0x%x", ac->getAc3TypeFlag());
+     
+                                                                        isaudio = 1; 
+                                                                        audio.type = audioStream::atAC3;
+
+                                                                        if(ac->getAc3TypeFlag())
+                                                                        {    
+     
+                                                                                uint8_t ac3type = ac->getAc3Type();
+                                                                                eDebug("ac->getAc3Type() : 0x%x", ac->getAc3Type());
+                                                                                if( ( ac3type & 0x80 ) && ( (ac3type<<5) == 0xA0 || (ac3type<<5) == 0xC0) ) // From EN-300 468 v1.7.1 Table D.1
+                                                                                        audio.type = audioStream::atDDP;
+                                                                        }    
+     
+                                                                        break;
+                                                                }     
+                                                                case ENHANCED_AC3_DESCRIPTOR:
+                                                                        eDebug("ENHANCED_AC3_DESCRIPTOR");
+                                                                        isaudio = 1; 
+                                                                        audio.type = audioStream::atDDP;
+                                                                        break;
+     
+
 								case REGISTRATION_DESCRIPTOR: /* some services don't have a separate AC3 descriptor */
 								{
 									RegistrationDescriptor *d = (RegistrationDescriptor*)(*desc);