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/sf2.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/sf2.cpp')
| -rw-r--r-- | cmds/stagefright/sf2.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cmds/stagefright/sf2.cpp b/cmds/stagefright/sf2.cpp index 891d84b..0d64d2f 100644 --- a/cmds/stagefright/sf2.cpp +++ b/cmds/stagefright/sf2.cpp @@ -38,10 +38,10 @@ #include <media/stagefright/MediaExtractor.h> #include <media/stagefright/MediaSource.h> #include <media/stagefright/MetaData.h> -#include <media/stagefright/NativeWindowWrapper.h> #include <media/stagefright/Utils.h> #include <gui/SurfaceComposerClient.h> +#include <gui/Surface.h> #include "include/ESDS.h" @@ -154,8 +154,7 @@ protected: sp<AMessage> format = makeFormat(mSource->getFormat()); if (mSurface != NULL) { - format->setObject( - "native-window", new NativeWindowWrapper(mSurface)); + format->setObject("surface", mSurface); } mCodec->initiateSetup(format); |