summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2012-12-12 12:08:51 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-12-12 12:08:51 -0800
commit1bca151a35ecbf9d6b32b296a7f8642d8feb13fd (patch)
tree8851291ff68fc422d0e76bfeec00c37d2293a8c3
parentffa92311fa6a80890aa0326012f4c48abc6ef119 (diff)
downloadframeworks_av-1bca151a35ecbf9d6b32b296a7f8642d8feb13fd.zip
frameworks_av-1bca151a35ecbf9d6b32b296a7f8642d8feb13fd.tar.gz
frameworks_av-1bca151a35ecbf9d6b32b296a7f8642d8feb13fd.tar.bz2
Revert "stop using a deprecated SurfaceTextureClient ctor"
This reverts commit aef79b0676d8f0ee8ef637ec8be5ba73225b038d Change-Id: I5f6cf4d6d5dc895a9426f212dfc8a25b4bf2d23a
-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);
}