diff options
| author | Mathias Agopian <mathias@google.com> | 2012-04-23 21:37:00 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-23 21:37:00 -0700 |
| commit | 9e786c78898d738b1cb21cd8bdfcc49dbcacfce6 (patch) | |
| tree | c507a242297eca7b9816b987df7596c14e3dd1aa | |
| parent | a636433cbd09c0708b85f337ef45c0cdef3bcb4d (diff) | |
| parent | 6f9add864e3513917fd35302b766e26aa40e6818 (diff) | |
| download | frameworks_av-9e786c78898d738b1cb21cd8bdfcc49dbcacfce6.zip frameworks_av-9e786c78898d738b1cb21cd8bdfcc49dbcacfce6.tar.gz frameworks_av-9e786c78898d738b1cb21cd8bdfcc49dbcacfce6.tar.bz2 | |
Merge "remove dependency on SurfaceTexture::connect()"
| -rwxr-xr-x | libvideoeditor/lvpp/NativeWindowRenderer.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libvideoeditor/lvpp/NativeWindowRenderer.cpp b/libvideoeditor/lvpp/NativeWindowRenderer.cpp index 0f3ea3c..b2c2675 100755 --- a/libvideoeditor/lvpp/NativeWindowRenderer.cpp +++ b/libvideoeditor/lvpp/NativeWindowRenderer.cpp @@ -571,10 +571,8 @@ RenderInput::RenderInput(NativeWindowRenderer* renderer, GLuint textureId) : mRenderer(renderer) , mTextureId(textureId) { mST = new SurfaceTexture(mTextureId); - uint32_t outWidth, outHeight, outTransform; - mST->connect(NATIVE_WINDOW_API_MEDIA, &outWidth, &outHeight, &outTransform); - mSTC = new SurfaceTextureClient(mST); + native_window_connect(mSTC.get(), NATIVE_WINDOW_API_MEDIA); } RenderInput::~RenderInput() { |