summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/nuplayer/NuPlayer.h
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2014-06-11 14:49:23 -0700
committerChong Zhang <chz@google.com>2014-06-13 10:18:09 -0700
commita7fa1d9530b6870f2c7850e3025d7db963661803 (patch)
tree384a6c52d5b13b09860eab611c264384e5444592 /media/libmediaplayerservice/nuplayer/NuPlayer.h
parent404fced9bfa8fa423ee210a271ca051ffd1bec13 (diff)
downloadframeworks_av-a7fa1d9530b6870f2c7850e3025d7db963661803.zip
frameworks_av-a7fa1d9530b6870f2c7850e3025d7db963661803.tar.gz
frameworks_av-a7fa1d9530b6870f2c7850e3025d7db963661803.tar.bz2
support for CEA-608 closed caption
Bug: 15470448 Change-Id: Ic6a527f5c35a8ee0a08a5b043336e4d193216083
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayer.h')
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayer.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.h b/media/libmediaplayerservice/nuplayer/NuPlayer.h
index f95cc11..5be71fb 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.h
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.h
@@ -76,6 +76,7 @@ public:
private:
struct Decoder;
+ struct CCDecoder;
struct GenericSource;
struct HTTPLiveSource;
struct Renderer;
@@ -98,6 +99,7 @@ private:
kWhatScanSources = 'scan',
kWhatVideoNotify = 'vidN',
kWhatAudioNotify = 'audN',
+ kWhatClosedCaptionNotify = 'capN',
kWhatRendererNotify = 'renN',
kWhatReset = 'rset',
kWhatSeek = 'seek',
@@ -119,6 +121,7 @@ private:
sp<Decoder> mVideoDecoder;
bool mVideoIsAVC;
sp<Decoder> mAudioDecoder;
+ sp<CCDecoder> mCCDecoder;
sp<Renderer> mRenderer;
List<sp<Action> > mDeferredActions;
@@ -186,6 +189,7 @@ private:
void performSetSurface(const sp<NativeWindowWrapper> &wrapper);
void onSourceNotify(const sp<AMessage> &msg);
+ void onClosedCaptionNotify(const sp<AMessage> &msg);
void queueDecoderShutdown(
bool audio, bool video, const sp<AMessage> &reply);