summaryrefslogtreecommitdiff
path: root/libs/camera/Camera.cpp
diff options
context:
space:
mode:
author James Dong <jdong@google.com> 2010-11-15 10:38:37 -0800
committer James Dong <jdong@google.com> 2010-11-15 13:14:59 -0800
commitdf7a856d3d7a62049e3d1091cf07e95019da4609 (patch)
tree43c9ce0d78057be9200a6c8bc6697ca62f46e82d /libs/camera/Camera.cpp
parent64f1163084433952766eed31dbd26df420ba6cfb (diff)
Fixed a race condition where some recording frames may not be released.
When startRecording() is called before setListener(), recording frames are sent right after startRecording(), but there is no listener to release the recording frames. This causes the hang in media server. bug - 3166356 Change-Id: I19366ca682ef9f6b847590c190c30a15ed32b8e4
Diffstat (limited to 'libs/camera/Camera.cpp')
-rw-r--r--libs/camera/Camera.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/libs/camera/Camera.cpp b/libs/camera/Camera.cpp
index 148e86407e4e..450971d39dba 100644
--- a/libs/camera/Camera.cpp
+++ b/libs/camera/Camera.cpp
@@ -372,6 +372,9 @@ void Camera::dataCallbackTimestamp(nsecs_t timestamp, int32_t msgType, const sp<
}
if (listener != NULL) {
listener->postDataTimestamp(timestamp, msgType, dataPtr);
+ } else {
+ LOGW("No listener was set. Drop a recording frame.");
+ releaseRecordingFrame(dataPtr);
}
}