generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a random crash because of NULL point

Browse Source 
Description:
This cl fixes NULL point crash problem which was not detected runtime.
Also, small reformats are added too.

BUG=
TEST=
Review URL: https://webrtc-codereview.appspot.com/579009

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2254 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
leozwang@webrtc.org 2012-05-16 16:57:28 +00:00
parent 4d7d23cde4
commit 00c07e66a7
1 changed files with 68 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

169
src/modules/video_capture/main/source/android/java/org/webrtc/videoengine/VideoCaptureAndroid.java
View File

@ -29,9 +29,13 @@ import android.view.SurfaceHolder.Callback;
public class VideoCaptureAndroid implements PreviewCallback, Callback { public class VideoCaptureAndroid implements PreviewCallback, Callback {
private final static String TAG = "WEBRTC-JC";
private Camera camera; private Camera camera;
private AndroidVideoCaptureDevice currentDevice = null; private AndroidVideoCaptureDevice currentDevice = null;
public ReentrantLock previewBufferLock = new ReentrantLock(); public ReentrantLock previewBufferLock = new ReentrantLock();
// This lock takes sync with StartCapture and SurfaceChanged
private ReentrantLock captureLock = new ReentrantLock();
private int PIXEL_FORMAT = ImageFormat.NV21; private int PIXEL_FORMAT = ImageFormat.NV21;
PixelFormat pixelFormat = new PixelFormat(); PixelFormat pixelFormat = new PixelFormat();
// True when the C++ layer has ordered the camera to be started. // True when the C++ layer has ordered the camera to be started.
@ -50,29 +54,21 @@ public class VideoCaptureAndroid implements PreviewCallback, Callback {
// True if this class owns the preview video buffers. // True if this class owns the preview video buffers.
private boolean ownsBuffers = false; private boolean ownsBuffers = false;
// Set this to 4 for DEBUG logging. 2 for DEBUG private int mCaptureWidth = -1;
private final static String TAG = "WEBRTC"; private int mCaptureHeight = -1;
private static int LOGLEVEL = 2; private int mCaptureFPS = -1;
private static boolean VERBOSE = LOGLEVEL > 2;
private static boolean DEBUG = LOGLEVEL > 1;
CaptureCapabilityAndroid currentCapability = null;
public static public static
void DeleteVideoCaptureAndroid(VideoCaptureAndroid captureAndroid) { void DeleteVideoCaptureAndroid(VideoCaptureAndroid captureAndroid) {
if(DEBUG) Log.d(TAG, "DeleteVideoCaptureAndroid"); Log.d(TAG, "DeleteVideoCaptureAndroid");
captureAndroid.StopCapture(); captureAndroid.StopCapture();
captureAndroid.camera.release(); captureAndroid.camera.release();
captureAndroid.camera = null; captureAndroid.camera = null;
captureAndroid.context = 0; captureAndroid.context = 0;
if(DEBUG) Log.v(TAG, "DeleteVideoCaptureAndroid ended");
} }
public VideoCaptureAndroid(int in_id, public VideoCaptureAndroid(int in_id, long in_context, Camera in_camera,
long in_context,
Camera in_camera,
AndroidVideoCaptureDevice in_device) { AndroidVideoCaptureDevice in_device) {
id = in_id; id = in_id;
context = in_context; context = in_context;
@ -80,16 +76,27 @@ public class VideoCaptureAndroid implements PreviewCallback, Callback {
currentDevice = in_device; currentDevice = in_device;
} }
private int doStartCapture(int width, int height, int frameRate) { private int tryStartCapture(int width, int height, int frameRate) {
if(DEBUG) Log.d(TAG, "doStartCapture " + width + if (camera == null) {
" height " + height +" frame rate " + frameRate); Log.e(TAG, "Camera not initialized %d" + id);
return -1;
}
Log.d(TAG, "tryStartCapture " + width +
" height " + height +" frame rate " + frameRate +
"isCaptureRunning " + isCaptureRunning +
"isSurfaceReady " + isSurfaceReady +
"isCaptureStarted " + isCaptureStarted);
if (isCaptureRunning || !isSurfaceReady || !isCaptureStarted) {
return 0;
}
try { try {
if (camera == null) { camera.setPreviewDisplay(surfaceHolder);
Log.e(TAG, "Camera not initialized %d" + id);
return -1; CaptureCapabilityAndroid currentCapability =
} new CaptureCapabilityAndroid();
currentCapability = new CaptureCapabilityAndroid();
currentCapability.width = width; currentCapability.width = width;
currentCapability.height = height; currentCapability.height = height;
currentCapability.maxFPS = frameRate; currentCapability.maxFPS = frameRate;
@ -103,22 +110,13 @@ public class VideoCaptureAndroid implements PreviewCallback, Callback {
camera.setParameters(parameters); camera.setParameters(parameters);
int bufSize = width * height * pixelFormat.bitsPerPixel / 8; int bufSize = width * height * pixelFormat.bitsPerPixel / 8;
if(android.os.Build.VERSION.SDK_INT >= 7) { byte[] buffer = null;
// According to Doc addCallbackBuffer belongs to API level 8. for (int i = 0; i < numCaptureBuffers; i++) {
// But it seems like it works on Android 2.1 as well. buffer = new byte[bufSize];
// At least SE X10 and Milestone camera.addCallbackBuffer(buffer);
byte[] buffer = null;
for (int i = 0; i < numCaptureBuffers; i++) {
buffer = new byte[bufSize];
camera.addCallbackBuffer(buffer);
}
camera.setPreviewCallbackWithBuffer(this);
ownsBuffers = true;
}
else {
camera.setPreviewCallback(this);
} }
camera.setPreviewCallbackWithBuffer(this);
ownsBuffers = true;
camera.startPreview(); camera.startPreview();
previewBufferLock.lock(); previewBufferLock.lock();
@ -131,46 +129,40 @@ public class VideoCaptureAndroid implements PreviewCallback, Callback {
Log.e(TAG, "Failed to start camera"); Log.e(TAG, "Failed to start camera");
return -1; return -1;
} }
isCaptureRunning = true; isCaptureRunning = true;
return 0; return 0;
} }
public int StartCapture(int width, int height, int frameRate) { public int StartCapture(int width, int height, int frameRate) {
if(DEBUG) Log.d(TAG, "StartCapture width " + width + Log.d(TAG, "StartCapture width " + width +
" height " + height +" frame rate " + frameRate); " height " + height +" frame rate " + frameRate);
isCaptureStarted = true;
// Get the local preview SurfaceHolder from the static render class // Get the local preview SurfaceHolder from the static render class
localPreview = ViERenderer.GetLocalRenderer(); localPreview = ViERenderer.GetLocalRenderer();
if(localPreview != null) { if (localPreview != null) {
localPreview.addCallback(this); localPreview.addCallback(this);
} }
if (camera == null) { captureLock.lock();
Log.e(TAG, "Camera not initialized %d" + id); isCaptureStarted = true;
return -1; mCaptureWidth = width;
} mCaptureHeight = height;
mCaptureFPS = frameRate;
if (!isSurfaceReady) return 0; int res = tryStartCapture(mCaptureWidth, mCaptureHeight, mCaptureFPS);
return doStartCapture(width, height, frameRate); captureLock.unlock();
return res;
} }
public int StopCapture() { public int StopCapture() {
if(DEBUG) Log.d(TAG, "StopCapture"); Log.d(TAG, "StopCapture");
try { try {
previewBufferLock.lock(); previewBufferLock.lock();
isCaptureRunning = false; isCaptureRunning = false;
previewBufferLock.unlock(); previewBufferLock.unlock();
camera.stopPreview(); camera.stopPreview();
camera.setPreviewCallbackWithBuffer(null);
if(android.os.Build.VERSION.SDK_INT > 7) {
camera.setPreviewCallbackWithBuffer(null);
}
else {
camera.setPreviewCallback(null);
}
} }
catch (Exception ex) { catch (Exception ex) {
Log.e(TAG, "Failed to stop camera"); Log.e(TAG, "Failed to stop camera");
@ -186,16 +178,15 @@ public class VideoCaptureAndroid implements PreviewCallback, Callback {
public void onPreviewFrame(byte[] data, Camera camera) { public void onPreviewFrame(byte[] data, Camera camera) {
previewBufferLock.lock(); previewBufferLock.lock();
if(VERBOSE) { // The following line is for debug only
Log.v(TAG, "preview frame length " + data.length + // Log.v(TAG, "preview frame length " + data.length +
" context" + context); // " context" + context);
} if (isCaptureRunning) {
if(isCaptureRunning) {
// If StartCapture has been called but not StopCapture // If StartCapture has been called but not StopCapture
// Call the C++ layer with the captured frame // Call the C++ layer with the captured frame
if (data.length == expectedFrameSize) { if (data.length == expectedFrameSize) {
ProvideCameraFrame(data, expectedFrameSize, context); ProvideCameraFrame(data, expectedFrameSize, context);
if(ownsBuffers) { if (ownsBuffers) {
// Give the video buffer to the camera service again. // Give the video buffer to the camera service again.
camera.addCallbackBuffer(data); camera.addCallbackBuffer(data);
} }
@ -209,21 +200,21 @@ public class VideoCaptureAndroid implements PreviewCallback, Callback {
public void SetPreviewRotation(int rotation) { public void SetPreviewRotation(int rotation) {
Log.v(TAG, "SetPreviewRotation:" + rotation); Log.v(TAG, "SetPreviewRotation:" + rotation);
if(camera != null) { if (camera != null) {
previewBufferLock.lock(); previewBufferLock.lock();
int width = 0; int width = 0;
int height = 0; int height = 0;
int framerate = 0; int framerate = 0;
if(isCaptureRunning) { if (isCaptureRunning) {
width = currentCapability.width; width = mCaptureWidth;
height = currentCapability.height; height = mCaptureHeight;
framerate = currentCapability.maxFPS; framerate = mCaptureFPS;
StopCapture(); StopCapture();
} }
int resultRotation = 0; int resultRotation = 0;
if(currentDevice.frontCameraType == if (currentDevice.frontCameraType ==
VideoCaptureDeviceInfoAndroid.FrontFacingCameraType.Android23) { VideoCaptureDeviceInfoAndroid.FrontFacingCameraType.Android23) {
// this is a 2.3 or later front facing camera. // this is a 2.3 or later front facing camera.
// SetDisplayOrientation will flip the image horizontally // SetDisplayOrientation will flip the image horizontally
@ -234,19 +225,9 @@ public class VideoCaptureAndroid implements PreviewCallback, Callback {
// Back facing or 2.2 or previous front camera // Back facing or 2.2 or previous front camera
resultRotation=rotation; resultRotation=rotation;
} }
if(android.os.Build.VERSION.SDK_INT>7) { camera.setDisplayOrientation(resultRotation);
camera.setDisplayOrientation(resultRotation);
}
else {
// Android 2.1 and previous
// This rotation unfortunately does not seems to work.
// http://code.google.com/p/android/issues/detail?id=1193
Camera.Parameters parameters = camera.getParameters();
parameters.setRotation(resultRotation);
camera.setParameters(parameters);
}
if(isCaptureRunning) { if (isCaptureRunning) {
StartCapture(width, height, framerate); StartCapture(width, height, framerate);
} }
previewBufferLock.unlock(); previewBufferLock.unlock();
@ -255,37 +236,23 @@ public class VideoCaptureAndroid implements PreviewCallback, Callback {
public void surfaceChanged(SurfaceHolder holder, public void surfaceChanged(SurfaceHolder holder,
int format, int width, int height) { int format, int width, int height) {
if (DEBUG) Log.d(TAG, "VideoCaptureAndroid::surfaceChanged"); Log.d(TAG, "VideoCaptureAndroid::surfaceChanged");
captureLock.lock();
isSurfaceReady = true; isSurfaceReady = true;
surfaceHolder = holder; surfaceHolder = holder;
if (!isCaptureStarted || isCaptureRunning) tryStartCapture(mCaptureWidth, mCaptureHeight, mCaptureFPS);
return; captureLock.unlock();
return;
if (DEBUG) {
Log.d(TAG, "VideoCaptureAndroid::surfaceChanged StartCapture");
}
if(camera != null) {
try {
camera.setPreviewDisplay(surfaceHolder);
}
catch (IOException e) {
Log.e(TAG, "Failed to set Local preview. " + e.getMessage());
}
}
doStartCapture(currentCapability.width,
currentCapability.height,
currentCapability.maxFPS);
} }
public void surfaceCreated(SurfaceHolder holder) { public void surfaceCreated(SurfaceHolder holder) {
if(DEBUG) Log.d(TAG, "VideoCaptureAndroid::surfaceCreated"); Log.d(TAG, "VideoCaptureAndroid::surfaceCreated");
} }
public void surfaceDestroyed(SurfaceHolder holder) { public void surfaceDestroyed(SurfaceHolder holder) {
if(DEBUG) Log.d(TAG, "VideoCaptureAndroid::surfaceDestroyed"); Log.d(TAG, "VideoCaptureAndroid::surfaceDestroyed");
isSurfaceReady = false; isSurfaceReady = false;
} }
} }