diff options
| author | Lajos Molnar <lajos@google.com> | 2015-04-30 18:18:34 -0700 |
|---|---|---|
| committer | Lajos Molnar <lajos@google.com> | 2015-04-30 18:53:52 -0700 |
| commit | 1de1e25cba872bd4c077c2e394f8ca9c70b65856 (patch) | |
| tree | 7f01e01b5a3731a9c345684e38755d97e6a67f19 /media/libmediaplayerservice/nuplayer/NuPlayer.h | |
| parent | 31de88566257d5546cf4eee9064d96926a4b0c24 (diff) | |
| download | frameworks_av-1de1e25cba872bd4c077c2e394f8ca9c70b65856.zip frameworks_av-1de1e25cba872bd4c077c2e394f8ca9c70b65856.tar.gz frameworks_av-1de1e25cba872bd4c077c2e394f8ca9c70b65856.tar.bz2 | |
stagefright: remove NativeWindowWrapper
Now that Surface and SurfaceTextureClient are the same and Surface,
it does not add value.
Bug: 19489395
Change-Id: I016ecd1cf5cc51ce6244b6fa34ecd75f84e3db01
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayer.h')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.h b/media/libmediaplayerservice/nuplayer/NuPlayer.h index 88e929d..fcf6841 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.h +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.h @@ -21,7 +21,6 @@ #include <media/AudioResamplerPublic.h> #include <media/MediaPlayerInterface.h> #include <media/stagefright/foundation/AHandler.h> -#include <media/stagefright/NativeWindowWrapper.h> namespace android { @@ -112,7 +111,7 @@ private: enum { kWhatSetDataSource = '=DaS', kWhatPrepare = 'prep', - kWhatSetVideoNativeWindow = '=NaW', + kWhatSetVideoSurface = '=VSu', kWhatSetAudioSink = '=AuS', kWhatMoreDataQueued = 'more', kWhatConfigPlayback = 'cfPB', @@ -141,7 +140,7 @@ private: uid_t mUID; sp<Source> mSource; uint32_t mSourceFlags; - sp<NativeWindowWrapper> mNativeWindow; + sp<Surface> mSurface; sp<MediaPlayerBase::AudioSink> mAudioSink; sp<DecoderBase> mVideoDecoder; bool mOffloadAudio; @@ -251,7 +250,7 @@ private: void performDecoderFlush(FlushCommand audio, FlushCommand video); void performReset(); void performScanSources(); - void performSetSurface(const sp<NativeWindowWrapper> &wrapper); + void performSetSurface(const sp<Surface> &wrapper); void performResumeDecoders(bool needNotify); void onSourceNotify(const sp<AMessage> &msg); |