Commit: 05753be9945cea27d3ceb754dd6486fabdf0e9a1 - frameworks-base (git)

frameworks/base

Commit MetaInfo

• Revisão: 05753be9945cea27d3ceb754dd6486fabdf0e9a1 (tree)
• Hora: 2010-03-17 16:16:23
• Autor: Wallace Wang <wallage@qq.c...>
• Commiter: Chih-Wei Huang

Mensagem de Log

Fix the Camera bug on using USB disk

Change /sdcard/tmp.jpg to /data/tmp.jpg

Mudança Sumário

• modified: camera/libcameraservice/V4L2Camera.cpp

Diff

--- a/camera/libcameraservice/V4L2Camera.cpp
+++ b/camera/libcameraservice/V4L2Camera.cpp
@@ -31,6 +31,8 @@
 
 #include <linux/videodev.h>
 
+#define CAMERA_FILE "/data/tmp.jpg"
+
 extern "C" {
     #include <jpeglib.h>
 }
@@ -351,7 +353,7 @@ sp<IMemory> V4L2Camera::GrabJpegFrame ()
     }
     nDequeued++;
 
-    fileSize = savePicture((unsigned char *)videoIn->mem[videoIn->buf.index], "/sdcard/tmp.jpg");
+    fileSize = savePicture((unsigned char *)videoIn->mem[videoIn->buf.index], CAMERA_FILE);
 
     /* Enqueue buffer */
     ret = ioctl(fd, VIDIOC_QBUF, &videoIn->buf);
@@ -361,7 +363,7 @@ sp<IMemory> V4L2Camera::GrabJpegFrame ()
     }
     nQueued++;
 
-    input = fopen("/sdcard/tmp.jpg", "rb");
+    input = fopen(CAMERA_FILE, "rb");
 
     if (input == NULL)
         LOGE("GrabJpegFrame: Input file == NULL");