summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2012-12-12 12:09:09 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-12-12 12:09:09 -0800
commitdbd405dae1e2d2f88e529cc0d1fbdb0a676c4d7a (patch)
treeedaf2184d449ddc81f107bead79ae6fb09ca49c8
parent6a15305283e837b27adc60b587317f581524b1bc (diff)
parentaf0351f930459098d98792d569b1436c43c536d8 (diff)
downloadframeworks_av-dbd405dae1e2d2f88e529cc0d1fbdb0a676c4d7a.zip
frameworks_av-dbd405dae1e2d2f88e529cc0d1fbdb0a676c4d7a.tar.gz
frameworks_av-dbd405dae1e2d2f88e529cc0d1fbdb0a676c4d7a.tar.bz2
Merge "Revert "stop using a deprecated SurfaceTextureClient ctor""
-rw-r--r--cmds/stagefright/stagefright.cpp2
-rwxr-xr-xlibvideoeditor/lvpp/NativeWindowRenderer.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/cmds/stagefright/stagefright.cpp b/cmds/stagefright/stagefright.cpp
index 148b66e..1e0e7f8 100644
--- a/cmds/stagefright/stagefright.cpp
+++ b/cmds/stagefright/stagefright.cpp
@@ -941,7 +941,7 @@ int main(int argc, char **argv) {
CHECK(useSurfaceTexAlloc);
sp<SurfaceTexture> texture = new SurfaceTexture(0 /* tex */);
- gSurface = new SurfaceTextureClient(texture->getBufferQueue());
+ gSurface = new SurfaceTextureClient(texture);
}
CHECK_EQ((status_t)OK,
diff --git a/libvideoeditor/lvpp/NativeWindowRenderer.cpp b/libvideoeditor/lvpp/NativeWindowRenderer.cpp
index efb45e2..2e15ff9 100755
--- a/libvideoeditor/lvpp/NativeWindowRenderer.cpp
+++ b/libvideoeditor/lvpp/NativeWindowRenderer.cpp
@@ -569,7 +569,7 @@ RenderInput::RenderInput(NativeWindowRenderer* renderer, GLuint textureId)
: mRenderer(renderer)
, mTextureId(textureId) {
mST = new SurfaceTexture(mTextureId);
- mSTC = new SurfaceTextureClient(mST->getBufferQueue());
+ mSTC = new SurfaceTextureClient(mST);
native_window_connect(mSTC.get(), NATIVE_WINDOW_API_MEDIA);
}