diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/camera/Camera.h (renamed from include/ui/Camera.h) | 4 | ||||
-rw-r--r-- | include/camera/CameraHardwareInterface.h (renamed from include/ui/CameraHardwareInterface.h) | 10 | ||||
-rw-r--r-- | include/camera/CameraParameters.h (renamed from include/ui/CameraParameters.h) | 0 | ||||
-rw-r--r-- | include/camera/ICamera.h (renamed from include/ui/ICamera.h) | 4 | ||||
-rw-r--r-- | include/camera/ICameraClient.h (renamed from include/ui/ICameraClient.h) | 0 | ||||
-rw-r--r-- | include/camera/ICameraService.h (renamed from include/ui/ICameraService.h) | 4 | ||||
-rw-r--r-- | include/media/MediaPlayerInterface.h | 3 | ||||
-rw-r--r-- | include/media/mediaplayer.h | 3 | ||||
-rw-r--r-- | include/media/stagefright/HardwareAPI.h | 2 | ||||
-rw-r--r-- | include/private/surfaceflinger/LayerState.h (renamed from include/private/ui/LayerState.h) | 9 | ||||
-rw-r--r-- | include/private/surfaceflinger/SharedBufferStack.h (renamed from include/private/ui/SharedBufferStack.h) | 6 | ||||
-rw-r--r-- | include/surfaceflinger/ISurface.h (renamed from include/ui/ISurface.h) | 10 | ||||
-rw-r--r-- | include/surfaceflinger/ISurfaceComposer.h (renamed from include/ui/ISurfaceComposer.h) | 21 | ||||
-rw-r--r-- | include/surfaceflinger/ISurfaceFlingerClient.h (renamed from include/ui/ISurfaceFlingerClient.h) | 16 | ||||
-rw-r--r-- | include/surfaceflinger/Surface.h (renamed from include/ui/Surface.h) | 12 | ||||
-rw-r--r-- | include/surfaceflinger/SurfaceComposerClient.h (renamed from include/ui/SurfaceComposerClient.h) | 13 |
16 files changed, 62 insertions, 55 deletions
diff --git a/include/ui/Camera.h b/include/camera/Camera.h index c506fb8..ee2b30c 100644 --- a/include/ui/Camera.h +++ b/include/camera/Camera.h @@ -19,10 +19,12 @@ #define ANDROID_HARDWARE_CAMERA_H #include <utils/Timers.h> -#include <ui/ICameraClient.h> +#include <camera/ICameraClient.h> namespace android { +class ISurface; + /* * A set of bit masks for specifying how the received preview frames are * handled before the previewCallback() call. diff --git a/include/ui/CameraHardwareInterface.h b/include/camera/CameraHardwareInterface.h index 240c134..d877c74 100644 --- a/include/ui/CameraHardwareInterface.h +++ b/include/camera/CameraHardwareInterface.h @@ -19,12 +19,14 @@ #include <binder/IMemory.h> #include <utils/RefBase.h> -#include <ui/ISurface.h> -#include <ui/Camera.h> -#include <ui/CameraParameters.h> -#include <ui/Overlay.h> +#include <surfaceflinger/ISurface.h> +#include <camera/Camera.h> +#include <camera/CameraParameters.h> namespace android { + +class Overlay; + /** * The size of image for display. */ diff --git a/include/ui/CameraParameters.h b/include/camera/CameraParameters.h index e328f33..e328f33 100644 --- a/include/ui/CameraParameters.h +++ b/include/camera/CameraParameters.h diff --git a/include/ui/ICamera.h b/include/camera/ICamera.h index 5642691..6fcf9e5 100644 --- a/include/ui/ICamera.h +++ b/include/camera/ICamera.h @@ -20,10 +20,10 @@ #include <utils/RefBase.h> #include <binder/IInterface.h> #include <binder/Parcel.h> -#include <ui/ISurface.h> +#include <surfaceflinger/ISurface.h> #include <binder/IMemory.h> #include <utils/String8.h> -#include <ui/Camera.h> +#include <camera/Camera.h> namespace android { diff --git a/include/ui/ICameraClient.h b/include/camera/ICameraClient.h index 236d0f6..236d0f6 100644 --- a/include/ui/ICameraClient.h +++ b/include/camera/ICameraClient.h diff --git a/include/ui/ICameraService.h b/include/camera/ICameraService.h index 061681a..82b1283 100644 --- a/include/ui/ICameraService.h +++ b/include/camera/ICameraService.h @@ -21,8 +21,8 @@ #include <binder/IInterface.h> #include <binder/Parcel.h> -#include <ui/ICameraClient.h> -#include <ui/ICamera.h> +#include <camera/ICameraClient.h> +#include <camera/ICamera.h> namespace android { diff --git a/include/media/MediaPlayerInterface.h b/include/media/MediaPlayerInterface.h index be06e33..ecb20e8 100644 --- a/include/media/MediaPlayerInterface.h +++ b/include/media/MediaPlayerInterface.h @@ -20,7 +20,6 @@ #ifdef __cplusplus #include <sys/types.h> -#include <ui/ISurface.h> #include <utils/Errors.h> #include <utils/KeyedVector.h> #include <utils/String8.h> @@ -33,6 +32,8 @@ namespace android { class Parcel; +class ISurface; + template<typename T> class SortedVector; enum player_type { diff --git a/include/media/mediaplayer.h b/include/media/mediaplayer.h index c9198d6..8dc7c8a 100644 --- a/include/media/mediaplayer.h +++ b/include/media/mediaplayer.h @@ -18,7 +18,6 @@ #define ANDROID_MEDIAPLAYER_H #include <binder/IMemory.h> -#include <ui/Surface.h> #include <media/IMediaPlayerClient.h> #include <media/IMediaPlayer.h> #include <media/IMediaDeathNotifier.h> @@ -28,6 +27,8 @@ namespace android { +class Surface; + enum media_event_type { MEDIA_NOP = 0, // interface test message MEDIA_PREPARED = 1, diff --git a/include/media/stagefright/HardwareAPI.h b/include/media/stagefright/HardwareAPI.h index b7daddc..221c679 100644 --- a/include/media/stagefright/HardwareAPI.h +++ b/include/media/stagefright/HardwareAPI.h @@ -20,7 +20,7 @@ #include <media/stagefright/OMXPluginBase.h> #include <media/stagefright/VideoRenderer.h> -#include <ui/ISurface.h> +#include <surfaceflinger/ISurface.h> #include <utils/RefBase.h> #include <OMX_Component.h> diff --git a/include/private/ui/LayerState.h b/include/private/surfaceflinger/LayerState.h index f1a2618..d7fe572 100644 --- a/include/private/ui/LayerState.h +++ b/include/private/surfaceflinger/LayerState.h @@ -14,17 +14,18 @@ * limitations under the License. */ -#ifndef ANDROID_COMPOSER_LAYER_STATE_H -#define ANDROID_COMPOSER_LAYER_STATE_H +#ifndef ANDROID_SF_LAYER_STATE_H +#define ANDROID_SF_LAYER_STATE_H #include <stdint.h> #include <sys/types.h> #include <utils/Errors.h> -#include <ui/ISurfaceFlingerClient.h> #include <ui/Region.h> +#include <surfaceflinger/ISurface.h> + namespace android { class Parcel; @@ -69,5 +70,5 @@ struct layer_state_t { }; // namespace android -#endif // ANDROID_COMPOSER_LAYER_STATE_H +#endif // ANDROID_SF_LAYER_STATE_H diff --git a/include/private/ui/SharedBufferStack.h b/include/private/surfaceflinger/SharedBufferStack.h index bbc1822..9b5a1e0 100644 --- a/include/private/ui/SharedBufferStack.h +++ b/include/private/surfaceflinger/SharedBufferStack.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ANDROID_UI_SHARED_BUFFER_STACK_H -#define ANDROID_UI_SHARED_BUFFER_STACK_H +#ifndef ANDROID_SF_SHARED_BUFFER_STACK_H +#define ANDROID_SF_SHARED_BUFFER_STACK_H #include <stdint.h> #include <sys/types.h> @@ -356,4 +356,4 @@ COMPILE_TIME_ASSERT(sizeof(surface_flinger_cblk_t) <= 4096) // --------------------------------------------------------------------------- }; // namespace android -#endif /* ANDROID_UI_SHARED_BUFFER_STACK_H */ +#endif /* ANDROID_SF_SHARED_BUFFER_STACK_H */ diff --git a/include/ui/ISurface.h b/include/surfaceflinger/ISurface.h index c7f181c..472f759 100644 --- a/include/ui/ISurface.h +++ b/include/surfaceflinger/ISurface.h @@ -14,15 +14,17 @@ * limitations under the License. */ -#ifndef ANDROID_ISURFACE_H -#define ANDROID_ISURFACE_H +#ifndef ANDROID_SF_ISURFACE_H +#define ANDROID_SF_ISURFACE_H #include <stdint.h> #include <sys/types.h> #include <utils/Errors.h> -#include <binder/IInterface.h> #include <utils/RefBase.h> + +#include <binder/IInterface.h> + #include <ui/PixelFormat.h> #include <hardware/hardware.h> @@ -107,4 +109,4 @@ public: }; // namespace android -#endif // ANDROID_ISURFACE_H +#endif // ANDROID_SF_ISURFACE_H diff --git a/include/ui/ISurfaceComposer.h b/include/surfaceflinger/ISurfaceComposer.h index 25d954c..d1e7785 100644 --- a/include/ui/ISurfaceComposer.h +++ b/include/surfaceflinger/ISurfaceComposer.h @@ -14,25 +14,24 @@ * limitations under the License. */ -#ifndef ANDROID_ISURFACE_COMPOSER_H -#define ANDROID_ISURFACE_COMPOSER_H +#ifndef ANDROID_SF_ISURFACE_COMPOSER_H +#define ANDROID_SF_ISURFACE_COMPOSER_H #include <stdint.h> #include <sys/types.h> #include <utils/RefBase.h> #include <utils/Errors.h> + #include <binder/IInterface.h> #include <ui/PixelFormat.h> -#include <ui/ISurfaceFlingerClient.h> -namespace android { +#include <surfaceflinger/ISurfaceFlingerClient.h> +namespace android { // ---------------------------------------------------------------------------- -class DisplayInfo; - class ISurfaceComposer : public IInterface { public: @@ -92,19 +91,19 @@ public: /* retrieve the control block */ virtual sp<IMemoryHeap> getCblk() const = 0; - /* open/close transactions. recquires ACCESS_SURFACE_FLINGER permission */ + /* open/close transactions. requires ACCESS_SURFACE_FLINGER permission */ virtual void openGlobalTransaction() = 0; virtual void closeGlobalTransaction() = 0; - /* [un]freeze display. recquires ACCESS_SURFACE_FLINGER permission */ + /* [un]freeze display. requires ACCESS_SURFACE_FLINGER permission */ virtual status_t freezeDisplay(DisplayID dpy, uint32_t flags) = 0; virtual status_t unfreezeDisplay(DisplayID dpy, uint32_t flags) = 0; - /* Set display orientation. recquires ACCESS_SURFACE_FLINGER permission */ + /* Set display orientation. requires ACCESS_SURFACE_FLINGER permission */ virtual int setOrientation(DisplayID dpy, int orientation, uint32_t flags) = 0; /* signal that we're done booting. - * recquires ACCESS_SURFACE_FLINGER permission + * Requires ACCESS_SURFACE_FLINGER permission */ virtual void bootFinished() = 0; @@ -143,4 +142,4 @@ public: }; // namespace android -#endif // ANDROID_ISURFACE_COMPOSER_H +#endif // ANDROID_SF_ISURFACE_COMPOSER_H diff --git a/include/ui/ISurfaceFlingerClient.h b/include/surfaceflinger/ISurfaceFlingerClient.h index 5d231e6..1fba162 100644 --- a/include/ui/ISurfaceFlingerClient.h +++ b/include/surfaceflinger/ISurfaceFlingerClient.h @@ -14,28 +14,26 @@ * limitations under the License. */ -#ifndef ANDROID_ISURFACE_FLINGER_CLIENT_H -#define ANDROID_ISURFACE_FLINGER_CLIENT_H +#ifndef ANDROID_SF_ISURFACE_FLINGER_CLIENT_H +#define ANDROID_SF_ISURFACE_FLINGER_CLIENT_H #include <stdint.h> #include <sys/types.h> #include <utils/Errors.h> -#include <binder/IInterface.h> #include <utils/RefBase.h> -#include <ui/ISurface.h> +#include <binder/IInterface.h> #include <ui/PixelFormat.h> +#include <surfaceflinger/ISurface.h> + namespace android { // ---------------------------------------------------------------------------- -class Rect; -class Point; -class IMemory; -class ISurface; +class IMemoryHeap; typedef int32_t ClientID; typedef int32_t DisplayID; @@ -89,4 +87,4 @@ public: }; // namespace android -#endif // ANDROID_ISURFACE_FLINGER_CLIENT_H +#endif // ANDROID_SF_ISURFACE_FLINGER_CLIENT_H diff --git a/include/ui/Surface.h b/include/surfaceflinger/Surface.h index 008c297..9808832 100644 --- a/include/ui/Surface.h +++ b/include/surfaceflinger/Surface.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ANDROID_UI_SURFACE_H -#define ANDROID_UI_SURFACE_H +#ifndef ANDROID_SF_SURFACE_H +#define ANDROID_SF_SURFACE_H #include <stdint.h> #include <sys/types.h> @@ -23,13 +23,13 @@ #include <utils/RefBase.h> #include <utils/threads.h> -#include <ui/ISurface.h> #include <ui/PixelFormat.h> #include <ui/Region.h> -#include <ui/ISurfaceFlingerClient.h> - #include <ui/egl/android_natives.h> +#include <surfaceflinger/ISurface.h> +#include <surfaceflinger/ISurfaceFlingerClient.h> + namespace android { // --------------------------------------------------------------------------- @@ -250,5 +250,5 @@ private: }; // namespace android -#endif // ANDROID_UI_SURFACE_H +#endif // ANDROID_SF_SURFACE_H diff --git a/include/ui/SurfaceComposerClient.h b/include/surfaceflinger/SurfaceComposerClient.h index 777b878..49e83c0 100644 --- a/include/ui/SurfaceComposerClient.h +++ b/include/surfaceflinger/SurfaceComposerClient.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ANDROID_SURFACE_COMPOSER_CLIENT_H -#define ANDROID_SURFACE_COMPOSER_CLIENT_H +#ifndef ANDROID_SF_SURFACE_COMPOSER_CLIENT_H +#define ANDROID_SF_SURFACE_COMPOSER_CLIENT_H #include <stdint.h> #include <sys/types.h> @@ -27,17 +27,18 @@ #include <utils/threads.h> #include <ui/PixelFormat.h> -#include <ui/ISurfaceComposer.h> #include <ui/Region.h> -#include <ui/Surface.h> + +#include <surfaceflinger/Surface.h> namespace android { // --------------------------------------------------------------------------- class Region; -class SurfaceFlingerSynchro; class SharedClient; +class ISurfaceComposer; +class DisplayInfo; class SurfaceComposerClient : virtual public RefBase { @@ -158,5 +159,5 @@ private: }; // namespace android -#endif // ANDROID_SURFACE_COMPOSER_CLIENT_H +#endif // ANDROID_SF_SURFACE_COMPOSER_CLIENT_H |