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 0d0136d..a9ef972 100644 (file)
--- a/app/src/main/java/ai/suanzi/rtmpclient/MyService.java
+++ b/app/src/main/java/ai/suanzi/rtmpclient/MyService.java
@@ -32,7 +32,8 @@ 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 Camera mCamera = null;
     IBinder mBinder = new LocalBinder();
@@ -161,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){
@@ -185,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;
     }