diff options
author | junjiez <junjiez@codeaurora.org> | 2018-11-05 17:56:43 +0800 |
---|---|---|
committer | junjiez <junjiez@codeaurora.org> | 2018-11-15 14:58:53 +0800 |
commit | d3330644f7c4e6157593d6635f6b13fb11cdbc29 (patch) | |
tree | 4c3c5f89d54c64c33ed4dd5885835c2e83c8a180 | |
parent | 78b730055695188e43819ddf108b63021c9d7d7c (diff) | |
download | android_packages_apps_Snap-d3330644f7c4e6157593d6635f6b13fb11cdbc29.tar.gz android_packages_apps_Snap-d3330644f7c4e6157593d6635f6b13fb11cdbc29.tar.bz2 android_packages_apps_Snap-d3330644f7c4e6157593d6635f6b13fb11cdbc29.zip |
SnapdraongCamera:Fix longshot count
close redundant image when longshot is
not active and the timestamp of the image
is later then the last capture.
Change-Id: I90987c8abaec2d41c2c9bd26d7ab579ed8790fce
CRs-Fixed: 2335369
-rwxr-xr-x | src/com/android/camera/CaptureModule.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 5ec6f5be9..dcd82a04e 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -437,6 +437,7 @@ public class CaptureModule implements CameraModule, PhotoController, private SettingsManager mSettingsManager; private long SECONDARY_SERVER_MEM; private boolean mLongshotActive = false; + private long mLastLongshotTimestamp = 0; private CameraCharacteristics mMainCameraCharacteristics; private int mDisplayRotation; private int mDisplayOrientation; @@ -2294,6 +2295,9 @@ public class CaptureModule implements CameraModule, PhotoController, long timestamp, long frameNumber) { mLongshoting = true; mNumFramesArrived.incrementAndGet(); + if(mNumFramesArrived.get() == mShotNum) { + mLastLongshotTimestamp = timestamp; + } Log.d(TAG, "captureStillPictureForLongshot onCaptureStarted: " + mNumFramesArrived.get()); if (mNumFramesArrived.get() >= mShotNum) { mLongshotActive = false; @@ -2649,7 +2653,8 @@ public class CaptureModule implements CameraModule, PhotoController, } Log.d(TAG, "image available for cam: " + mCamId); Image image = reader.acquireNextImage(); - if (mLongshoting && (!mLongshotActive)) { + if (mLongshoting && (!mLongshotActive) && + image.getTimestamp() > mLastLongshotTimestamp) { image.close(); return; } |