Fix #377 and update dependencies

pull/392/head
Mattia Iavarone 7 years ago
parent 7411614433
commit 01af0189aa
  1. 2
      build.gradle
  2. 19
      cameraview/src/main/gles/com/otaliastudios/cameraview/EglCore.java
  3. 8
      cameraview/src/main/java/com/otaliastudios/cameraview/Camera1.java
  4. 4
      demo/build.gradle

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.2.1' classpath 'com.android.tools.build:gradle:3.3.1'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
} }

@ -137,7 +137,7 @@ final class EglCore {
int[] values = new int[1]; int[] values = new int[1];
EGL14.eglQueryContext(mEGLDisplay, mEGLContext, EGL14.EGL_CONTEXT_CLIENT_VERSION, EGL14.eglQueryContext(mEGLDisplay, mEGLContext, EGL14.EGL_CONTEXT_CLIENT_VERSION,
values, 0); values, 0);
Log.d(TAG, "EGLContext created, client version " + values[0]); // Log.d(TAG, "EGLContext created, client version " + values[0]);
} }
/** /**
@ -273,7 +273,7 @@ final class EglCore {
public void makeCurrent(EGLSurface eglSurface) { public void makeCurrent(EGLSurface eglSurface) {
if (mEGLDisplay == EGL14.EGL_NO_DISPLAY) { if (mEGLDisplay == EGL14.EGL_NO_DISPLAY) {
// called makeCurrent() before create? // called makeCurrent() before create?
Log.d(TAG, "NOTE: makeCurrent w/o display"); // Log.d(TAG, "NOTE: makeCurrent w/o display");
} }
if (!EGL14.eglMakeCurrent(mEGLDisplay, eglSurface, eglSurface, mEGLContext)) { if (!EGL14.eglMakeCurrent(mEGLDisplay, eglSurface, eglSurface, mEGLContext)) {
throw new RuntimeException("eglMakeCurrent failed"); throw new RuntimeException("eglMakeCurrent failed");
@ -351,21 +351,6 @@ final class EglCore {
return mGlVersion; return mGlVersion;
} }
/**
* Writes the current display, context, and surface to the log.
*/
public static void logCurrent(String msg) {
EGLDisplay display;
EGLContext context;
EGLSurface surface;
display = EGL14.eglGetCurrentDisplay();
context = EGL14.eglGetCurrentContext();
surface = EGL14.eglGetCurrentSurface(EGL14.EGL_DRAW);
Log.i(TAG, "Current EGL (" + msg + "): display=" + display + ", context=" + context +
", surface=" + surface);
}
/** /**
* Checks for EGL errors. Throws an exception if an error has been raised. * Checks for EGL errors. Throws an exception if an error has been raised.
*/ */

@ -440,8 +440,12 @@ class Camera1 extends CameraController implements Camera.PreviewCallback, Camera
Camera.CameraInfo info = new Camera.CameraInfo(); Camera.CameraInfo info = new Camera.CameraInfo();
Camera.getCameraInfo(mCameraId, info); Camera.getCameraInfo(mCameraId, info);
if (info.canDisableShutterSound) { if (info.canDisableShutterSound) {
mCamera.enableShutterSound(mPlaySounds); try {
return true; // this method is documented to throw on some occasions. #377
return mCamera.enableShutterSound(mPlaySounds);
} catch (RuntimeException exception) {
return false;
}
} }
} }
if (mPlaySounds) { if (mPlaySounds) {

@ -23,6 +23,6 @@ android {
dependencies { dependencies {
implementation project(':cameraview') implementation project(':cameraview')
implementation 'androidx.appcompat:appcompat:1.1.0-alpha01' implementation 'androidx.appcompat:appcompat:1.1.0-alpha02'
implementation 'com.google.android.material:material:1.1.0-alpha02' implementation 'com.google.android.material:material:1.1.0-alpha03'
} }

Loading…
Cancel
Save