log4j, add thread name

[rtmpclient.git] / app / src / main / java / ai / suanzi / rtmpclient / MyService.java

diff --git a/app/src/main/java/ai/suanzi/rtmpclient/MyService.java b/app/src/main/java/ai/suanzi/rtmpclient/MyService.java
index 2d49e9c..3a21e5e 100644 (file)
--- a/app/src/main/java/ai/suanzi/rtmpclient/MyService.java
+++ b/app/src/main/java/ai/suanzi/rtmpclient/MyService.java
@@ -25,8 +25,7 @@ public class MyService extends Service  implements Camera.PreviewCallback, Camer
     private long frameCount = 0;
 
     // Preferred picture Size of the camera;
-    private int width = 0;
-    private int height = 0;
+    private Camera.Size mPreferredSize;
 
 
     private MyServiceEventListener mListener;
@@ -42,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();
             }
@@ -71,7 +70,8 @@ public class MyService extends Service  implements Camera.PreviewCallback, Camer
             }
             if(frontId != -1) camerId = frontId;
             else if(backId != -1) camerId = backId;
-            mCamera = Camera.open(camerId);
+            gLogger.debug("openCameraOriginal - camera id " + camerId);
+            mCamera = Camera.open(1);
         } catch (Exception e) {
             gLogger.error("openCameraOriginal - camera is not available. error: " + e.getMessage());
             if(mListener != null) mListener.onCameraError("openCamera - error: " + e.getMessage());
@@ -90,6 +90,7 @@ public class MyService extends Service  implements Camera.PreviewCallback, Camer
 
         synchronized void notifyCameraOpened() {
             notify();
+            gLogger.debug("notifyCameraOpened");
         }
 
         void openCamera() {
@@ -148,8 +149,14 @@ public class MyService extends Service  implements Camera.PreviewCallback, Camer
         gLogger.error( "onDestroy --------->");
         Toast.makeText(this, "MyService Stopped", Toast.LENGTH_LONG).show();
         if(mCamera != null){
-            mCamera.stopPreview();
-            mCamera.release();
+            try {
+                mCamera.stopPreview();
+                mCamera.release();
+                mCamera = null;
+            } catch (Exception e){
+                gLogger.error("onDestroy - error " + e.getMessage());
+                e.printStackTrace();
+            }
         }
     }
 
@@ -186,6 +193,10 @@ public class MyService extends Service  implements Camera.PreviewCallback, Camer
 
     public void startPreview (SurfaceHolder holder){
         gLogger.debug("startPreview");
+        if(mCamera == null){
+            gLogger.error("startPreview - error: camera is null");
+            return;
+        }
         try {
             mCamera.setPreviewDisplay(holder);
             mCamera.startPreview();
@@ -197,18 +208,23 @@ public class MyService extends Service  implements Camera.PreviewCallback, Camer
     }
 
     public void reopenCamera() {
+        gLogger.debug("reopenCamera");
         if(mCamera != null){
             mCamera.stopPreview();
             mCamera.release();
+            mCamera = null;
         }
         openCameraOriginal();
     }
 
     public boolean setRtmpUrl (String url){
         //this.rtmpUrl = url;
-        if(mCamera == null) return false;
-        gLogger.error("setRtmpUrl - size: " +  width + "x" + height + ". url: " + url);
-        int ret = FfmpegHelper.initEncoder(width, height, url);
+        if(mCamera == null || mPreferredSize == null){
+            gLogger.error("setRtmpUrl, error mCamera or PreferredSize is null");
+            return false;
+        }
+        gLogger.error("setRtmpUrl - size: " +  mPreferredSize.width + "x" + mPreferredSize.height + ". url: " + url);
+        int ret = FfmpegHelper.initEncoder(mPreferredSize.width, mPreferredSize.height, url);
         if(ret != 0){
             gLogger.error("setRtmpUrl, initEncoder error");
         }
@@ -235,8 +251,7 @@ public class MyService extends Service  implements Camera.PreviewCallback, Camer
         for(int[] i : paras.getSupportedPreviewFpsRange()){
             gLogger.error("[" + i[0] + "," + i[1] + "]");
         }
-        width = preferredSize.width;
-        height = preferredSize.height;
+        mPreferredSize = preferredSize;
         paras.setPictureSize(preferredSize.width, preferredSize.height); // use 640x480 preferred
         camera.setParameters(paras);
         camera.setDisplayOrientation(0);
@@ -245,6 +260,10 @@ public class MyService extends Service  implements Camera.PreviewCallback, Camer
         camera.setPreviewCallback(this);
     }
 
+    public Camera.Size getBestPictureSize(){
+        return mPreferredSize;
+    }
+
     // Camaer.onError callback
     @Override
     public void onError(int error, Camera camera){