diff options
| -rw-r--r-- | include/media/stagefright/timedtext/TimedTextDriver.h | 7 | ||||
| -rw-r--r-- | media/libstagefright/timedtext/TimedTextDriver.cpp | 8 |
2 files changed, 10 insertions, 5 deletions
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 @@ private: 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 @@ private: 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/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 @@ status_t TimedTextDriver::addInBandTextSource( } Mutex::Autolock autoLock(mLock); mTextSourceVector.add(trackIndex, source); - mTextSourceTypeVector.add(true); + mTextSourceTypeVector.add(TEXT_SOURCE_TYPE_IN_BAND); return OK; } @@ -206,14 +206,14 @@ status_t TimedTextDriver::createOutOfBandTextSource( 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 @@ size_t TimedTextDriver::countExternalTracks() const { 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; } |