Improve Ffmpeg layer

[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 2637d60..a9ef972 100644 (file)
--- a/app/src/main/java/ai/suanzi/rtmpclient/MyService.java
+++ b/app/src/main/java/ai/suanzi/rtmpclient/MyService.java
@@ -32,14 +32,12 @@ public class MyService extends Service  implements Camera.PreviewCallback {
     private static Logger gLogger = Logger.getLogger("MyService");
     private static String TAG = "MyService";
 
-    private Ffmpeg ffmpeg = Ffmpeg.getInstance();
+    //private Ffmpeg ffmpeg = Ffmpeg.getInstance();
+    private FfmpegHelper helper;
     private  Boolean isRunning = false;
-    //private FfmpegRunnable  runnable;
     private Camera mCamera = null;
     IBinder mBinder = new LocalBinder();
     private String rtmpUrl;
-    //private WindowManager mWindowManager;
-    //private SurfaceView mOutComeVideoView;
     private long frameCount = 0;
 
 
@@ -164,7 +162,7 @@ public class MyService extends Service  implements Camera.PreviewCallback {
             gLogger.error("onPreviewFrame");
         }
         frameCount++;
-        ffmpeg.process(data);
+        //ffmpeg.process(data);
     }
 
     public void startPreview (SurfaceHolder holder){
@@ -188,7 +186,8 @@ public class MyService extends Service  implements Camera.PreviewCallback {
         int width = param.getPictureSize().width;
         int height = param.getPictureSize().height;
         gLogger.error("setRtmpUrl - size: " +  width + "x" + height + ". url: " + url);
-        int ret = ffmpeg.initnew(width, height, url);
+        //int ret = ffmpeg.initnew(width, height, url);
+        int ret = FfmpegHelper.initialEncoder(width, height, url);
         return ret == 0 ? true : false;
     }
 
@@ -215,27 +214,5 @@ public class MyService extends Service  implements Camera.PreviewCallback {
         gLogger.error("Preview Format: " + paras.getPreviewFormat() + ". Size: " + paras.getPreviewSize().width + "x" + paras.getPreviewSize().height);
         gLogger.error("Picture Format: " + paras.getPictureFormat() + ". Size: " + paras.getPictureSize().width + "x" + paras.getPictureSize().height);
         camera.setPreviewCallback(this);
-        //camera.startPreview();
     }
 }
-
-//    private class FfmpegRunnable implements Runnable {
-//        private String url;
-//        private Camera.PreviewCallback cb;
-//        public FfmpegRunnable(String _url, Camera.PreviewCallback _cb){
-//            this.url = _url;
-//            this.cb = _cb;
-//        }
-//        @Override
-//        public void run(){
-//            gLogger.error("Run Ffmpeg url: " + url);
-//            isRunning = true;
-//            gLogger.error("Open camera");
-//            mCamera = getCameraInstance();
-//            if(mCamera == null) {
-//                gLogger.error("Open camera, camera is null");
-//            }
-//            configCamera(mCamera);
-//            mCamera.setPreviewCallback(this.cb);
-//        }
-//    }