more changes for AAC audio support (not dm7025)

Note: AUDIO_SET_STREAMTYPE ioctl not yet implemented in e2

diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp
index 76d0f50493be89b823c73283d7cfae3a8fb5fdc1..362289f3196dc20cd2c29a73a78a37c2847e3501 100644 (file)
--- a/lib/dvb/decoder.cpp
+++ b/lib/dvb/decoder.cpp
@@ -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)

diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp
index 1032267d7cab7daa96fc1a7636716a15ec326bb9..0cdebebff807d721a87bda551c3bf03b9c920abc 100644 (file)
--- a/lib/dvb/pmt.cpp
+++ b/lib/dvb/pmt.cpp
@@ -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)
                                                        {