diff --git a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/RecorderActivity.apk b/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/RecorderActivity.apk deleted file mode 100644 index 00acd2e9..00000000 Binary files a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/RecorderActivity.apk and /dev/null differ diff --git a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/classes.dex b/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/classes.dex deleted file mode 100644 index 80fbcdad..00000000 Binary files a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/classes.dex and /dev/null differ diff --git a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/classes/org/bytedeco/javacv/sample/RecordActivity.class b/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/classes/org/bytedeco/javacv/sample/RecordActivity.class index 09f84397..32f0d4e6 100644 Binary files a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/classes/org/bytedeco/javacv/sample/RecordActivity.class and b/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/classes/org/bytedeco/javacv/sample/RecordActivity.class differ diff --git a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/classes/org/bytedeco/javacv/util/CameraManager.class b/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/classes/org/bytedeco/javacv/util/CameraManager.class index 64ed85f8..50308e16 100644 Binary files a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/classes/org/bytedeco/javacv/util/CameraManager.class and b/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/classes/org/bytedeco/javacv/util/CameraManager.class differ diff --git a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/classes/org/bytedeco/javacv/util/RecorderManager$AudioRecordRunnable.class b/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/classes/org/bytedeco/javacv/util/RecorderManager$AudioRecordRunnable.class index 27ef4728..08cce644 100644 Binary files a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/classes/org/bytedeco/javacv/util/RecorderManager$AudioRecordRunnable.class and b/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/classes/org/bytedeco/javacv/util/RecorderManager$AudioRecordRunnable.class differ diff --git a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/classes/org/bytedeco/javacv/util/RecorderManager.class b/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/classes/org/bytedeco/javacv/util/RecorderManager.class index 7aa29e5e..7a55c419 100644 Binary files a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/classes/org/bytedeco/javacv/util/RecorderManager.class and b/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/classes/org/bytedeco/javacv/util/RecorderManager.class differ diff --git a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/dexedLibs/android-support-v4-39363e066795b1a63f23bb6d9b34e74b.jar b/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/dexedLibs/android-support-v4-39363e066795b1a63f23bb6d9b34e74b.jar deleted file mode 100644 index 10ba90cf..00000000 Binary files a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/dexedLibs/android-support-v4-39363e066795b1a63f23bb6d9b34e74b.jar and /dev/null differ diff --git a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/dexedLibs/ffmpeg-71c7ea0bb66d9198cfbbaece666da866.jar b/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/dexedLibs/ffmpeg-71c7ea0bb66d9198cfbbaece666da866.jar deleted file mode 100644 index b6b35f0f..00000000 Binary files a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/dexedLibs/ffmpeg-71c7ea0bb66d9198cfbbaece666da866.jar and /dev/null differ diff --git a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/dexedLibs/javacpp-81f50a53acacd1ddc923cf7dfb033e14.jar b/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/dexedLibs/javacpp-81f50a53acacd1ddc923cf7dfb033e14.jar deleted file mode 100644 index af4fa133..00000000 Binary files a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/dexedLibs/javacpp-81f50a53acacd1ddc923cf7dfb033e14.jar and /dev/null differ diff --git a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/dexedLibs/javacv-0b42a010bb69368b167bf39297d2196d.jar b/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/dexedLibs/javacv-0b42a010bb69368b167bf39297d2196d.jar deleted file mode 100644 index 694bc422..00000000 Binary files a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/dexedLibs/javacv-0b42a010bb69368b167bf39297d2196d.jar and /dev/null differ diff --git a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/dexedLibs/opencv-51f2bfd923ee558b2b9e551cb49a1ded.jar b/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/dexedLibs/opencv-51f2bfd923ee558b2b9e551cb49a1ded.jar deleted file mode 100644 index ce35161c..00000000 Binary files a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/dexedLibs/opencv-51f2bfd923ee558b2b9e551cb49a1ded.jar and /dev/null differ diff --git a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/res/crunch/drawable-hdpi/ic_launcher.png b/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/res/crunch/drawable-hdpi/ic_launcher.png deleted file mode 100644 index efa7c5f1..00000000 Binary files a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/res/crunch/drawable-hdpi/ic_launcher.png and /dev/null differ diff --git a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/res/crunch/drawable-mdpi/ic_launcher.png b/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/res/crunch/drawable-mdpi/ic_launcher.png deleted file mode 100644 index ec27f2ea..00000000 Binary files a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/res/crunch/drawable-mdpi/ic_launcher.png and /dev/null differ diff --git a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/res/crunch/drawable-xhdpi/ic_launcher.png b/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/res/crunch/drawable-xhdpi/ic_launcher.png deleted file mode 100644 index 92fc57d0..00000000 Binary files a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/res/crunch/drawable-xhdpi/ic_launcher.png and /dev/null differ diff --git a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/res/crunch/drawable-xxhdpi/ic_launcher.png b/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/res/crunch/drawable-xxhdpi/ic_launcher.png deleted file mode 100644 index b6f8f4e9..00000000 Binary files a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/res/crunch/drawable-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/resources.ap_ b/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/resources.ap_ deleted file mode 100644 index 04fd666e..00000000 Binary files a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/bin/resources.ap_ and /dev/null differ diff --git a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/src/org/bytedeco/javacv/sample/RecordActivity.java b/samples/AndroidSamples/samplesForEclipse/RecorderActivity/src/org/bytedeco/javacv/sample/RecordActivity.java index 8216b2f1..99e1f713 100644 --- a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/src/org/bytedeco/javacv/sample/RecordActivity.java +++ b/samples/AndroidSamples/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/samples/AndroidSamples/samplesForEclipse/RecorderActivity/src/org/bytedeco/javacv/util/CameraManager.java b/samples/AndroidSamples/samplesForEclipse/RecorderActivity/src/org/bytedeco/javacv/util/CameraManager.java index 74938403..497886ba 100644 --- a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/src/org/bytedeco/javacv/util/CameraManager.java +++ b/samples/AndroidSamples/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 focusModes = mParameters.getSupportedFocusModes(); diff --git a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/src/org/bytedeco/javacv/util/RecorderManager.java b/samples/AndroidSamples/samplesForEclipse/RecorderActivity/src/org/bytedeco/javacv/util/RecorderManager.java index dcc21942..3514ff56 100644 --- a/samples/AndroidSamples/samplesForEclipse/RecorderActivity/src/org/bytedeco/javacv/util/RecorderManager.java +++ b/samples/AndroidSamples/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 {