diff options
77 files changed, 265 insertions, 197 deletions
diff --git a/camera/libcameraservice/Android.mk b/camera/libcameraservice/Android.mk index ecaebff..df5c166 100644 --- a/camera/libcameraservice/Android.mk +++ b/camera/libcameraservice/Android.mk @@ -48,7 +48,9 @@ LOCAL_SHARED_LIBRARIES:= \ libutils \ libbinder \ libcutils \ - libmedia + libmedia \ + libcamera_client \ + libsurfaceflinger_client LOCAL_MODULE:= libcameraservice diff --git a/camera/libcameraservice/CameraHardwareStub.h b/camera/libcameraservice/CameraHardwareStub.h index 8a67024..957813a4 100644 --- a/camera/libcameraservice/CameraHardwareStub.h +++ b/camera/libcameraservice/CameraHardwareStub.h @@ -20,7 +20,7 @@ #include "FakeCamera.h" #include <utils/threads.h> -#include <ui/CameraHardwareInterface.h> +#include <camera/CameraHardwareInterface.h> #include <binder/MemoryBase.h> #include <binder/MemoryHeapBase.h> #include <utils/threads.h> diff --git a/camera/libcameraservice/CameraService.cpp b/camera/libcameraservice/CameraService.cpp index 405d471..86a6fac 100644 --- a/camera/libcameraservice/CameraService.cpp +++ b/camera/libcameraservice/CameraService.cpp @@ -25,7 +25,9 @@ #include <utils/Errors.h> #include <binder/MemoryBase.h> #include <binder/MemoryHeapBase.h> -#include <ui/ICameraService.h> +#include <camera/ICameraService.h> +#include <surfaceflinger/ISurface.h> +#include <ui/Overlay.h> #include <media/mediaplayer.h> #include <media/AudioSystem.h> diff --git a/camera/libcameraservice/CameraService.h b/camera/libcameraservice/CameraService.h index b3d20f6..bc49b1d 100644 --- a/camera/libcameraservice/CameraService.h +++ b/camera/libcameraservice/CameraService.h @@ -19,9 +19,9 @@ #ifndef ANDROID_SERVERS_CAMERA_CAMERASERVICE_H #define ANDROID_SERVERS_CAMERA_CAMERASERVICE_H -#include <ui/ICameraService.h> -#include <ui/CameraHardwareInterface.h> -#include <ui/Camera.h> +#include <camera/ICameraService.h> +#include <camera/CameraHardwareInterface.h> +#include <camera/Camera.h> namespace android { diff --git a/camera/tests/CameraServiceTest/Android.mk b/camera/tests/CameraServiceTest/Android.mk index 8da7c1f..9bb190a 100644 --- a/camera/tests/CameraServiceTest/Android.mk +++ b/camera/tests/CameraServiceTest/Android.mk @@ -17,6 +17,8 @@ LOCAL_SHARED_LIBRARIES += \ libbinder \ libcutils \ libutils \ - libui + libui \ + libcamera_client \ + libsurfaceflinger_client include $(BUILD_EXECUTABLE) diff --git a/camera/tests/CameraServiceTest/CameraServiceTest.cpp b/camera/tests/CameraServiceTest/CameraServiceTest.cpp index f89d9d3..9fc795b 100644 --- a/camera/tests/CameraServiceTest/CameraServiceTest.cpp +++ b/camera/tests/CameraServiceTest/CameraServiceTest.cpp @@ -6,13 +6,13 @@ #include <sys/types.h> #include <sys/wait.h> #include <unistd.h> -#include <ui/ISurface.h> -#include <ui/Camera.h> -#include <ui/CameraParameters.h> +#include <surfaceflinger/ISurface.h> +#include <camera/Camera.h> +#include <camera/CameraParameters.h> #include <ui/GraphicBuffer.h> -#include <ui/ICamera.h> -#include <ui/ICameraClient.h> -#include <ui/ICameraService.h> +#include <camera/ICamera.h> +#include <camera/ICameraClient.h> +#include <camera/ICameraService.h> #include <ui/Overlay.h> #include <binder/IPCThreadState.h> #include <binder/IServiceManager.h> diff --git a/cmds/bootanimation/Android.mk b/cmds/bootanimation/Android.mk index 939b63f..2b89759 100644 --- a/cmds/bootanimation/Android.mk +++ b/cmds/bootanimation/Android.mk @@ -21,7 +21,8 @@ LOCAL_SHARED_LIBRARIES := \ libui \ libskia \ libEGL \ - libGLESv1_CM + libGLESv1_CM \ + libsurfaceflinger_client LOCAL_C_INCLUDES := \ $(call include-path-for, corecg graphics) diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index ce36c4b..ac2eb0d 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -34,11 +34,12 @@ #include <ui/Rect.h> #include <ui/Region.h> #include <ui/DisplayInfo.h> -#include <ui/ISurfaceComposer.h> -#include <ui/ISurfaceFlingerClient.h> #include <ui/FramebufferNativeWindow.h> #include <ui/EGLUtils.h> +#include <surfaceflinger/ISurfaceComposer.h> +#include <surfaceflinger/ISurfaceFlingerClient.h> + #include <core/SkBitmap.h> #include <images/SkImageDecoder.h> diff --git a/cmds/bootanimation/BootAnimation.h b/cmds/bootanimation/BootAnimation.h index e53ba8b..8e28bba 100644 --- a/cmds/bootanimation/BootAnimation.h +++ b/cmds/bootanimation/BootAnimation.h @@ -23,8 +23,8 @@ #include <utils/threads.h> #include <utils/AssetManager.h> -#include <ui/ISurfaceComposer.h> -#include <ui/SurfaceComposerClient.h> +#include <surfaceflinger/ISurfaceComposer.h> +#include <surfaceflinger/SurfaceComposerClient.h> #include <EGL/egl.h> #include <GLES/gl.h> diff --git a/cmds/bootanimation/bootanimation_main.cpp b/cmds/bootanimation/bootanimation_main.cpp index 3c82fe5..5f8b744 100644 --- a/cmds/bootanimation/bootanimation_main.cpp +++ b/cmds/bootanimation/bootanimation_main.cpp @@ -25,7 +25,7 @@ #include <utils/Log.h> #include <utils/threads.h> -#include <ui/ISurfaceComposer.h> +#include <surfaceflinger/ISurfaceComposer.h> #if defined(HAVE_PTHREADS) # include <pthread.h> diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 1ffd265..e8749ed 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -159,6 +159,8 @@ LOCAL_SHARED_LIBRARIES := \ libbinder \ libnetutils \ libui \ + libsurfaceflinger_client \ + libcamera_client \ libskiagl \ libskia \ libsqlite \ diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp index 03107a4..9c0e282 100644 --- a/core/jni/android_hardware_Camera.cpp +++ b/core/jni/android_hardware_Camera.cpp @@ -25,8 +25,8 @@ #include <utils/Vector.h> -#include <ui/Surface.h> -#include <ui/Camera.h> +#include <surfaceflinger/Surface.h> +#include <camera/Camera.h> #include <binder/IMemory.h> using namespace android; diff --git a/core/jni/android_view_Display.cpp b/core/jni/android_view_Display.cpp index bb7b5ef..2e160ae 100644 --- a/core/jni/android_view_Display.cpp +++ b/core/jni/android_view_Display.cpp @@ -17,7 +17,7 @@ #include <stdio.h> #include <assert.h> -#include <ui/SurfaceComposerClient.h> +#include <surfaceflinger/SurfaceComposerClient.h> #include <ui/PixelFormat.h> #include <ui/DisplayInfo.h> diff --git a/core/jni/android_view_Surface.cpp b/core/jni/android_view_Surface.cpp index 40c8aa0..723205a 100644 --- a/core/jni/android_view_Surface.cpp +++ b/core/jni/android_view_Surface.cpp @@ -18,7 +18,7 @@ #include "android_util_Binder.h" -#include <ui/SurfaceComposerClient.h> +#include <surfaceflinger/SurfaceComposerClient.h> #include <ui/Region.h> #include <ui/Rect.h> diff --git a/core/jni/com_google_android_gles_jni_EGLImpl.cpp b/core/jni/com_google_android_gles_jni_EGLImpl.cpp index 974fc0b..6a8c4b9 100644 --- a/core/jni/com_google_android_gles_jni_EGLImpl.cpp +++ b/core/jni/com_google_android_gles_jni_EGLImpl.cpp @@ -21,7 +21,7 @@ #include <EGL/egl.h> #include <GLES/gl.h> -#include <ui/Surface.h> +#include <surfaceflinger/Surface.h> #include <SkBitmap.h> #include <SkPixelRef.h> diff --git a/graphics/jni/Android.mk b/graphics/jni/Android.mk index 799fcbb..8476be1 100644 --- a/graphics/jni/Android.mk +++ b/graphics/jni/Android.mk @@ -19,7 +19,8 @@ LOCAL_SHARED_LIBRARIES := \ libcutils \ libskia \ libutils \ - libui + libui \ + libsurfaceflinger_client LOCAL_STATIC_LIBRARIES := diff --git a/graphics/jni/android_renderscript_RenderScript.cpp b/graphics/jni/android_renderscript_RenderScript.cpp index 4d35c37..0ffdf71 100644 --- a/graphics/jni/android_renderscript_RenderScript.cpp +++ b/graphics/jni/android_renderscript_RenderScript.cpp @@ -23,7 +23,7 @@ #include <math.h> #include <utils/misc.h> -#include <ui/Surface.h> +#include <surfaceflinger/Surface.h> #include <core/SkBitmap.h> #include <core/SkPixelRef.h> 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 diff --git a/libs/camera/Android.mk b/libs/camera/Android.mk new file mode 100644 index 0000000..03ff229 --- /dev/null +++ b/libs/camera/Android.mk @@ -0,0 +1,25 @@ +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_SRC_FILES:= \ + Camera.cpp \ + CameraParameters.cpp \ + ICamera.cpp \ + ICameraClient.cpp \ + ICameraService.cpp + +LOCAL_SHARED_LIBRARIES := \ + libcutils \ + libutils \ + libbinder \ + libhardware \ + libsurfaceflinger_client \ + libui + +LOCAL_MODULE:= libcamera_client + +ifeq ($(TARGET_SIMULATOR),true) + LOCAL_LDLIBS += -lpthread +endif + +include $(BUILD_SHARED_LIBRARY) diff --git a/libs/ui/Camera.cpp b/libs/camera/Camera.cpp index f374fbc..8620e71 100644 --- a/libs/ui/Camera.cpp +++ b/libs/camera/Camera.cpp @@ -19,12 +19,15 @@ //#define LOG_NDEBUG 0 #define LOG_TAG "Camera" #include <utils/Log.h> -#include <binder/IServiceManager.h> #include <utils/threads.h> + +#include <binder/IServiceManager.h> #include <binder/IMemory.h> -#include <ui/Surface.h> -#include <ui/Camera.h> -#include <ui/ICameraService.h> + +#include <camera/Camera.h> +#include <camera/ICameraService.h> + +#include <surfaceflinger/Surface.h> namespace android { diff --git a/libs/ui/CameraParameters.cpp b/libs/camera/CameraParameters.cpp index 493b9c1..1bf1759 100644 --- a/libs/ui/CameraParameters.cpp +++ b/libs/camera/CameraParameters.cpp @@ -20,7 +20,7 @@ #include <string.h> #include <stdlib.h> -#include <ui/CameraParameters.h> +#include <camera/CameraParameters.h> namespace android { // Parameter keys to communicate between camera application and driver. diff --git a/libs/ui/ICamera.cpp b/libs/camera/ICamera.cpp index 4154b05..724bd20 100644 --- a/libs/ui/ICamera.cpp +++ b/libs/camera/ICamera.cpp @@ -21,7 +21,7 @@ #include <stdint.h> #include <sys/types.h> #include <binder/Parcel.h> -#include <ui/ICamera.h> +#include <camera/ICamera.h> namespace android { diff --git a/libs/ui/ICameraClient.cpp b/libs/camera/ICameraClient.cpp index 42b4da4..cb3bd0c 100644 --- a/libs/ui/ICameraClient.cpp +++ b/libs/camera/ICameraClient.cpp @@ -20,7 +20,7 @@ #include <utils/Log.h> #include <stdint.h> #include <sys/types.h> -#include <ui/ICameraClient.h> +#include <camera/ICameraClient.h> namespace android { diff --git a/libs/ui/ICameraService.cpp b/libs/camera/ICameraService.cpp index 84986c6..46b5478 100644 --- a/libs/ui/ICameraService.cpp +++ b/libs/camera/ICameraService.cpp @@ -22,7 +22,7 @@ #include <binder/IPCThreadState.h> #include <binder/IServiceManager.h> -#include <ui/ICameraService.h> +#include <camera/ICameraService.h> namespace android { diff --git a/libs/rs/rsContext.cpp b/libs/rs/rsContext.cpp index 2e47ea3..2a0ccfb 100644 --- a/libs/rs/rsContext.cpp +++ b/libs/rs/rsContext.cpp @@ -19,6 +19,7 @@ #include "rsThreadIO.h" #include <ui/FramebufferNativeWindow.h> #include <ui/EGLUtils.h> +#include <surfaceflinger/Surface.h> #include <sys/types.h> #include <sys/resource.h> diff --git a/libs/rs/rsContext.h b/libs/rs/rsContext.h index 31d8cc8..caf9728 100644 --- a/libs/rs/rsContext.h +++ b/libs/rs/rsContext.h @@ -19,8 +19,6 @@ #include "rsUtils.h" -#include <ui/Surface.h> - #include "rsThreadIO.h" #include "rsType.h" #include "rsMatrix.h" @@ -46,6 +44,9 @@ // --------------------------------------------------------------------------- namespace android { + +class Surface; + namespace renderscript { class Context diff --git a/libs/surfaceflinger/Android.mk b/libs/surfaceflinger/Android.mk index b3fed58..395a937 100644 --- a/libs/surfaceflinger/Android.mk +++ b/libs/surfaceflinger/Android.mk @@ -39,7 +39,8 @@ LOCAL_SHARED_LIBRARIES := \ libEGL \ libGLESv1_CM \ libbinder \ - libui + libui \ + libsurfaceflinger_client LOCAL_C_INCLUDES := \ $(call include-path-for, corecg graphics) diff --git a/libs/surfaceflinger/Layer.cpp b/libs/surfaceflinger/Layer.cpp index 1870d3a..f38efab 100644 --- a/libs/surfaceflinger/Layer.cpp +++ b/libs/surfaceflinger/Layer.cpp @@ -27,7 +27,8 @@ #include <ui/GraphicBuffer.h> #include <ui/PixelFormat.h> -#include <ui/Surface.h> + +#include <surfaceflinger/Surface.h> #include "clz.h" #include "Layer.h" diff --git a/libs/surfaceflinger/LayerBase.h b/libs/surfaceflinger/LayerBase.h index f73ea0c..a49faf7 100644 --- a/libs/surfaceflinger/LayerBase.h +++ b/libs/surfaceflinger/LayerBase.h @@ -23,14 +23,15 @@ #include <EGL/egl.h> #include <EGL/eglext.h> -#include <private/ui/SharedBufferStack.h> -#include <private/ui/LayerState.h> - #include <utils/RefBase.h> #include <ui/Region.h> #include <ui/Overlay.h> +#include <surfaceflinger/ISurfaceFlingerClient.h> +#include <private/surfaceflinger/SharedBufferStack.h> +#include <private/surfaceflinger/LayerState.h> + #include <pixelflinger/pixelflinger.h> #include "Transform.h" diff --git a/libs/surfaceflinger/LayerBlur.h b/libs/surfaceflinger/LayerBlur.h index 2e9d7c6..5b63dec 100644 --- a/libs/surfaceflinger/LayerBlur.h +++ b/libs/surfaceflinger/LayerBlur.h @@ -20,8 +20,6 @@ #include <stdint.h> #include <sys/types.h> -#include <private/ui/LayerState.h> - #include <ui/Region.h> #include "LayerBase.h" diff --git a/libs/surfaceflinger/SurfaceFlinger.h b/libs/surfaceflinger/SurfaceFlinger.h index 2b7820c..4520c0e 100644 --- a/libs/surfaceflinger/SurfaceFlinger.h +++ b/libs/surfaceflinger/SurfaceFlinger.h @@ -31,11 +31,8 @@ #include <binder/Permission.h> #include <ui/PixelFormat.h> -#include <ui/ISurfaceComposer.h> -#include <ui/ISurfaceFlingerClient.h> - -#include <private/ui/SharedBufferStack.h> -#include <private/ui/LayerState.h> +#include <surfaceflinger/ISurfaceComposer.h> +#include <surfaceflinger/ISurfaceFlingerClient.h> #include "Barrier.h" #include "Layer.h" diff --git a/libs/surfaceflinger/tests/overlays/Android.mk b/libs/surfaceflinger/tests/overlays/Android.mk index dc47e45..592b601 100644 --- a/libs/surfaceflinger/tests/overlays/Android.mk +++ b/libs/surfaceflinger/tests/overlays/Android.mk @@ -7,7 +7,8 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libcutils \ libutils \ - libui + libui \ + libsurfaceflinger_client LOCAL_MODULE:= test-overlays diff --git a/libs/surfaceflinger/tests/overlays/overlays.cpp b/libs/surfaceflinger/tests/overlays/overlays.cpp index 0b9322e..c248a61 100644 --- a/libs/surfaceflinger/tests/overlays/overlays.cpp +++ b/libs/surfaceflinger/tests/overlays/overlays.cpp @@ -3,10 +3,11 @@ #include <binder/IServiceManager.h> #include <utils/Log.h> -#include <ui/Surface.h> -#include <ui/ISurface.h> #include <ui/Overlay.h> -#include <ui/SurfaceComposerClient.h> + +#include <surfaceflinger/Surface.h> +#include <surfaceflinger/ISurface.h> +#include <surfaceflinger/SurfaceComposerClient.h> using namespace android; diff --git a/libs/surfaceflinger/tests/resize/Android.mk b/libs/surfaceflinger/tests/resize/Android.mk index ef1532f..24c2d01 100644 --- a/libs/surfaceflinger/tests/resize/Android.mk +++ b/libs/surfaceflinger/tests/resize/Android.mk @@ -7,7 +7,8 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libcutils \ libutils \ - libui + libui \ + libsurfaceflinger_client LOCAL_MODULE:= test-resize diff --git a/libs/surfaceflinger/tests/resize/resize.cpp b/libs/surfaceflinger/tests/resize/resize.cpp index 21c6ab6..127cca3 100644 --- a/libs/surfaceflinger/tests/resize/resize.cpp +++ b/libs/surfaceflinger/tests/resize/resize.cpp @@ -1,14 +1,16 @@ #include <cutils/memory.h> -#include <utils/IPCThreadState.h> -#include <utils/ProcessState.h> -#include <utils/IServiceManager.h> #include <utils/Log.h> -#include <ui/Surface.h> -#include <ui/ISurface.h> +#include <binder/IPCThreadState.h> +#include <binder/ProcessState.h> +#include <binder/IServiceManager.h> + +#include <surfaceflinger/Surface.h> +#include <surfaceflinger/ISurface.h> +#include <surfaceflinger/SurfaceComposerClient.h> + #include <ui/Overlay.h> -#include <ui/SurfaceComposerClient.h> using namespace android; diff --git a/libs/surfaceflinger_client/Android.mk b/libs/surfaceflinger_client/Android.mk new file mode 100644 index 0000000..fe85b34 --- /dev/null +++ b/libs/surfaceflinger_client/Android.mk @@ -0,0 +1,26 @@ +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_SRC_FILES:= \ + ISurfaceComposer.cpp \ + ISurface.cpp \ + ISurfaceFlingerClient.cpp \ + LayerState.cpp \ + SharedBufferStack.cpp \ + Surface.cpp \ + SurfaceComposerClient.cpp + +LOCAL_SHARED_LIBRARIES := \ + libcutils \ + libutils \ + libbinder \ + libhardware \ + libui + +LOCAL_MODULE:= libsurfaceflinger_client + +ifeq ($(TARGET_SIMULATOR),true) + LOCAL_LDLIBS += -lpthread +endif + +include $(BUILD_SHARED_LIBRARY) diff --git a/libs/ui/ISurface.cpp b/libs/surfaceflinger_client/ISurface.cpp index 6f3d762..9125146 100644 --- a/libs/ui/ISurface.cpp +++ b/libs/surfaceflinger_client/ISurface.cpp @@ -23,12 +23,12 @@ #include <binder/Parcel.h> #include <binder/IMemory.h> -#include <ui/ISurface.h> #include <ui/Overlay.h> -#include <ui/Surface.h> - #include <ui/GraphicBuffer.h> +#include <surfaceflinger/Surface.h> +#include <surfaceflinger/ISurface.h> + namespace android { // ---------------------------------------------------------------------- diff --git a/libs/ui/ISurfaceComposer.cpp b/libs/surfaceflinger_client/ISurfaceComposer.cpp index fd2a590..b6f4e24 100644 --- a/libs/ui/ISurfaceComposer.cpp +++ b/libs/surfaceflinger_client/ISurfaceComposer.cpp @@ -25,9 +25,10 @@ #include <binder/IPCThreadState.h> #include <binder/IServiceManager.h> -#include <ui/ISurfaceComposer.h> #include <ui/DisplayInfo.h> +#include <surfaceflinger/ISurfaceComposer.h> + // --------------------------------------------------------------------------- #define LIKELY( exp ) (__builtin_expect( (exp) != 0, true )) diff --git a/libs/ui/ISurfaceFlingerClient.cpp b/libs/surfaceflinger_client/ISurfaceFlingerClient.cpp index 4a6a1d7..e636c52 100644 --- a/libs/ui/ISurfaceFlingerClient.cpp +++ b/libs/surfaceflinger_client/ISurfaceFlingerClient.cpp @@ -26,12 +26,12 @@ #include <binder/IPCThreadState.h> #include <binder/IServiceManager.h> -#include <ui/ISurface.h> -#include <ui/ISurfaceFlingerClient.h> #include <ui/Point.h> #include <ui/Rect.h> -#include <private/ui/LayerState.h> +#include <surfaceflinger/ISurface.h> +#include <surfaceflinger/ISurfaceFlingerClient.h> +#include <private/surfaceflinger/LayerState.h> // --------------------------------------------------------------------------- diff --git a/libs/ui/LayerState.cpp b/libs/surfaceflinger_client/LayerState.cpp index a53ffb7..114a9e9 100644 --- a/libs/ui/LayerState.cpp +++ b/libs/surfaceflinger_client/LayerState.cpp @@ -16,37 +16,25 @@ #include <utils/Errors.h> #include <binder/Parcel.h> -#include <private/ui/LayerState.h> +#include <private/surfaceflinger/LayerState.h> namespace android { status_t layer_state_t::write(Parcel& output) const { size_t size = sizeof(layer_state_t); - - //output.writeStrongBinder(surface->asBinder()); - //size -= sizeof(surface); - transparentRegion.write(output); size -= sizeof(transparentRegion); - output.write(this, size); - return NO_ERROR; } status_t layer_state_t::read(const Parcel& input) { size_t size = sizeof(layer_state_t); - - //surface = interface_cast<ISurface>(input.readStrongBinder()); - //size -= sizeof(surface); - transparentRegion.read(input); size -= sizeof(transparentRegion); - input.read(this, size); - return NO_ERROR; } diff --git a/libs/ui/SharedBufferStack.cpp b/libs/surfaceflinger_client/SharedBufferStack.cpp index 46b6766..ceb5e59 100644 --- a/libs/ui/SharedBufferStack.cpp +++ b/libs/surfaceflinger_client/SharedBufferStack.cpp @@ -23,7 +23,7 @@ #include <utils/Log.h> #include <utils/threads.h> -#include <private/ui/SharedBufferStack.h> +#include <private/surfaceflinger/SharedBufferStack.h> #include <ui/Rect.h> #include <ui/Region.h> diff --git a/libs/ui/Surface.cpp b/libs/surfaceflinger_client/Surface.cpp index c7be05b..eb3457b 100644 --- a/libs/ui/Surface.cpp +++ b/libs/surfaceflinger_client/Surface.cpp @@ -26,22 +26,25 @@ #include <utils/Errors.h> #include <utils/threads.h> #include <utils/CallStack.h> +#include <utils/Log.h> + +#include <pixelflinger/pixelflinger.h> + #include <binder/IPCThreadState.h> #include <binder/IMemory.h> -#include <utils/Log.h> #include <ui/DisplayInfo.h> #include <ui/GraphicBuffer.h> #include <ui/GraphicBufferMapper.h> -#include <ui/ISurface.h> -#include <ui/Surface.h> -#include <ui/SurfaceComposerClient.h> #include <ui/Rect.h> -#include <pixelflinger/pixelflinger.h> +#include <surfaceflinger/Surface.h> +#include <surfaceflinger/ISurface.h> +#include <surfaceflinger/ISurfaceComposer.h> +#include <surfaceflinger/SurfaceComposerClient.h> -#include <private/ui/SharedBufferStack.h> -#include <private/ui/LayerState.h> +#include <private/surfaceflinger/SharedBufferStack.h> +#include <private/surfaceflinger/LayerState.h> namespace android { diff --git a/libs/ui/SurfaceComposerClient.cpp b/libs/surfaceflinger_client/SurfaceComposerClient.cpp index eda84ef..0b5e504 100644 --- a/libs/ui/SurfaceComposerClient.cpp +++ b/libs/surfaceflinger_client/SurfaceComposerClient.cpp @@ -29,19 +29,21 @@ #include <utils/Errors.h> #include <utils/threads.h> #include <utils/KeyedVector.h> +#include <utils/Log.h> + #include <binder/IServiceManager.h> #include <binder/IMemory.h> -#include <utils/Log.h> #include <ui/DisplayInfo.h> -#include <ui/ISurfaceComposer.h> -#include <ui/ISurfaceFlingerClient.h> -#include <ui/ISurface.h> -#include <ui/SurfaceComposerClient.h> #include <ui/Rect.h> -#include <private/ui/LayerState.h> -#include <private/ui/SharedBufferStack.h> +#include <surfaceflinger/ISurfaceComposer.h> +#include <surfaceflinger/ISurfaceFlingerClient.h> +#include <surfaceflinger/ISurface.h> +#include <surfaceflinger/SurfaceComposerClient.h> + +#include <private/surfaceflinger/LayerState.h> +#include <private/surfaceflinger/SharedBufferStack.h> #define VERBOSE(...) ((void)0) //#define VERBOSE LOGD diff --git a/libs/ui/Android.mk b/libs/ui/Android.mk index 84aec61..f7acd97 100644 --- a/libs/ui/Android.mk +++ b/libs/ui/Android.mk @@ -2,8 +2,6 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ - Camera.cpp \ - CameraParameters.cpp \ EGLUtils.cpp \ EventHub.cpp \ EventRecurrence.cpp \ @@ -13,21 +11,11 @@ LOCAL_SRC_FILES:= \ GraphicBufferMapper.cpp \ KeyLayoutMap.cpp \ KeyCharacterMap.cpp \ - ICamera.cpp \ - ICameraClient.cpp \ - ICameraService.cpp \ IOverlay.cpp \ - ISurfaceComposer.cpp \ - ISurface.cpp \ - ISurfaceFlingerClient.cpp \ - LayerState.cpp \ Overlay.cpp \ PixelFormat.cpp \ Rect.cpp \ - Region.cpp \ - SharedBufferStack.cpp \ - Surface.cpp \ - SurfaceComposerClient.cpp + Region.cpp LOCAL_SHARED_LIBRARIES := \ libcutils \ diff --git a/libs/ui/FramebufferNativeWindow.cpp b/libs/ui/FramebufferNativeWindow.cpp index c5e22e5..1fa2c68 100644 --- a/libs/ui/FramebufferNativeWindow.cpp +++ b/libs/ui/FramebufferNativeWindow.cpp @@ -27,7 +27,6 @@ #include <utils/threads.h> #include <utils/RefBase.h> -#include <ui/SurfaceComposerClient.h> #include <ui/Rect.h> #include <ui/FramebufferNativeWindow.h> diff --git a/media/jni/Android.mk b/media/jni/Android.mk index d83f493..a6a25cd 100644 --- a/media/jni/Android.mk +++ b/media/jni/Android.mk @@ -21,7 +21,9 @@ LOCAL_SHARED_LIBRARIES := \ libmedia \ libskia \ libui \ - libcutils + libcutils \ + libsurfaceflinger_client \ + libcamera_client ifneq ($(BUILD_WITHOUT_PV),true) diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp index 76d1674..2773e5c 100644 --- a/media/jni/android_media_MediaPlayer.cpp +++ b/media/jni/android_media_MediaPlayer.cpp @@ -35,7 +35,7 @@ #include "utils/String8.h" #include "android_util_Binder.h" #include <binder/Parcel.h> - +#include <surfaceflinger/Surface.h> // ---------------------------------------------------------------------------- diff --git a/media/jni/android_media_MediaRecorder.cpp b/media/jni/android_media_MediaRecorder.cpp index cad65b3..3063f15 100644 --- a/media/jni/android_media_MediaRecorder.cpp +++ b/media/jni/android_media_MediaRecorder.cpp @@ -18,9 +18,9 @@ #define LOG_TAG "MediaRecorderJNI" #include <utils/Log.h> -#include <ui/SurfaceComposerClient.h> -#include <ui/ICameraService.h> -#include <ui/Camera.h> +#include <surfaceflinger/SurfaceComposerClient.h> +#include <camera/ICameraService.h> +#include <camera/Camera.h> #include <media/mediarecorder.h> #include <stdio.h> #include <assert.h> diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index c59d323..3adabcc 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -29,7 +29,7 @@ LOCAL_SRC_FILES:= \ MediaProfiles.cpp LOCAL_SHARED_LIBRARIES := \ - libui libcutils libutils libbinder libsonivox libicuuc libexpat + libui libcutils libutils libbinder libsonivox libicuuc libexpat libsurfaceflinger_client libcamera_client LOCAL_MODULE:= libmedia diff --git a/media/libmedia/IMediaPlayer.cpp b/media/libmedia/IMediaPlayer.cpp index 5d9db10..9c127d4 100644 --- a/media/libmedia/IMediaPlayer.cpp +++ b/media/libmedia/IMediaPlayer.cpp @@ -21,7 +21,7 @@ #include <binder/Parcel.h> #include <media/IMediaPlayer.h> -#include <ui/ISurface.h> +#include <surfaceflinger/ISurface.h> namespace android { diff --git a/media/libmedia/IMediaRecorder.cpp b/media/libmedia/IMediaRecorder.cpp index df7d301..2bc2a7e 100644 --- a/media/libmedia/IMediaRecorder.cpp +++ b/media/libmedia/IMediaRecorder.cpp @@ -19,8 +19,8 @@ #define LOG_TAG "IMediaRecorder" #include <utils/Log.h> #include <binder/Parcel.h> -#include <ui/ISurface.h> -#include <ui/ICamera.h> +#include <surfaceflinger/ISurface.h> +#include <camera/ICamera.h> #include <media/IMediaPlayerClient.h> #include <media/IMediaRecorder.h> diff --git a/media/libmedia/IOMX.cpp b/media/libmedia/IOMX.cpp index 0469fd5..01b6737 100644 --- a/media/libmedia/IOMX.cpp +++ b/media/libmedia/IOMX.cpp @@ -5,8 +5,8 @@ #include <binder/IMemory.h> #include <binder/Parcel.h> #include <media/IOMX.h> -#include <ui/ISurface.h> -#include <ui/Surface.h> +#include <surfaceflinger/ISurface.h> +#include <surfaceflinger/Surface.h> namespace android { diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp index cb5ee4b..01cd8ce 100644 --- a/media/libmedia/mediaplayer.cpp +++ b/media/libmedia/mediaplayer.cpp @@ -30,6 +30,8 @@ #include <media/mediaplayer.h> #include <media/AudioTrack.h> +#include <surfaceflinger/Surface.h> + #include <binder/MemoryBase.h> #include <utils/KeyedVector.h> diff --git a/media/libmedia/mediarecorder.cpp b/media/libmedia/mediarecorder.cpp index 7b5dabb..23024e9 100644 --- a/media/libmedia/mediarecorder.cpp +++ b/media/libmedia/mediarecorder.cpp @@ -18,7 +18,7 @@ //#define LOG_NDEBUG 0 #define LOG_TAG "MediaRecorder" #include <utils/Log.h> -#include <ui/Surface.h> +#include <surfaceflinger/Surface.h> #include <media/mediarecorder.h> #include <binder/IServiceManager.h> #include <utils/String8.h> diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk index 12872bc..a9a0fde 100644 --- a/media/libmediaplayerservice/Android.mk +++ b/media/libmediaplayerservice/Android.mk @@ -13,7 +13,7 @@ LOCAL_SRC_FILES:= \ TestPlayerStub.cpp \ VorbisPlayer.cpp \ VorbisMetadataRetriever.cpp \ - MidiMetadataRetriever.cpp \ + MidiMetadataRetriever.cpp \ MidiFile.cpp ifeq ($(BUILD_WITH_FULL_STAGEFRIGHT),true) @@ -30,17 +30,18 @@ ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true) LOCAL_LDLIBS += -ldl -lpthread endif -LOCAL_SHARED_LIBRARIES := \ - libcutils \ - libutils \ - libbinder \ - libvorbisidec \ - libsonivox \ - libmedia \ - libandroid_runtime \ - libstagefright \ - libstagefright_omx \ - libstagefright_color_conversion +LOCAL_SHARED_LIBRARIES := \ + libcutils \ + libutils \ + libbinder \ + libvorbisidec \ + libsonivox \ + libmedia \ + libandroid_runtime \ + libstagefright \ + libstagefright_omx \ + libstagefright_color_conversion \ + libsurfaceflinger_client ifneq ($(BUILD_WITHOUT_PV),true) LOCAL_SHARED_LIBRARIES += \ @@ -54,7 +55,7 @@ ifneq ($(TARGET_SIMULATOR),true) LOCAL_SHARED_LIBRARIES += libdl endif -LOCAL_C_INCLUDES := \ +LOCAL_C_INCLUDES := \ $(JNI_H_INCLUDE) \ $(call include-path-for, graphics corecg) \ $(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \ diff --git a/media/libmediaplayerservice/MediaPlayerService.h b/media/libmediaplayerservice/MediaPlayerService.h index 5c03e47..c9cae35 100644 --- a/media/libmediaplayerservice/MediaPlayerService.h +++ b/media/libmediaplayerservice/MediaPlayerService.h @@ -25,7 +25,6 @@ #include <utils/KeyedVector.h> #include <utils/String8.h> #include <utils/Vector.h> -#include <ui/SurfaceComposerClient.h> #include <media/IMediaPlayerService.h> #include <media/MediaPlayerInterface.h> diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp index 1a8109c..531fd11 100644 --- a/media/libmediaplayerservice/StagefrightRecorder.cpp +++ b/media/libmediaplayerservice/StagefrightRecorder.cpp @@ -29,8 +29,8 @@ #include <media/stagefright/MetaData.h> #include <media/stagefright/OMXClient.h> #include <media/stagefright/OMXCodec.h> -#include <ui/ICamera.h> -#include <ui/ISurface.h> +#include <camera/ICamera.h> +#include <surfaceflinger/ISurface.h> #include <utils/Errors.h> namespace android { diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 88d61a6..1db398e 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -65,7 +65,9 @@ LOCAL_SHARED_LIBRARIES := \ libcutils \ libui \ libsonivox \ - libvorbisidec + libvorbisidec \ + libsurfaceflinger_client \ + libcamera_client LOCAL_STATIC_LIBRARIES := \ libstagefright_aacdec \ diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index b6dcf46..5d2127b 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -36,6 +36,8 @@ #include <media/stagefright/MetaData.h> #include <media/stagefright/OMXCodec.h> +#include <surfaceflinger/ISurface.h> + namespace android { struct AwesomeEvent : public TimedEventQueue::Event { diff --git a/media/libstagefright/CameraSource.cpp b/media/libstagefright/CameraSource.cpp index 8cd572e..075b1e3 100644 --- a/media/libstagefright/CameraSource.cpp +++ b/media/libstagefright/CameraSource.cpp @@ -25,11 +25,11 @@ #include <media/stagefright/MediaDefs.h> #include <media/stagefright/MediaErrors.h> #include <media/stagefright/MetaData.h> -#include <ui/Camera.h> -#include <ui/CameraParameters.h> +#include <camera/Camera.h> +#include <camera/CameraParameters.h> #include <ui/GraphicBuffer.h> -#include <ui/ISurface.h> #include <ui/Overlay.h> +#include <surfaceflinger/ISurface.h> #include <utils/String8.h> namespace android { diff --git a/media/libstagefright/colorconversion/Android.mk b/media/libstagefright/colorconversion/Android.mk index c08ce3a..e7a571a 100644 --- a/media/libstagefright/colorconversion/Android.mk +++ b/media/libstagefright/colorconversion/Android.mk @@ -13,7 +13,9 @@ LOCAL_SHARED_LIBRARIES := \ libmedia \ libutils \ libui \ - libcutils + libcutils \ + libsurfaceflinger_client\ + libcamera_client LOCAL_PRELINK_MODULE:= false diff --git a/media/libstagefright/colorconversion/SoftwareRenderer.cpp b/media/libstagefright/colorconversion/SoftwareRenderer.cpp index 56c5102..4c11c36 100644 --- a/media/libstagefright/colorconversion/SoftwareRenderer.cpp +++ b/media/libstagefright/colorconversion/SoftwareRenderer.cpp @@ -22,7 +22,7 @@ #include <binder/MemoryHeapBase.h> #include <binder/MemoryHeapPmem.h> #include <media/stagefright/MediaDebug.h> -#include <ui/ISurface.h> +#include <surfaceflinger/ISurface.h> namespace android { |