commit e148910dfb3f69cdf1a078066724cb32b18e7b8a
author James Dong <jdong@google.com> Wed Sep 05 19:49:52 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 05 19:49:53 2012 -0700
tree 1bbc0d88e173f7c630bbdf5d3aa6b8a169cb6a3a
parent 3a6b97eba61b280bf81407ad6d6fb210ef93f9c4
parent 6638f3bd61df1e5d012bc600b7af4c1b4dd4a06b

Merge "Fix an issue where the "mFrameCount" field was accessed without its containing object" into jb-mr1-dev

services/camera/libcameraservice/Camera2Device.cpp

diff --git a/services/camera/libcameraservice/Camera2Device.cpp b/services/camera/libcameraservice/Camera2Device.cpp
index f62c0a0..daeeebb 100644
--- a/services/camera/libcameraservice/Camera2Device.cpp
+++ b/services/camera/libcameraservice/Camera2Device.cpp
@@ -1030,7 +1030,7 @@
             const_cast<StreamAdapter*>(static_cast<const StreamAdapter*>(w));
     stream->mFrameCount++;
     ALOGVV("Stream %d enqueue: Frame %d (%p) captured at %lld ns",
-            stream->mId, mFrameCount, (void*)(*buffer), timestamp);
+            stream->mId, stream->mFrameCount, (void*)(*buffer), timestamp);
     int state = stream->mState;
     if (state != ACTIVE) {
         ALOGE("%s: Called when in bad state: %d", __FUNCTION__, state);