drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Tweaks for forward-compatibility"

Browse Source
This commit is contained in:
Jean-Baptiste Queru
2011-06-18 09:45:53 -07:00
committed by Android Code Review
parent d8b027b18f 84d0ccf16c
commit e3b05d0916
4 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/gui/SurfaceTexture.h
View File

@ -28,6 +28,7 @@ struct SurfaceTexture {
void incStrong(android::sp<android::SurfaceTexture>* const) {} void incStrong(android::sp<android::SurfaceTexture>* const) {}
void getTransformMatrix(float mtx[16]) {} void getTransformMatrix(float mtx[16]) {}
void setFrameAvailableListener(const sp<FrameAvailableListener>&) {} void setFrameAvailableListener(const sp<FrameAvailableListener>&) {}
void setSynchronousMode(bool) {}
}; };
static sp<SurfaceTexture> SurfaceTexture_getSurfaceTexture(JNIEnv* env, jobject thiz) static sp<SurfaceTexture> SurfaceTexture_getSurfaceTexture(JNIEnv* env, jobject thiz)

2
include/ui/GraphicBuffer.h
View File

@ -74,6 +74,8 @@ public:
GraphicBuffer(); GraphicBuffer();
GraphicBuffer(android_native_buffer_t*, bool);
// creates w * h buffer // creates w * h buffer
GraphicBuffer(uint32_t w, uint32_t h, PixelFormat format, uint32_t usage); GraphicBuffer(uint32_t w, uint32_t h, PixelFormat format, uint32_t usage);

1
include/ui/android_native_buffer.h
View File

@ -63,6 +63,7 @@ typedef struct android_native_buffer_t
void* reserved_proc[8]; void* reserved_proc[8];
} android_native_buffer_t; } android_native_buffer_t;
#define ANativeWindowBuffer android_native_buffer_t
/*****************************************************************************/ /*****************************************************************************/

13
libs/ui/GraphicBuffer.cpp
View File

@ -49,6 +49,19 @@ GraphicBuffer::GraphicBuffer()
handle = NULL; handle = NULL;
} }
GraphicBuffer::GraphicBuffer(android_native_buffer_t*, bool)
: BASE(), mOwner(ownData), mBufferMapper(GraphicBufferMapper::get()),
mInitCheck(NO_ERROR), mIndex(-1)
{
width =
height =
stride =
format =
usage = 0;
transform = 0;
handle = NULL;
}
GraphicBuffer::GraphicBuffer(uint32_t w, uint32_t h, GraphicBuffer::GraphicBuffer(uint32_t w, uint32_t h,
PixelFormat reqFormat, uint32_t reqUsage) PixelFormat reqFormat, uint32_t reqUsage)
: BASE(), mOwner(ownData), mBufferMapper(GraphicBufferMapper::get()), : BASE(), mOwner(ownData), mBufferMapper(GraphicBufferMapper::get()),