corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge from mozilla-central

Browse Source
This commit is contained in:
Doug Turner
2011-10-14 10:22:33 -07:00
parent 43ed6c56f9 220ff4f708
commit d3f6be878e
1088 changed files with 74966 additions and 48204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
embedding/android/GeckoAppShell.java
View File

@@ -1493,7 +1493,7 @@ public class GeckoAppShell
static int kPreferedFps = 25;
static byte[] sCameraBuffer = null;
static int[] initCamera(String aContentType, int aCamera, int aWidth, int aHeight) {
Log.i("GeckoAppJava", "initCamera(" + aContentType + ", " + aWidth + "x" + aHeight + ") on thread " + Thread.currentThread().getId());
@@ -1547,13 +1547,22 @@ public class GeckoAppShell
}
}
try {
sCamera.setPreviewDisplay(GeckoApp.cameraView.getHolder());
} catch(IOException e) {
Log.e("GeckoAppJava", "Error setPreviewDisplay:", e);
} catch(RuntimeException e) {
Log.e("GeckoAppJava", "Error setPreviewDisplay:", e);
}
sCamera.setParameters(params);
sCameraBuffer = new byte[(bufferSize * 12) / 8];
sCamera.addCallbackBuffer(sCameraBuffer);
sCamera.setPreviewCallbackWithBuffer(new android.hardware.Camera.PreviewCallback() {
public void onPreviewFrame(byte[] data, android.hardware.Camera camera) {
cameraCallbackBridge(data);
sCamera.addCallbackBuffer(sCameraBuffer);
if (sCamera != null)
sCamera.addCallbackBuffer(sCameraBuffer);
}
});
sCamera.startPreview();