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=6aa3850f260161c015474faf68165158165afea8;hp=da3aed6c0cd67656b2ddc3996562ce2b7a325ca8;hpb=3e977e8fa8df4d0f336fd4dfce40168fcdfc0b07;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 da3aed6..4d61c9d 100644
--- a/app/src/main/java/ai/suanzi/rtmpclient/Ffmpeg.java
+++ b/app/src/main/java/ai/suanzi/rtmpclient/Ffmpeg.java
@@ -1,11 +1,18 @@
 package ai.suanzi.rtmpclient;
 
+import android.util.Log;
+
+import org.apache.log4j.Logger;
+
 public class Ffmpeg {
 
     static {
-        System.loadLibrary("x264");
-        System.loadLibrary("postproc");
+        String arch = System.getProperty("os.arch");
+        if (arch.equals("i686")){
+            System.loadLibrary("x264");
+        }
         System.loadLibrary("avutil");
+        System.loadLibrary("postproc");
         System.loadLibrary("swresample");
         System.loadLibrary("swscale");
         System.loadLibrary("avcodec");
@@ -15,10 +22,36 @@ public class Ffmpeg {
         System.loadLibrary("ffmpeg-jni");
     }
 
+    private static Ffmpeg instance = new Ffmpeg();
+
+    public static Ffmpeg getInstance(){
+        return instance;
+    }
+
+    private Ffmpeg(){
+        Log.e("Ffmpeg", "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 int init(int width, int height);
+    public native void init();
+    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, String url);
+    public native int preview(Object surface);
+    public native String getPerfectDevice();
+    public native int test(int fd);
+    public native void setRtmpUrl(String url);
 }