diff options
| author | Mathias Agopian <mathias@google.com> | 2013-02-14 17:11:20 -0800 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2013-02-15 12:47:40 -0800 |
| commit | 52800617946c456e78ed010c82d0ec4358368164 (patch) | |
| tree | bad73c6c8deec082b972569b6f2e57a43e8d2d41 /media/mca | |
| parent | 29479ebe1007361222bf6ab4d5e2a27927d4b8e8 (diff) | |
| download | frameworks_base-52800617946c456e78ed010c82d0ec4358368164.zip frameworks_base-52800617946c456e78ed010c82d0ec4358368164.tar.gz frameworks_base-52800617946c456e78ed010c82d0ec4358368164.tar.bz2 | |
Refactoring: Rename SurfaceTextureClient to Surface
Change-Id: I5a218ca11abeeec05e3a4c3cfc581bcc788814ea
Diffstat (limited to 'media/mca')
| -rw-r--r-- | media/mca/filterfw/jni/jni_gl_environment.cpp | 6 | ||||
| -rw-r--r-- | media/mca/filterfw/native/core/gl_env.cpp | 2 | ||||
| -rw-r--r-- | media/mca/filterfw/native/core/gl_env.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/media/mca/filterfw/jni/jni_gl_environment.cpp b/media/mca/filterfw/jni/jni_gl_environment.cpp index b64004e..9abf191 100644 --- a/media/mca/filterfw/jni/jni_gl_environment.cpp +++ b/media/mca/filterfw/jni/jni_gl_environment.cpp @@ -24,7 +24,7 @@ #include "native/core/gl_env.h" #include <gui/IGraphicBufferProducer.h> -#include <gui/SurfaceTextureClient.h> +#include <gui/Surface.h> #include <utils/Errors.h> #include <system/window.h> @@ -34,7 +34,7 @@ using android::filterfw::WindowHandle; using android::MediaRecorder; using android::sp; using android::IGraphicBufferProducer; -using android::SurfaceTextureClient; +using android::Surface; class NativeWindowHandle : public WindowHandle { @@ -290,7 +290,7 @@ jint Java_android_filterfw_core_GLEnvironment_nativeAddSurfaceFromMediaRecorder( <IGraphicBufferProducer> handle."); return -1; } - sp<SurfaceTextureClient> surfaceTC = new SurfaceTextureClient(surfaceMS); + sp<Surface> surfaceTC = new Surface(surfaceMS); // Get the ANativeWindow sp<ANativeWindow> window = surfaceTC; diff --git a/media/mca/filterfw/native/core/gl_env.cpp b/media/mca/filterfw/native/core/gl_env.cpp index 8ed82e2..73768fe 100644 --- a/media/mca/filterfw/native/core/gl_env.cpp +++ b/media/mca/filterfw/native/core/gl_env.cpp @@ -161,7 +161,7 @@ bool GLEnv::InitWithNewContext() { // Create dummy surface using a GLConsumer surfaceTexture_ = new GLConsumer(0); - window_ = new SurfaceTextureClient(static_cast<sp<IGraphicBufferProducer> >( + window_ = new Surface(static_cast<sp<IGraphicBufferProducer> >( surfaceTexture_->getBufferQueue())); surfaces_[0] = SurfaceWindowPair(eglCreateWindowSurface(display(), config, window_.get(), NULL), NULL); diff --git a/media/mca/filterfw/native/core/gl_env.h b/media/mca/filterfw/native/core/gl_env.h index 3c87195..81e1e9d 100644 --- a/media/mca/filterfw/native/core/gl_env.h +++ b/media/mca/filterfw/native/core/gl_env.h @@ -28,7 +28,7 @@ #include <EGL/egl.h> #include <gui/IGraphicBufferProducer.h> -#include <gui/SurfaceTextureClient.h> +#include <gui/Surface.h> namespace android { namespace filterfw { |