From a8537c29299537293d3f8e71c02ccfab29e8542c Mon Sep 17 00:00:00 2001 From: jiangdongguo <765067602@qq.com> Date: Fri, 8 Jun 2018 10:19:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/.gitignore | 10 ++++++++++ .../usb/common/AbstractUVCCameraHandler.java | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/.gitignore b/app/.gitignore index 796b96d..89d4648 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1 +1,11 @@ +*.iml +.gradle +/local.properties +/.idea/workspace.xml +/.idea/libraries +.idea +.DS_Store /build +/captures +.externalNativeBuild +.tags* diff --git a/libusbcamera/src/main/java/com/serenegiant/usb/common/AbstractUVCCameraHandler.java b/libusbcamera/src/main/java/com/serenegiant/usb/common/AbstractUVCCameraHandler.java index a3ecb6a..ee62f38 100644 --- a/libusbcamera/src/main/java/com/serenegiant/usb/common/AbstractUVCCameraHandler.java +++ b/libusbcamera/src/main/java/com/serenegiant/usb/common/AbstractUVCCameraHandler.java @@ -676,7 +676,7 @@ public abstract class AbstractUVCCameraHandler extends Handler { // 启动视频编码线程 startVideoRecord(); // 启动音频编码线程 - if (!params.isVoiceClose()) { + if (params != null && !params.isVoiceClose()) { startAudioRecord(); } callOnStartRecording();