diff options
author | jinwu <jinwu@codeaurora.org> | 2018-10-26 17:49:28 +0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-11-07 15:45:26 -0800 |
commit | e7c3825c2ef5fca2ed70d753ea32f2c042a3fa50 (patch) | |
tree | fd311882561600f1f3cca81d7010dfdb2c5b0d32 /src/com/android/camera/PhotoModule.java | |
parent | 644a5781c1c3af5824875f45b9a6f23bc3ca775c (diff) | |
download | android_packages_apps_Snap-e7c3825c2ef5fca2ed70d753ea32f2c042a3fa50.tar.gz android_packages_apps_Snap-e7c3825c2ef5fca2ed70d753ea32f2c042a3fa50.tar.bz2 android_packages_apps_Snap-e7c3825c2ef5fca2ed70d753ea32f2c042a3fa50.zip |
Remove CameraDataCallback.
Since it's for camera1 which is not supported in camx, remove it.
Change-Id: If20ca6b63044722efbbfa3893baa7d1b039138e5
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
-rwxr-xr-x | src/com/android/camera/PhotoModule.java | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 672b973d0..e84c32872 100755 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -324,8 +324,6 @@ public class PhotoModule : null; private final CameraErrorCallback mErrorCallback = new CameraErrorCallback(); - private final StatsCallback mStatsCallback = new StatsCallback(); - private final MetaDataCallback mMetaDataCallback = new MetaDataCallback(); private long mFocusStartTime; private long mShutterCallbackTime; private long mPostViewPictureCallbackTime; @@ -1144,69 +1142,6 @@ public class PhotoModule } } } - private final class StatsCallback - implements android.hardware.Camera.CameraDataCallback { - @Override - public void onCameraData(int [] data, android.hardware.Camera camera) { - //if(!mPreviewing || !mHiston || !mFirstTimeInitialized){ - if(!mHiston || !mFirstTimeInitialized){ - return; - } - /*The first element in the array stores max hist value . Stats data begin from second value*/ - synchronized(statsdata) { - System.arraycopy(data,0,statsdata,0,STATS_DATA); - } - mActivity.runOnUiThread(new Runnable() { - public void run() { - if(mGraphView != null) - mGraphView.PreviewChanged(); - } - }); - } - } - - private final class MetaDataCallback - implements android.hardware.Camera.CameraMetaDataCallback{ - @Override - public void onCameraMetaData (byte[] data, android.hardware.Camera camera) { - int metadata[] = new int[3]; - if (data.length >= 12) { - for (int i =0;i<3;i++) { - metadata[i] = byteToInt( (byte []) data, i*4); - } - /* Checking if the meta data is for auto HDR */ - if (metadata[0] == 3) { - if (metadata[2] == 1) { - mAutoHdrEnable = true; - mActivity.runOnUiThread(new Runnable() { - public void run() { - if (mDrawAutoHDR != null) - mDrawAutoHDR.AutoHDR(); - } - }); - } - else { - mAutoHdrEnable = false; - mActivity.runOnUiThread(new Runnable() { - public void run() { - if (mDrawAutoHDR != null) - mDrawAutoHDR.AutoHDR(); - } - }); - } - } - } - } - - private int byteToInt (byte[] b, int offset) { - int value = 0; - for (int i = 0; i < 4; i++) { - int shift = (4 - 1 - i) * 8; - value += (b[(3-i) + offset] & 0x000000FF) << shift; - } - return value; - } - } private final class PostViewPictureCallback implements CameraPictureCallback { @@ -1706,7 +1641,6 @@ public class PhotoModule if(mHiston) { if (mSnapshotMode != CameraInfoWrapper.CAMERA_SUPPORT_MODE_ZSL) { mHiston = false; - mCameraDevice.setHistogramMode(null); } mActivity.runOnUiThread(new Runnable() { public void run() { @@ -3579,7 +3513,6 @@ public class PhotoModule } }); mParameters.setSceneMode("asd"); - mCameraDevice.setMetadataCb(mMetaDataCallback); } else { mAutoHdrEnable = false; @@ -3681,7 +3614,6 @@ public class PhotoModule } } }); - mCameraDevice.setHistogramMode(mStatsCallback); mHiston = true; } else { mHiston = false; @@ -3691,7 +3623,6 @@ public class PhotoModule mGraphView.setVisibility(View.INVISIBLE); } }); - mCameraDevice.setHistogramMode(null); } } |