X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fai%2Fsuanzi%2Frtmpclient%2FMyService.java;h=0e99b888a82bb14c624c331c29585391af8aaa9f;hb=d1a43ff97228c10a4eaef604bd40eb8be3fcf8f6;hp=ff2c182377b05e792e7b607ce5e5d4d0da489977;hpb=c6604883de5525540d63ceacf4cf08fe3e82a286;p=rtmpclient.git

diff --git a/app/src/main/java/ai/suanzi/rtmpclient/MyService.java b/app/src/main/java/ai/suanzi/rtmpclient/MyService.java
index ff2c182..0e99b88 100644
--- a/app/src/main/java/ai/suanzi/rtmpclient/MyService.java
+++ b/app/src/main/java/ai/suanzi/rtmpclient/MyService.java
@@ -41,7 +41,7 @@ public class MyService extends Service  implements Camera.PreviewCallback, Camer
 
     public Camera getCameraInstance() {
         if (mCamera == null) {
-            CameraHandlerThread mThread = new CameraHandlerThread("camera thread");
+            CameraHandlerThread mThread = new CameraHandlerThread("ThreadCamera");
             synchronized (mThread) {
                 mThread.openCamera();
             }
@@ -151,6 +151,7 @@ public class MyService extends Service  implements Camera.PreviewCallback, Camer
         if(mCamera != null){
             try {
                 mCamera.stopPreview();
+                mCamera.setPreviewCallback(null);
                 mCamera.release();
                 mCamera = null;
             } catch (Exception e){
@@ -198,6 +199,7 @@ public class MyService extends Service  implements Camera.PreviewCallback, Camer
             return;
         }
         try {
+            mCamera.setPreviewCallback(this);
             mCamera.setPreviewDisplay(holder);
             mCamera.startPreview();
         } catch (Exception e){
@@ -218,9 +220,11 @@ public class MyService extends Service  implements Camera.PreviewCallback, Camer
     }
 
     public boolean setRtmpUrl (String url){
-        //this.rtmpUrl = url;
-        if(mCamera == null || mPreferredSize == null){
-            gLogger.error("setRtmpUrl, error mCamera or PreferredSize is null");
+        if(mCamera == null) {
+            gLogger.error("setRtmpUrl mCamera is null");
+            return false;
+        } else if (mPreferredSize == null) {
+            gLogger.error("setRtmpUrl mPreferredSize is null");
             return false;
         }
         gLogger.error("setRtmpUrl - size: " +  mPreferredSize.width + "x" + mPreferredSize.height + ". url: " + url);
@@ -228,7 +232,7 @@ public class MyService extends Service  implements Camera.PreviewCallback, Camer
         if(ret != 0){
             gLogger.error("setRtmpUrl, initEncoder error");
         }
-        return ret == 0 ? true : false;
+        return ret == 0;
     }
 
     private void configCamera(Camera camera){