more changes for AAC audio support (not dm7025)
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>
Tue, 16 May 2006 15:23:30 +0000 (15:23 +0000)
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>
Tue, 16 May 2006 15:23:30 +0000 (15:23 +0000)
Note: AUDIO_SET_STREAMTYPE ioctl not yet implemented in e2

lib/dvb/decoder.cpp
lib/dvb/pmt.cpp

index 76d0f50..362289f 100644 (file)
@@ -144,13 +144,10 @@ void eDVBAudio::setChannel(int channel)
        {
        case aMonoLeft: val = AUDIO_MONO_LEFT; break;
        case aMonoRight: val = AUDIO_MONO_RIGHT; break;
-       default:
-               break;
+       default: break;
        }
        if (::ioctl(m_fd, AUDIO_CHANNEL_SELECT, val) < 0)
                eDebug("video: AUDIO_CHANNEL_SELECT: %m");
-       else
-               eDebug("AUDIO_CHANNEL_SELECT ok");
 }
 
 int eDVBAudio::getPTS(pts_t &now)
index 1032267..0cdebeb 100644 (file)
@@ -288,6 +288,13 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
                                                                audio.type = audioStream::atDTS;
                                                        }
                                                        break;
+                                               case AAC_DESCRIPTOR:
+                                                       if (!isvideo)
+                                                       {
+                                                               isaudio = 1;
+                                                               audio.type = audioStream::atAAC;
+                                                       }
+                                                       break;
                                                case AC3_DESCRIPTOR:
                                                        if (!isvideo)
                                                        {