Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Cosmetics cleanup.

Browse source
This commit is contained in:
Guillaume Beraudo 2010-11-29 14:41:51 +01:00
parent b39b2d5aee
commit 92d5914648
2 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/org/linphone/core/AndroidCameraRecord.java
View file

@ -52,7 +52,8 @@ public abstract class AndroidCameraRecord {
public void startPreview() { // FIXME throws exception? public void startPreview() { // FIXME throws exception?
if (previewStarted) { if (previewStarted) {
Log.w(tag, "Already started"); Log.w(tag, "Already started");
return; throw new RuntimeException("Video recorder already started");
// return
} }
if (params.surfaceView.getVisibility() != SurfaceView.VISIBLE) { if (params.surfaceView.getVisibility() != SurfaceView.VISIBLE) {
@ -91,7 +92,7 @@ public abstract class AndroidCameraRecord {
} }
} }
onSettingParameters(parameters); onSettingCameraParameters(parameters);
camera.setParameters(parameters); camera.setParameters(parameters);
@ -114,33 +115,28 @@ public abstract class AndroidCameraRecord {
previewStarted = true; previewStarted = true;
// Register callback to get capture buffer // Register callback to get capture buffer
if (storedPreviewCallback != null) { lowLevelSetPreviewCallback(camera, storedPreviewCallback);
lowLevelSetPreviewCallback(camera, storedPreviewCallback);
}
onCameraStarted(camera); onPreviewStarted(camera);
} }
protected void onSettingParameters(Parameters parameters) { protected void onSettingCameraParameters(Parameters parameters) {}
}
/** /**
* Hook. * Hook.
* @param camera * @param camera
*/ */
public void onCameraStarted(Camera camera) {} public void onPreviewStarted(Camera camera) {}
public void storePreviewCallBack(PreviewCallback cb) { public void storePreviewCallBack(PreviewCallback cb) {
this.storedPreviewCallback = cb;
if (camera == null) { if (camera == null) {
Log.w(tag, "Capture camera not ready, storing callback"); Log.w(tag, "Capture camera not ready, storing callback");
this.storedPreviewCallback = cb;
return; return;
} }

12
src/org/linphone/core/AndroidCameraRecordBufferedImpl.java
View file

@ -46,18 +46,14 @@ public class AndroidCameraRecordBufferedImpl extends AndroidCameraRecordImpl {
} }
@Override @Override
public void onCameraStarted(Camera camera) { public void onPreviewStarted(Camera camera) {
super.onCameraStarted(camera); super.onPreviewStarted(camera);
Size s = camera.getParameters().getPreviewSize(); Size s = camera.getParameters().getPreviewSize();
int wishedBufferSize = s.height * s.width * 3 / 2; int wishedBufferSize = s.height * s.width * 3 / 2;
camera.addCallbackBuffer(new byte[wishedBufferSize]); camera.addCallbackBuffer(new byte[wishedBufferSize]);
camera.addCallbackBuffer(new byte[wishedBufferSize]); camera.addCallbackBuffer(new byte[wishedBufferSize]);
/*
for (int i=1; i < 30; i++) {
camera.addCallbackBuffer(new byte[wishedBufferSize]);
}*/
} }
@Override @Override
@ -67,8 +63,8 @@ public class AndroidCameraRecordBufferedImpl extends AndroidCameraRecordImpl {
} }
@Override @Override
protected void onSettingParameters(Parameters parameters) { protected void onSettingCameraParameters(Parameters parameters) {
super.onSettingParameters(parameters); super.onSettingCameraParameters(parameters);
// Only on v8 hardware // Only on v8 hardware
camera.setDisplayOrientation(90 * orientationCode); camera.setDisplayOrientation(90 * orientationCode);
} }