diff options
| author | James Dong <jdong@google.com> | 2012-01-31 12:06:43 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-31 12:06:43 -0800 |
| commit | 10a5a34b0a8ba44343d0c7e0d3f261af49b5cf4c (patch) | |
| tree | 92e700a77e45cca2a63ca4b78275a2207854b914 /media/libstagefright/include | |
| parent | d459b485c61bd3e7fd81c5cd3af8ada27fc3e8d3 (diff) | |
| parent | 6655174826330afe66ef766258181ae8c11f3f6c (diff) | |
| download | frameworks_av-10a5a34b0a8ba44343d0c7e0d3f261af49b5cf4c.zip frameworks_av-10a5a34b0a8ba44343d0c7e0d3f261af49b5cf4c.tar.gz frameworks_av-10a5a34b0a8ba44343d0c7e0d3f261af49b5cf4c.tar.bz2 | |
Merge "First step of refactoring 'timedtext' code."
Diffstat (limited to 'media/libstagefright/include')
| -rw-r--r-- | media/libstagefright/include/AwesomePlayer.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/media/libstagefright/include/AwesomePlayer.h b/media/libstagefright/include/AwesomePlayer.h index 82c6476..a7a3d47 100644 --- a/media/libstagefright/include/AwesomePlayer.h +++ b/media/libstagefright/include/AwesomePlayer.h @@ -41,7 +41,7 @@ struct ISurfaceTexture; class DrmManagerClinet; class DecryptHandle; -class TimedTextPlayer; +class TimedTextDriver; struct WVMExtractor; struct AwesomeRenderer : public RefBase { @@ -232,7 +232,7 @@ private: sp<DecryptHandle> mDecryptHandle; int64_t mLastVideoTimeUs; - TimedTextPlayer *mTextPlayer; + TimedTextDriver *mTextDriver; mutable Mutex mTimedTextLock; sp<WVMExtractor> mWVMExtractor; @@ -326,4 +326,3 @@ private: } // namespace android #endif // AWESOME_PLAYER_H_ - |