Commit: 16e9784f3219cc04a30dc20aab00e64da84a5d61 - frameworks-base (git)

frameworks/base

Commit MetaInfo

• Revision: 16e9784f3219cc04a30dc20aab00e64da84a5d61 (tree)
• Zeit: 2010-04-15 15:34:53
• Autor: Wallace Wang <wallace1_wang@gmai...>
• Commiter: Chih-Wei Huang

Log Message

make camera preview ok

Ändern Zusammenfassung

• modified: libs/surfaceflinger/LayerBuffer.cpp
• modified: opengl/include/EGL/eglext.h

Diff

--- a/libs/surfaceflinger/LayerBuffer.cpp
+++ b/libs/surfaceflinger/LayerBuffer.cpp
@@ -276,17 +276,31 @@ LayerBuffer::Buffer::Buffer(const ISurface::BufferHeap& buffers, ssize_t offset)
     src.img.handle  = 0;
 
     gralloc_module_t const * module = LayerBuffer::getGrallocModule();
-    if (module && module->perform) {
-        int err = module->perform(module,
-                GRALLOC_MODULE_PERFORM_CREATE_HANDLE_FROM_BUFFER,
-                buffers.heap->heapID(), buffers.heap->getSize(),
-                offset, buffers.heap->base(),
-                &src.img.handle);
-
-        LOGE_IF(err, "CREATE_HANDLE_FROM_BUFFER (heapId=%d, size=%d, "
-             "offset=%ld, base=%p) failed (%s)",
-                buffers.heap->heapID(), buffers.heap->getSize(),
-                offset, buffers.heap->base(), strerror(-err));
+    if (module) {
+        if (module->perform) {
+            int err = module->perform(module,
+                    GRALLOC_MODULE_PERFORM_CREATE_HANDLE_FROM_BUFFER,
+                    buffers.heap->heapID(), buffers.heap->getSize(),
+                    offset, buffers.heap->base(),
+                    &src.img.handle);
+            if (err != NO_ERROR) {
+                LOGE("CREATE_HANDLE_FROM_BUFFER (heapId=%d, size=%d, "
+                        "offset=%ld, base=%p) failed (%s)",
+                        buffers.heap->heapID(), buffers.heap->getSize(),
+                        offset, buffers.heap->base(), strerror(-err));
+                return;
+            }
+        }
+
+        src.crop.l = 0;
+        src.crop.t = 0;
+        src.crop.r = buffers.w;
+        src.crop.b = buffers.h;
+
+        src.img.w       = buffers.hor_stride ?: buffers.w;
+        src.img.h       = buffers.ver_stride ?: buffers.h;
+        src.img.format  = buffers.format;
+        src.img.base    = (void*)(intptr_t(buffers.heap->base()) + offset);
     }
  }
 

--- a/opengl/include/EGL/eglext.h
+++ b/opengl/include/EGL/eglext.h
@@ -133,7 +133,7 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYIMAGEKHRPROC) (EGLDisplay dpy, EGL
 
 
 #ifndef EGL_ANDROID_image_native_buffer
-#define EGL_ANDROID_image_native_buffer 1
+//#define EGL_ANDROID_image_native_buffer 1
 struct android_native_buffer_t;
 #define EGL_NATIVE_BUFFER_ANDROID       0x3140  /* eglCreateImageKHR target */
 #endif