fix

haogg · Apr 9, 2015 · 88f55c2 · 88f55c2
1 parent 2df7d30
commit 88f55c2
Show file tree

Hide file tree

Showing 19 changed files with 12 additions and 6 deletions.
diff --git a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/RecorderActivity.apk b/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/RecorderActivity.apk
diff --git a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/classes.dex b/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/classes.dex
diff --git a/...esForEclipse/RecorderActivity/bin/classes/org/bytedeco/javacv/sample/RecordActivity.class b/...esForEclipse/RecorderActivity/bin/classes/org/bytedeco/javacv/sample/RecordActivity.class
diff --git a/...mplesForEclipse/RecorderActivity/bin/classes/org/bytedeco/javacv/util/CameraManager.class b/...mplesForEclipse/RecorderActivity/bin/classes/org/bytedeco/javacv/util/CameraManager.class
diff --git a/...erActivity/bin/classes/org/bytedeco/javacv/util/RecorderManager$AudioRecordRunnable.class b/...erActivity/bin/classes/org/bytedeco/javacv/util/RecorderManager$AudioRecordRunnable.class
diff --git a/...lesForEclipse/RecorderActivity/bin/classes/org/bytedeco/javacv/util/RecorderManager.class b/...lesForEclipse/RecorderActivity/bin/classes/org/bytedeco/javacv/util/RecorderManager.class
diff --git a/...se/RecorderActivity/bin/dexedLibs/android-support-v4-39363e066795b1a63f23bb6d9b34e74b.jar b/...se/RecorderActivity/bin/dexedLibs/android-support-v4-39363e066795b1a63f23bb6d9b34e74b.jar
diff --git a/...plesForEclipse/RecorderActivity/bin/dexedLibs/ffmpeg-71c7ea0bb66d9198cfbbaece666da866.jar b/...plesForEclipse/RecorderActivity/bin/dexedLibs/ffmpeg-71c7ea0bb66d9198cfbbaece666da866.jar
diff --git a/...lesForEclipse/RecorderActivity/bin/dexedLibs/javacpp-81f50a53acacd1ddc923cf7dfb033e14.jar b/...lesForEclipse/RecorderActivity/bin/dexedLibs/javacpp-81f50a53acacd1ddc923cf7dfb033e14.jar
diff --git a/...plesForEclipse/RecorderActivity/bin/dexedLibs/javacv-0b42a010bb69368b167bf39297d2196d.jar b/...plesForEclipse/RecorderActivity/bin/dexedLibs/javacv-0b42a010bb69368b167bf39297d2196d.jar
diff --git a/...plesForEclipse/RecorderActivity/bin/dexedLibs/opencv-51f2bfd923ee558b2b9e551cb49a1ded.jar b/...plesForEclipse/RecorderActivity/bin/dexedLibs/opencv-51f2bfd923ee558b2b9e551cb49a1ded.jar
diff --git a/...samplesForEclipse/RecorderActivity/bin/res/crunch/drawable-hdpi/ic_launcher.png b/...samplesForEclipse/RecorderActivity/bin/res/crunch/drawable-hdpi/ic_launcher.png
diff --git a/...samplesForEclipse/RecorderActivity/bin/res/crunch/drawable-mdpi/ic_launcher.png b/...samplesForEclipse/RecorderActivity/bin/res/crunch/drawable-mdpi/ic_launcher.png
diff --git a/...amplesForEclipse/RecorderActivity/bin/res/crunch/drawable-xhdpi/ic_launcher.png b/...amplesForEclipse/RecorderActivity/bin/res/crunch/drawable-xhdpi/ic_launcher.png
diff --git a/...mplesForEclipse/RecorderActivity/bin/res/crunch/drawable-xxhdpi/ic_launcher.png b/...mplesForEclipse/RecorderActivity/bin/res/crunch/drawable-xxhdpi/ic_launcher.png
diff --git a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/resources.ap_ b/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/resources.ap_
diff --git a/...les/samplesForEclipse/RecorderActivity/src/org/bytedeco/javacv/sample/RecordActivity.java b/...les/samplesForEclipse/RecorderActivity/src/org/bytedeco/javacv/sample/RecordActivity.java
@@ -163,7 +163,8 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
 
     @Override
     public void onClick(View v) {
-        if (mManager.recording) {
+
+        if (!mManager.recording) {
             mManager.startRecording();
             Log.w(LOG_TAG, "Start Button Pushed");
             btnRecorderControl.setText("Stop");

diff --git a/...amples/samplesForEclipse/RecorderActivity/src/org/bytedeco/javacv/util/CameraManager.java b/...amples/samplesForEclipse/RecorderActivity/src/org/bytedeco/javacv/util/CameraManager.java
@@ -45,8 +45,10 @@ public static Camera getCamera(){
 	}
 
 	/***In order to get a better preview:
-	 * 1. autofocus
-	 * 2. 
+	 * 1. focusmode
+	 * 2. framerate
+	 * 3. whitestablization
+	 * 4. ....
 	 * */
 	@SuppressLint("NewApi") 
 	private static void fixParameters(Parameters mParameters2) {
@@ -70,7 +72,7 @@ private static void fixParameters(Parameters mParameters2) {
 		mParameters.setPreviewFormat(ImageFormat.NV21);
 
 		// set focus mode
-		String mode = getAutoFocusMode();
+		String mode = checkFocusMode();
 
 		// sansung need to handle special
 		if (TextUtils.isEmpty(mode)) {
@@ -104,7 +106,9 @@ public static Camera switchCamera(int cameraId) {
 		return getCamera();
 	}
 
-	private static String getAutoFocusMode() {
+	/***check the autofocus mode*/
+	private static String checkFocusMode() {
+
 		if (mParameters != null) {
 
 			List<String> focusModes = mParameters.getSupportedFocusModes();

diff --git a/...ples/samplesForEclipse/RecorderActivity/src/org/bytedeco/javacv/util/RecorderManager.java b/...ples/samplesForEclipse/RecorderActivity/src/org/bytedeco/javacv/util/RecorderManager.java
@@ -42,6 +42,7 @@ public static RecorderManager getInstance(){
 
 
 	public boolean recording = false;
+
     /** The number of seconds in the continuous record loop (or 0 to disable loop). */
     final int RECORD_LENGTH = 10;
     int imagesIndex, samplesIndex;
@@ -68,7 +69,7 @@ public static RecorderManager getInstance(){
 
 
     public void startRecording() {
-
+    	
         initRecorder();
 
         try {