提交 9db2f179 编写于 作者: B Bin Li

fix android demo gpu

上级 5247ac40
......@@ -3,6 +3,7 @@
package="com.xiaomi.mace.demo">
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.CAMERA" />
......
......@@ -104,8 +104,6 @@ public class CameraApiLessM extends CameraEngage implements Camera.AutoFocusCall
private void setOutputConfig(int width, int height) {
Camera.Parameters parameters = mCamera.getParameters();
parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_AUTO);
parameters.setPreviewFormat(ImageFormat.JPEG);
parameters.setPictureFormat(ImageFormat.JPEG);
Camera.Size size = getOptimalSize(parameters.getSupportedPreviewSizes(), width, height);
mPreviewWidth = size.width;
mPreviewHeight = size.height;
......
......@@ -212,9 +212,9 @@ public abstract class CameraEngage implements SurfaceTextureListener {
}
boolean checkCameraPermission() {
if (ContextCompat.checkSelfPermission(mTextureView.getContext(), Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED ||
if (ContextCompat.checkSelfPermission(mTextureView.getContext(), Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED || ContextCompat.checkSelfPermission(mTextureView.getContext(), Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED ||
ContextCompat.checkSelfPermission(mTextureView.getContext(), Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
((Activity) mTextureView.getContext()).requestPermissions(new String[]{Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE}, CAMERA_PERMISSION_REQ);
((Activity) mTextureView.getContext()).requestPermissions(new String[]{Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE}, CAMERA_PERMISSION_REQ);
return false;
}
return true;
......
......@@ -38,7 +38,11 @@ public class InitData {
gpuPerfHint = 3;
gpuPriorityHint = 3;
device = DEVICES[0];
kernelPath = Environment.getDownloadCacheDirectory().getAbsolutePath() + File.separator + "mace";
kernelPath = Environment.getExternalStorageDirectory().getAbsolutePath() + File.separator + "mace";
File file = new File(kernelPath);
if (!file.exists()) {
file.mkdir();
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册