X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fai%2Fsuanzi%2Frtmpclient%2FMainActivity.java;h=5c2e2f9e3d6aa43d684a4371ccbd66b78ec72c7f;hb=831cc09829bc6e18d8d0d8bb78063e89ea565ce9;hp=4080ee2525361d270e46cd3a2e48c7406cb44417;hpb=b7202442677d0cf41e6e59870cd6c34e5619b8b9;p=rtmpclient.git diff --git a/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java b/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java index 4080ee2..5c2e2f9 100644 --- a/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java +++ b/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java @@ -9,8 +9,10 @@ import android.graphics.SurfaceTexture; import android.hardware.usb.UsbDevice; import android.hardware.usb.UsbManager; import android.os.Environment; +import android.support.design.widget.TextInputEditText; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; +import android.text.TextUtils; import android.util.Log; import android.view.SurfaceHolder; import android.hardware.Camera; @@ -38,14 +40,20 @@ import android.hardware.usb.UsbDeviceConnection; import de.mindpipe.android.logging.log4j.LogConfigurator; import org.apache.log4j.Level; import org.apache.log4j.Logger; +import android.net.wifi.WifiManager; +import android.net.wifi.WifiInfo; + +//"rtmp://gpussh.suanzi.ai:1935/myapp/suanzi_ac83f34ead90_cameraid"; public class MainActivity extends AppCompatActivity implements SurfaceHolder.Callback, Camera.PreviewCallback{ private static final String TAG = "PENG"; - private Ffmpeg ffmpeg;// = Ffmpeg.getInstance(); - private Camera mCamera ;//= getCameraInstance(); + private Ffmpeg ffmpeg; + private Camera mCamera ; private StreamTask mStreamTask; private SurfaceHolder mHolder; + private SurfaceView mSufaceView; + private UVCCamera uvcCamera; ExecutorService mExecutor = Executors.newSingleThreadExecutor(); //Intent it = new Intent(getApplicationContext(), MyService.class); Intent intent = new Intent(); @@ -54,10 +62,16 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal private UsbDevice usbCamera; private Logger gLogger; + + private Button mBtnStart; + private TextInputEditText mTextServer; + private TextInputEditText mTextUser; + private TextInputEditText mTextCamera; + private String mMacAddr = ""; + private void configLog(){ try { final LogConfigurator logConfigurator = new LogConfigurator(); - //logConfigurator.setFileName(Environment.getExternalStorageDirectory() + File.separator + "myc" + File.separator + "log" + File.separator + "test.log"); String fname = getExternalFilesDir(null) + File.separator + "log.txt"; logConfigurator.setFileName(fname); Log.e(TAG, "Log file is located at: " + fname); @@ -71,77 +85,52 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal } } - - - - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); + private void init(){ configLog(); - //Log.e(TAG, "Ffmpeg Version: " + ffmpeg.getVersion()); - gLogger.debug("#######################################"); - ffmpeg = Ffmpeg.getInstance(); + UserInfo.setConfigPath(getExternalFilesDir(null) + File.separator + "config"); + this.mMacAddr = getMacAddr(); - gLogger.debug(" this ia argument " + 3 + "fjeiofjei"); - - final Button btn = findViewById(R.id.button); - btn.setText("Start"); - /*btn.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Log.e(TAG, "Button " + btn.getText() + " onClick"); - if (mCamera == null) return; - if(btn.getText().equals("Start")){ - mCamera.startPreview(); - Camera.Parameters params = mCamera.getParameters(); - //params.setPreviewFpsRange(30000, 30000); - //params.setPictureSize(320, 240); - //params.setPictureFormat(ImageFormat.NV21); - //mCamera.setParameters(params); - - - - - ffmpeg.init(params.getPictureSize().width, params.getPictureSize().height); - } else { - mCamera.setPreviewCallback(null); - Toast.makeText(MainActivity.this, "encode done", Toast.LENGTH_SHORT).show(); - ffmpeg.flush(); - ffmpeg.close(); - } - btn.setText(btn.getText().equals("Start") ? "Stop" : "Start"); - } - });*/ + ffmpeg = Ffmpeg.getInstance(); + uvcCamera = new UVCCamera(); - /*this.mCamera = getCameraInstance(); - if(checkCameraHardware(this)) Log.e(TAG, "has cameras: " + Camera.getNumberOfCameras()); -*/ - final SurfaceView surfaceView = findViewById(R.id.surfaceView); - mHolder = surfaceView.getHolder(); - mHolder.addCallback(this); + mBtnStart = findViewById(R.id.button); + mTextServer = findViewById(R.id.textServer); + mTextUser = findViewById(R.id.textUser); + mTextCamera = findViewById(R.id.textCamera); + loadConfig(); + // init service intent.setPackage(this.getPackageName()); intent.setAction("ai.suanzi.rtmpclient.service"); + // init surface view + mSufaceView = findViewById(R.id.surfaceView); + mHolder = mSufaceView.getHolder(); + mHolder.addCallback(this); + + // camera + mCamera = getCameraInstance(); + configCamera(mCamera); + } - final Button btn2 = findViewById(R.id.button); + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + init(); - btn2.setOnClickListener(new View.OnClickListener(){ + mBtnStart.setOnClickListener(new View.OnClickListener(){ @Override public void onClick(View view){ - Log.e(TAG, "onclick2"); - //ffmpeg.play(mHolder.getSurface(),"/storage/sdcard0/output.flv"); - //ffmpeg.push(mHolder.getSurface()); - //ffmpeg.preview(mHolder.getSurface()); - // intent.putExtra("cmd",0);//0,开启前台服务,1,关闭前台服务 - // startService(intent); - ffmpeg.getVersion(); + String url = mTextServer.getText().toString() + "/" + mTextUser.getText().toString() + "_" + mMacAddr + "_" + mTextCamera.getText().toString(); + gLogger.error("----------> onClick, Url is: " + url); + intent.putExtra("url", url); + startService(intent); + saveConfig(); + //changePermission(); } - }); /*btn2.post(new Runnable(){ @@ -153,10 +142,9 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal }); switchToBackground();*/ -/* + /* usbManager = (UsbManager) getSystemService(Context.USB_SERVICE); - HashMap deviceList = usbManager.getDeviceList(); Log.e(TAG, "device list size : " + deviceList.size()); Iterator deviceIterator = deviceList.values().iterator(); @@ -176,23 +164,64 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal if (device.getVendorId() == 6257){ usbManager.requestPermission(device, mPermissionIntent); + Log.e(TAG,"XXXXXXXXXXXXXXXXXXXXXXXXXXX"); + Log.e(TAG, device.getVendorId() + "\n" + device.getProductId() + "\n" + device.getProductName() + "\n" + + device.getManufacturerName() + "\n" + device.getDeviceId() + "\n" + device.getSerialNumber() + "\n" + + device.getDeviceName()); + + final String name = device.getDeviceName(); + final String[] v = name.split("/"); + int busnum = 0; + int devnum = 0; + if (v != null) { + busnum = Integer.parseInt(v[v.length-2]); + devnum = Integer.parseInt(v[v.length-1]); + } + //mBusNum = busnum; + //mDevNum = devnum; + uData.vid = device.getVendorId(); + uData.pid = device.getProductId(); + uData.busNum = busnum; + uData.devNum = devnum; + + String result = null; + final String[] vv = name.split("/"); + if ((vv != null) && (vv.length > 2)) { + final StringBuilder sb = new StringBuilder(vv[0]); + for (int i = 1; i < vv.length - 2; i++) + sb.append("/").append(vv[i]); + result = sb.toString(); + } + uData.usbFsName = result; + + + uData.print(); usbCamera = device; } //Log.e(TAG, device.) //device.getInterface() - } - -*/ - - - + }*/ } + /*private UsbData uData = new UsbData(); + + private class UsbData { + public int vid; + public int pid; + public int fd; + public int busNum; + public int devNum; + public String usbFsName; + public void print(){ + Log.e(TAG, "vid=" + vid + ". pid=" + pid + ". fd=" + fd + ". busnum=" + busNum + ". devNum=" + devNum + ". usbFsName=" + usbFsName); + } + }*/ + //SurfaceTexture st = new SurfaceTexture(0); - private static final String ACTION_USB_PERMISSION = + /*private static final String ACTION_USB_PERMISSION = "com.android.example.USB_PERMISSION"; private final BroadcastReceiver mUsbReceiver = new BroadcastReceiver() { @@ -214,7 +243,11 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal Log.e("device","MyThread3");//bhw UsbDeviceConnection connection = usbManager.openDevice(usbCamera); int fd = connection.getFileDescriptor();//获取文件描述符 - ffmpeg.test(fd); + uData.fd = fd; + //ffmpeg.test(fd); + int ret = uvcCamera.open(uData.vid, uData.pid, uData.fd, uData.busNum, uData.devNum, uData.usbFsName); + Log.e(TAG, "uvcCamera open return code:" + ret); + Log.e("device","MyThread3 "+fd); } }).start(); @@ -234,7 +267,7 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal Log.e(TAG, "==== device in ====="); } } - }; + };*/ @@ -242,39 +275,40 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal @Override protected void onPause(){ super.onPause(); - Log.e(TAG, "OnPause"); + gLogger.debug("OnPause"); } @Override protected void onResume() { super.onResume(); - Log.e(TAG, "OnResume"); + gLogger.debug("OnResume"); } @Override protected void onStop() { super.onStop(); - Log.e(TAG,"onStop"); + gLogger.debug("onStop"); } @Override protected void onStart(){ super.onStart(); - Log.e(TAG,"onStart"); + gLogger.debug("onStart"); } @Override protected void onDestroy(){ super.onDestroy(); - Log.e(TAG,"onDestroy"); + gLogger.debug("onDestroy"); } @Override protected void onRestart(){ super.onStart(); - Log.e(TAG,"onRestart"); + gLogger.debug("onRestart"); } + // class StreamTask AsyncTask private class StreamTask extends AsyncTask{ private byte[] data; @@ -294,57 +328,25 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal } } + + + // SurfaceHolder.Callback implementation @Override public void surfaceCreated(final SurfaceHolder holder){ - Log.e(TAG,"SurfacedCreated"); - /*try { - mCamera.setPreviewDisplay(holder); - mCamera.startPreview(); - } catch (IOException e) { - Log.d(TAG, "Error setting camera preview: " + e.getMessage()); - }*/ + gLogger.error("SurfacedCreated"); } @Override public void surfaceChanged(SurfaceHolder holder, int format, int widht, int height){ - Log.e(TAG, "surfaceChanged"); - //if(mCamera==null) return; - //Camera.Parameters parameters=mCamera.getParameters(); - //parameters.setPreviewSize(640,480); - //parameters.setPictureSize(640,480); - //mCamera.setParameters(parameters); - - //try{ - //Thread.sleep(10000); - /*Log.e(TAG, "xxxxxxxxxxxxxx"); - mExecutor.execute(new Runnable() { - @Override - public void run() { - mCamera.startPreview(); - final Button btn = findViewById(R.id.button); - Camera.Parameters params = mCamera.getParameters(); - ffmpeg.init(params.getPictureSize().width, params.getPictureSize().height); - } - });*/ - - //btn.performClick(); - //} catch (InterruptedException e){ - // e.printStackTrace(); - //} - - - - //Camera.Parameters params = mCamera.getParameters(); - //ffmpeg.init(params.getPictureSize().width, params.getPictureSize().height); - /*Thread t = new Thread(new Runnable() { - @Override - public void run() { - ffmpeg.play(mHolder.getSurface(),"/storage/emulated/0/Movies/output.flv"); - - } - });*/ - + gLogger.error("surfaceChanged"); + try { + mCamera.setPreviewDisplay(holder); + mCamera.startPreview(); + } catch (Exception e){ + gLogger.error("Error starting camera previewe: " + e.getMessage()); + Toast.makeText(this, "Camera Error: " + e.getMessage(), Toast.LENGTH_LONG).show(); + } } @Override @@ -352,13 +354,10 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal Log.e(TAG, "surfaceDestroyed"); } - private long encodeCount = 0; - private long count = 0; - private long previewTime; - // Camera.PreviewCallback @Override public void onPreviewFrame(final byte[] data, Camera camera){ - /*if (null != mStreamTask){ + gLogger.error("onPreviewFrame"); + if (null != mStreamTask){ switch (mStreamTask.getStatus()){ case RUNNING: Log.e(TAG, "onPreviewFrame Running"); @@ -370,21 +369,21 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal } } mStreamTask = new StreamTask(data); - mStreamTask.execute((Void)null);*/ - - - /*long endTime = System.currentTimeMillis(); - mExecutor.execute(new Runnable() { - @Override - public void run() { - long encodeTime = System.currentTimeMillis(); - ffmpeg.process(data); - Log.e(TAG, "编码第:" + (encodeCount++) + "帧，耗时:" + (System.currentTimeMillis() - encodeTime)); - } - }); - Log.e(TAG, "采集第:" + (++count) + "帧，距上一帧间隔时间:" - + (endTime - previewTime) + " " + Thread.currentThread().getName()); - previewTime = endTime;*/ + mStreamTask.execute((Void)null); + + +// ong endTime = System.currentTimeMillis(); +// mExecutor.execute(new Runnable() { +// @Override +// public void run() { +// //long encodeTime = System.currentTimeMillis(); +// ffmpeg.process(data); + //Log.e(TAG, "编码第:" + (encodeCount++) + "帧，耗时:" + (System.currentTimeMillis() - encodeTime)); +// } +// }); + //Log.e(TAG, "采集第:" + (++count) + "帧，距上一帧间隔时间:" +// + (endTime - previewTime) + " " + Thread.currentThread().getName()); +// previewTime = endTime;*/ } @@ -397,52 +396,36 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal Camera c = null; try { Log.e(TAG, "Open Camera"); - c = Camera.open(0); - Camera.Parameters params = c.getParameters(); - Log.e(TAG, "Camera parameters: " + params.getPreviewSize().width + "x" + params.getPreviewSize().height); - Log.e(TAG, "Preview format (17 is NV21): " + params.getPreviewFormat() + ". Picture format(256 is JPEG): " + params.getPictureFormat()); - List fps = params.getSupportedPreviewFpsRange(); - for(int[] i : fps){ - Log.e(TAG, "### fps range : [" + i[0] + "," + i[1] + "]\n"); - } - - - - Camera.Parameters parameters = c.getParameters(); - - List sizes = parameters.getSupportedPictureSizes(); - for (Camera.Size cc : sizes){ - Log.e(TAG, "=== width: " + cc.width + ". height:" + cc.height); - } - Camera.Size cs = sizes.get(3); - //params.setPreviewSize(cs.width, cs.height); - params.setPictureSize(cs.width, cs.height); - //params.setPictureFormat(ImageFormat.NV21); - c.setParameters(params); - } - catch (Exception e){ + c = Camera.open(1); + } catch (Exception e){ e.printStackTrace(); } return c; } -// private void changeCameraPermission(){ -// Log.e(TAG, "change /dev/video0 permission"); -// try{ -// /*Process sh = Runtime.getRuntime().exec("su", null,null); -// OutputStream os = sh.getOutputStream(); -// os.write(("chmod 666 /dev/video0").getBytes("ASCII")); -// os.flush(); -// os.close(); -// sh.waitFor();*/ -// -// Process sh = Runtime.getRuntime().exec(new String[]{"su", "-c", "system/bin/sh"}); -// sh = Runtime.getRuntime().exec(new String[]{"chmod", "666", "/dev/video0"}); -// sh.waitFor(); -// } catch (Exception e){ -// e.printStackTrace(); -// } -// } + private void configCamera(Camera camera){ + Camera.Parameters paras = camera.getParameters(); + gLogger.error("Supported Picture Sizes:"); + for (Camera.Size cc : paras.getSupportedPictureSizes()){ + gLogger.error(cc.width + "x" + cc.height); + } + gLogger.error("Supported Preview fps range:"); + for(int[] i : paras.getSupportedPreviewFpsRange()){ + gLogger.error("[" + i[0] + "," + i[1] + "]"); + } + gLogger.error("Set parameters"); + camera.setParameters(paras); + camera.setDisplayOrientation(0); + 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); + + try { + camera.setPreviewDisplay(mHolder); + } catch (IOException e){ + e.printStackTrace(); + } + camera.setPreviewCallback(this); + } private void switchToBackground(){ Intent i = new Intent(); @@ -451,4 +434,50 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal this.startActivity(i); } + private String getMacAddr() { + WifiManager manager = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE); + WifiInfo info = manager.getConnectionInfo(); + return info.getMacAddress().replace(":", ""); //02:00:00:00:00:00 - 020000000000 + } + + private void loadConfig() { + UserInfo info = UserInfo.getConfig(); + mTextServer.setText(info.server.equals("") ? "rtmp://gpussh.suanzi.ai:1935/myapp" : info.server); + mTextUser.setText(info.user.equals("") ? "suanzi" : info.user ); + mTextCamera.setText(info.cameraId.equals("") ? "001" : info.cameraId); + mMacAddr = info.macAddr.equals("") ? this.mMacAddr : info.macAddr; + gLogger.debug("loadConfig " + info.toString()); + } + + private void saveConfig() { + UserInfo info = UserInfo.getConfig(); + info.update(mTextServer.getText().toString(), mTextUser.getText().toString(), mMacAddr, mTextCamera.getText().toString()); + if(info.saveConfig()) { + Toast.makeText(getApplicationContext(), "Config saved", Toast.LENGTH_LONG).show(); + } else { + Toast.makeText(getApplicationContext(), "Error: config saved", Toast.LENGTH_LONG).show(); + } + gLogger.error("saveConfig: " + info.toString()); + } + + private void changePermission(){ + try { + Log.e(TAG, "change permission"); + //Process sh = Runtime.getRuntime().exec(new String[]{"su", "-c", "chmod 666 /dev/video0"}); + + Process sh = Runtime.getRuntime().exec("/system/xbin/su", null,null); + //Process sh = Runtime.getRuntime().exec("su", null,null); + + OutputStream os = sh.getOutputStream(); + os.write(("/system/bin/chmod 666 /dev/video0").getBytes("ASCII")); + //os.write(("/system/bin/echo 'wowo' >> /data/local/test").getBytes("ASCII")); + os.flush(); + os.close(); + sh.waitFor(); + + + }catch (Exception e){ + e.printStackTrace(); + } + } }