private static Logger gLogger = Logger.getLogger("MyService");
private static String TAG = "MyService";
- private Ffmpeg ffmpeg = Ffmpeg.getInstance();
+ //private Ffmpeg ffmpeg = Ffmpeg.getInstance();
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;
mCamera.stopPreview();
mCamera.release();
}
+ FfmpegHelper.close();
}
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
gLogger.error("onStartCommand");
- //nrunnable = new FfmpegRunnable("xxx", this);
- //new Thread(runnable).start();
return START_STICKY;
}
gLogger.error("onPreviewFrame");
}
frameCount++;
- ffmpeg.process(data);
+ if(FfmpegHelper.processFrame(data) != 0){
+ gLogger.error("FfmpegHelper.processFrame error. close");
+ FfmpegHelper.close();
+ }
}
public void startPreview (SurfaceHolder holder){
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 = FfmpegHelper.initEncoder(width, height, url);
return ret == 0 ? true : false;
}
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);
-// }
-// }