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 /cmds/stagefright/SimplePlayer.cpp | |
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 'cmds/stagefright/SimplePlayer.cpp')
-rw-r--r-- | cmds/stagefright/SimplePlayer.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/cmds/stagefright/SimplePlayer.cpp b/cmds/stagefright/SimplePlayer.cpp index bd33d86..50913cd 100644 --- a/cmds/stagefright/SimplePlayer.cpp +++ b/cmds/stagefright/SimplePlayer.cpp @@ -30,7 +30,6 @@ #include <media/stagefright/foundation/AMessage.h> #include <media/stagefright/MediaCodec.h> #include <media/stagefright/MediaErrors.h> -#include <media/stagefright/NativeWindowWrapper.h> #include <media/stagefright/NuMediaExtractor.h> namespace android { @@ -74,8 +73,7 @@ status_t SimplePlayer::setSurface(const sp<IGraphicBufferProducer> &bufferProduc surface = new Surface(bufferProducer); } - msg->setObject( - "native-window", new NativeWindowWrapper(surface)); + msg->setObject("surface", surface); sp<AMessage> response; return PostAndAwaitResponse(msg, &response); @@ -133,10 +131,8 @@ void SimplePlayer::onMessageReceived(const sp<AMessage> &msg) { err = INVALID_OPERATION; } else { sp<RefBase> obj; - CHECK(msg->findObject("native-window", &obj)); - - mNativeWindow = static_cast<NativeWindowWrapper *>(obj.get()); - + CHECK(msg->findObject("surface", &obj)); + mSurface = static_cast<Surface *>(obj.get()); err = OK; } @@ -325,7 +321,7 @@ status_t SimplePlayer::onPrepare() { err = state->mCodec->configure( format, - isVideo ? mNativeWindow->getSurfaceTextureClient() : NULL, + isVideo ? mSurface : NULL, NULL /* crypto */, 0 /* flags */); @@ -412,7 +408,7 @@ status_t SimplePlayer::onReset() { mStateByTrackIndex.clear(); mCodecLooper.clear(); mExtractor.clear(); - mNativeWindow.clear(); + mSurface.clear(); mPath.clear(); return OK; |