diff options
| author | 2011-04-20 14:20:59 -0700 | |
|---|---|---|
| committer | 2011-06-13 15:51:35 -0700 | |
| commit | a67932fe6864ac346e7f78b86df11cf6c5344137 (patch) | |
| tree | c7a9d1e48498b0683666c32d005fad728dd3475e /libs/gui/SurfaceComposerClient.cpp | |
| parent | ac642349ba89c8839c421502fb779bee5cebfee3 (diff) | |
unify SurfaceTexture and Surface
Add the concept of synchronous dequeueBuffer in SurfaceTexture
Implement {Surface|SurfaceTextureClient}::setSwapInterval()
Add SurfaceTexture logging
fix onFrameAvailable
Diffstat (limited to 'libs/gui/SurfaceComposerClient.cpp')
| -rw-r--r-- | libs/gui/SurfaceComposerClient.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp index a1ff2c1e2f..1678711aaf 100644 --- a/libs/gui/SurfaceComposerClient.cpp +++ b/libs/gui/SurfaceComposerClient.cpp @@ -20,19 +20,20 @@ #include <sys/types.h> #include <utils/Errors.h> -#include <utils/threads.h> -#include <utils/SortedVector.h> #include <utils/Log.h> #include <utils/Singleton.h> +#include <utils/SortedVector.h> +#include <utils/String8.h> +#include <utils/threads.h> -#include <binder/IServiceManager.h> #include <binder/IMemory.h> +#include <binder/IServiceManager.h> #include <ui/DisplayInfo.h> +#include <surfaceflinger/ISurface.h> #include <surfaceflinger/ISurfaceComposer.h> #include <surfaceflinger/ISurfaceComposerClient.h> -#include <surfaceflinger/ISurface.h> #include <surfaceflinger/SurfaceComposerClient.h> #include <private/surfaceflinger/LayerState.h> @@ -217,7 +218,7 @@ void SurfaceComposerClient::dispose() status_t SurfaceComposerClient::getDisplayInfo( DisplayID dpy, DisplayInfo* info) { - if (uint32_t(dpy)>=SharedBufferStack::NUM_DISPLAY_MAX) + if (uint32_t(dpy)>=NUM_DISPLAY_MAX) return BAD_VALUE; volatile surface_flinger_cblk_t const * cblk = get_cblk(); @@ -235,7 +236,7 @@ status_t SurfaceComposerClient::getDisplayInfo( ssize_t SurfaceComposerClient::getDisplayWidth(DisplayID dpy) { - if (uint32_t(dpy)>=SharedBufferStack::NUM_DISPLAY_MAX) + if (uint32_t(dpy)>=NUM_DISPLAY_MAX) return BAD_VALUE; volatile surface_flinger_cblk_t const * cblk = get_cblk(); volatile display_cblk_t const * dcblk = cblk->displays + dpy; @@ -244,7 +245,7 @@ ssize_t SurfaceComposerClient::getDisplayWidth(DisplayID dpy) ssize_t SurfaceComposerClient::getDisplayHeight(DisplayID dpy) { - if (uint32_t(dpy)>=SharedBufferStack::NUM_DISPLAY_MAX) + if (uint32_t(dpy)>=NUM_DISPLAY_MAX) return BAD_VALUE; volatile surface_flinger_cblk_t const * cblk = get_cblk(); volatile display_cblk_t const * dcblk = cblk->displays + dpy; @@ -253,7 +254,7 @@ ssize_t SurfaceComposerClient::getDisplayHeight(DisplayID dpy) ssize_t SurfaceComposerClient::getDisplayOrientation(DisplayID dpy) { - if (uint32_t(dpy)>=SharedBufferStack::NUM_DISPLAY_MAX) + if (uint32_t(dpy)>=NUM_DISPLAY_MAX) return BAD_VALUE; volatile surface_flinger_cblk_t const * cblk = get_cblk(); volatile display_cblk_t const * dcblk = cblk->displays + dpy; |