commit d767742343f03f9a2f9bd0a3f84061d40433d84d
author James Dong <jdong@google.com> Tue Dec 07 11:08:53 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 07 11:08:53 2010 -0800
tree 8915c3c505ab0c995e0e5d4fa98673c64550db3c
parent 97f2c9d530c9663deeb840f332dee205a7a11cdd
parent 6baa5de62a91b151af7a19036706b3d45143a32e

Merge "Don't drop video frames but to release them."

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 535f07f..f1fa0ff 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -1015,7 +1015,10 @@
 
     sp<Client> client = getClientFromCookie(user);
     if (client == 0) return;
-    if (!client->lockIfMessageWanted(msgType)) return;
+    if (!client->lockIfMessageWanted(msgType)) {
+        client->releaseRecordingFrame(dataPtr);
+        return;
+    }
 
     if (dataPtr == 0) {
         LOGE("Null data returned in data with timestamp callback");