From d2d1e257b6af2094a6aa7dfc053d44dd22233690 Mon Sep 17 00:00:00 2001
From: guillaume <guillaume@guibc.(none)>
Date: Thu, 18 Nov 2010 15:01:15 +0100
Subject: [PATCH] addbackbuffer managed directly in java code

---
 src/org/linphone/core/AndroidCameraRecord.java        |  8 --------
 .../core/AndroidCameraRecordBufferedImpl.java         | 11 +++--------
 src/org/linphone/core/AndroidCameraRecordImpl.java    |  9 ++-------
 3 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/src/org/linphone/core/AndroidCameraRecord.java b/src/org/linphone/core/AndroidCameraRecord.java
index 6ebce9856..17d9f8f9a 100644
--- a/src/org/linphone/core/AndroidCameraRecord.java
+++ b/src/org/linphone/core/AndroidCameraRecord.java
@@ -192,14 +192,6 @@ public abstract class AndroidCameraRecord {
 	}
 	
 	
-	/**
-	 * Hook to add back a buffer for reuse in capture.
-	 * Override in a version supporting addPreviewCallBackWithBuffer()
-	 * @param buffer buffer to reuse
-	 */
-	public void addBackCaptureBuffer(byte[] buffer) {}
-
-
 
 	private void updateVisibility() {
 		if (!visibilityChangeable) {
diff --git a/src/org/linphone/core/AndroidCameraRecordBufferedImpl.java b/src/org/linphone/core/AndroidCameraRecordBufferedImpl.java
index c65f479ad..715f17765 100644
--- a/src/org/linphone/core/AndroidCameraRecordBufferedImpl.java
+++ b/src/org/linphone/core/AndroidCameraRecordBufferedImpl.java
@@ -41,11 +41,6 @@ public class AndroidCameraRecordBufferedImpl extends AndroidCameraRecordImpl {
 		camera.setPreviewCallbackWithBuffer(cb);
 	}
 	
-	@Override
-	public void addBackCaptureBuffer(byte[] buffer) {
-		camera.addCallbackBuffer(buffer);
-	}
-	
 	@Override
 	public void onCameraStarted(Camera camera) {
 		super.onCameraStarted(camera);
@@ -62,8 +57,8 @@ public class AndroidCameraRecordBufferedImpl extends AndroidCameraRecordImpl {
 	}
 	
 	@Override
-	protected void badBufferLengthReceived(byte[] buffer, int expectedBufferLength) {
-		super.badBufferLengthReceived(buffer, expectedBufferLength);
-		addBackCaptureBuffer(buffer);
+	public void onPreviewFrame(byte[] data, Camera camera) {
+		super.onPreviewFrame(data, camera);
+		camera.addCallbackBuffer(data);
 	}
 }
diff --git a/src/org/linphone/core/AndroidCameraRecordImpl.java b/src/org/linphone/core/AndroidCameraRecordImpl.java
index aab29a183..6186e458a 100644
--- a/src/org/linphone/core/AndroidCameraRecordImpl.java
+++ b/src/org/linphone/core/AndroidCameraRecordImpl.java
@@ -60,7 +60,8 @@ public class AndroidCameraRecordImpl extends AndroidCameraRecord implements Prev
 		Size s = camera.getParameters().getPreviewSize();
 		int expectedBuffLength = s.width * s.height * 3 /2;
 		if (expectedBuffLength != data.length) {
-			badBufferLengthReceived(data, expectedBuffLength);
+			Log.e("Linphone", "onPreviewFrame called with bad buffer length " + data.length
+					+ " whereas expected is " + expectedBuffLength + " don't calling putImage");
 			return;
 		}
 		
@@ -74,7 +75,6 @@ public class AndroidCameraRecordImpl extends AndroidCameraRecord implements Prev
 		double currentTimeElapsed = 0.8 * (curTime - lastFrameTime) / 1000 + 0.2 * timeElapsedBetweenFrames;
 		if (1 / currentTimeElapsed > fps) {
 //			Log.d("Linphone", "Clipping frame " + Math.round(1 / currentTimeElapsed) + " > " + fps);
-			addBackCaptureBuffer(data);
 			return;
 		}
 		lastFrameTime = curTime;
@@ -85,10 +85,5 @@ public class AndroidCameraRecordImpl extends AndroidCameraRecord implements Prev
 	}
 
 
-	// Hook
-	protected void badBufferLengthReceived(byte[] data, int expectedBuffLength) {
-		Log.e("Linphone", "onPreviewFrame called with bad buffer length " + data.length
-				+ " whereas expected is " + expectedBuffLength + " don't calling putImage");
-	}
 
 }