diff --git a/include/media/stagefright/timedtext/TimedTextDriver.h b/include/media/stagefright/timedtext/TimedTextDriver.h
index 1c5fd36..cde551b 100644
--- a/include/media/stagefright/timedtext/TimedTextDriver.h
+++ b/include/media/stagefright/timedtext/TimedTextDriver.h
@@ -68,6 +68,11 @@
         PAUSED,
     };
 
+    enum TextSourceType {
+        TEXT_SOURCE_TYPE_IN_BAND = 0,
+        TEXT_SOURCE_TYPE_OUT_OF_BAND,
+    };
+
     sp<ALooper> mLooper;
     sp<TimedTextPlayer> mPlayer;
     wp<MediaPlayerBase> mListener;
@@ -76,7 +81,7 @@
     State mState;
     size_t mCurrentTrackIndex;
     KeyedVector<size_t, sp<TimedTextSource> > mTextSourceVector;
-    Vector<bool> mTextSourceTypeVector;
+    Vector<TextSourceType> mTextSourceTypeVector;
 
     // -- End of variables to be guarded by mLock
 
diff --git a/media/libstagefright/codecs/aacdec/Android.mk b/media/libstagefright/codecs/aacdec/Android.mk
index 2808745..b7c3788 100644
--- a/media/libstagefright/codecs/aacdec/Android.mk
+++ b/media/libstagefright/codecs/aacdec/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH:= $(call my-dir)
 
-AAC_LIBRARY = pv
+AAC_LIBRARY = fraunhofer
 
 ifeq ($(AAC_LIBRARY), fraunhofer)
   include $(CLEAR_VARS)
diff --git a/media/libstagefright/timedtext/TimedTextDriver.cpp b/media/libstagefright/timedtext/TimedTextDriver.cpp
index e26f517..42ca1f5 100644
--- a/media/libstagefright/timedtext/TimedTextDriver.cpp
+++ b/media/libstagefright/timedtext/TimedTextDriver.cpp
@@ -154,7 +154,7 @@
     }
     Mutex::Autolock autoLock(mLock);
     mTextSourceVector.add(trackIndex, source);
-    mTextSourceTypeVector.add(true);
+    mTextSourceTypeVector.add(TEXT_SOURCE_TYPE_IN_BAND);
     return OK;
 }
 
@@ -206,14 +206,14 @@
 
     Mutex::Autolock autoLock(mLock);
     mTextSourceVector.add(trackIndex, source);
-    mTextSourceTypeVector.add(false);
+    mTextSourceTypeVector.add(TEXT_SOURCE_TYPE_OUT_OF_BAND);
     return OK;
 }
 
 size_t TimedTextDriver::countExternalTracks() const {
     size_t nTracks = 0;
     for (size_t i = 0, n = mTextSourceTypeVector.size(); i < n; ++i) {
-        if (!mTextSourceTypeVector[i]) {
+        if (mTextSourceTypeVector[i] == TEXT_SOURCE_TYPE_OUT_OF_BAND) {
             ++nTracks;
         }
     }
@@ -223,7 +223,7 @@
 void TimedTextDriver::getExternalTrackInfo(Parcel *parcel) {
     Mutex::Autolock autoLock(mLock);
     for (size_t i = 0, n = mTextSourceTypeVector.size(); i < n; ++i) {
-        if (mTextSourceTypeVector[i]) {
+        if (mTextSourceTypeVector[i] == TEXT_SOURCE_TYPE_IN_BAND) {
             continue;
         }