X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fai%2Fsuanzi%2Frtmpclient%2FFfmpeg.java;h=4d61c9ddb7e4a661edace1b658d9b3f9a709c75b;hb=9773f3da1389f4e52fecfc79686fe2c94b08d6bc;hp=eb3203f553d8ba337dadd64be0cd29804ac0fb8b;hpb=b7202442677d0cf41e6e59870cd6c34e5619b8b9;p=rtmpclient.git

diff --git a/app/src/main/java/ai/suanzi/rtmpclient/Ffmpeg.java b/app/src/main/java/ai/suanzi/rtmpclient/Ffmpeg.java
index eb3203f..4d61c9d 100644
--- a/app/src/main/java/ai/suanzi/rtmpclient/Ffmpeg.java
+++ b/app/src/main/java/ai/suanzi/rtmpclient/Ffmpeg.java
@@ -2,6 +2,8 @@ package ai.suanzi.rtmpclient;
 
 import android.util.Log;
 
+import org.apache.log4j.Logger;
+
 public class Ffmpeg {
 
     static {
@@ -28,20 +30,28 @@ public class Ffmpeg {
 
     private Ffmpeg(){
         Log.e("Ffmpeg", "init");
-        init();
+        //init();
+        //inithaha(640, 480);
         //getPerfectDevice();
     }
 
+    private Logger gLogger = Logger.getLogger("FFmpeg");
+    public void  print(String str){
+        gLogger.error(str);
+    }
 
     public native String getVersion();
     public native void init();
-    public native int init(int width, int height);
+    public native int inithaha(int width, int height);
+    public native int initnew (int width, int height, String url);
+    //public native init inithahurl(ini)
     public native int flush();
     public native int close();
     public native int process(byte[] data);
     public native int play(Object surface, String fname);
-    public native int push(Object surface);
+    public native int push(Object surface, String url);
     public native int preview(Object surface);
     public native String getPerfectDevice();
     public native int test(int fd);
+    public native void setRtmpUrl(String url);
 }