am d78e457c: Merge "Delete the panorama benchmark from camera."
* commit 'd78e457c27eb2a2c80ad2441b636c020f7bb2184':
Delete the panorama benchmark from camera.
diff --git a/perftests/panorama/Android.mk b/perftests/panorama/Android.mk
deleted file mode 100755
index 48064d0..0000000
--- a/perftests/panorama/Android.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-local_target_dir := $(TARGET_OUT_DATA)/local/tmp
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/../../jni/feature_mos/src \
- $(LOCAL_PATH)/../../jni/feature_stab/src \
- $(LOCAL_PATH)/../../jni/feature_stab/db_vlvm
-
-LOCAL_CFLAGS := -O3 -DNDEBUG
-
-LOCAL_SRC_FILES := benchmark.cpp
-
-LOCAL_SHARED_LIBRARIES := libjni_mosaic libGLESv2 libEGL
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_LDFLAGS := -llog -lGLESv2
-
-LOCAL_MODULE := panorama_bench
-
-LOCAL_MODULE_PATH := $(local_target_dir)
-
-include $(BUILD_EXECUTABLE)
diff --git a/perftests/panorama/README.txt b/perftests/panorama/README.txt
deleted file mode 100644
index cbfb35a..0000000
--- a/perftests/panorama/README.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-How to run and verify the benchmark:
-
-1) adb push input /data/panorama_input
-2) adb shell panorama_bench /data/panorama_input/test /data/panorama.ppm
-
-Sample output:
-
-38 frames loaded
-Iteration 0: 1454x330 moasic created: 4.33 seconds (2.05 + 2.28)
-Iteration 1: 1454x330 moasic created: 4.26 seconds (1.83 + 2.44)
-Iteration 2: 1454x330 moasic created: 5.57 seconds (2.73 + 2.84)
-Iteration 3: 1454x330 moasic created: 5.15 seconds (2.33 + 2.82)
-Iteration 4: 1454x330 moasic created: 6.22 seconds (2.05 + 4.16)
-Iteration 5: 1454x330 moasic created: 6.31 seconds (2.16 + 4.15)
-Iteration 6: 1454x330 moasic created: 5.04 seconds (2.03 + 3.01)
-Iteration 7: 1454x330 moasic created: 6.30 seconds (3.47 + 2.83)
-Iteration 8: 1454x330 moasic created: 6.57 seconds (1.83 + 4.73)
-Iteration 9: 1454x330 moasic created: 6.27 seconds (2.28 + 4.00)
-Total elapsed time: 56.02 seconds
-
-The first number in the parenthesis is the time to align the frames; the second
-number is the time to stitch them.
-
-The total elapsed time is the interesting number for benchmarking.
-
-3) adb pull /data/panorama.ppm .
-4) diff panorama.ppm output/golden.ppm
diff --git a/perftests/panorama/benchmark.cpp b/perftests/panorama/benchmark.cpp
deleted file mode 100755
index 2a6440f..0000000
--- a/perftests/panorama/benchmark.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#include "mosaic/Mosaic.h"
-#include "mosaic/ImageUtils.h"
-
-#define MAX_FRAMES 200
-#define KERNEL_ITERATIONS 10
-
-const int blendingType = Blend::BLEND_TYPE_HORZ;
-const int stripType = Blend::STRIP_TYPE_WIDE;
-
-ImageType yvuFrames[MAX_FRAMES];
-
-int loadImages(const char* basename, int &width, int &height)
-{
- char filename[512];
- struct stat filestat;
- int i;
-
- for (i = 0; i < MAX_FRAMES; i++) {
- sprintf(filename, "%s_%03d.ppm", basename, i + 1);
- if (stat(filename, &filestat) != 0) break;
- ImageType rgbFrame = ImageUtils::readBinaryPPM(filename, width, height);
- yvuFrames[i] = ImageUtils::allocateImage(width, height,
- ImageUtils::IMAGE_TYPE_NUM_CHANNELS);
- ImageUtils::rgb2yvu(yvuFrames[i], rgbFrame, width, height);
- ImageUtils::freeImage(rgbFrame);
- }
- return i;
-}
-
-int main(int argc, char **argv)
-{
- struct timespec t1, t2, t3;
-
- int width, height;
- float totalElapsedTime = 0;
-
- const char *basename;
- const char *filename;
-
- if (argc != 3) {
- printf("Usage: %s input_dir output_filename\n", argv[0]);
- return 0;
- } else {
- basename = argv[1];
- filename = argv[2];
- }
-
- // Load the images outside the computational kernel
- int totalFrames = loadImages(basename, width, height);
-
- if (totalFrames == 0) {
- printf("Image files not found. Make sure %s exists.\n",
- basename);
- return 1;
- }
-
- printf("%d frames loaded\n", totalFrames);
-
-
- // Interesting stuff is here
- for (int iteration = 0; iteration < KERNEL_ITERATIONS; iteration++) {
- Mosaic mosaic;
-
- mosaic.initialize(blendingType, stripType, width, height, -1, false, 0);
-
- clock_gettime(CLOCK_MONOTONIC, &t1);
- for (int i = 0; i < totalFrames; i++) {
- mosaic.addFrame(yvuFrames[i]);
- }
- clock_gettime(CLOCK_MONOTONIC, &t2);
-
- float progress = 0.0;
- bool cancelComputation = false;
-
- mosaic.createMosaic(progress, cancelComputation);
-
- int mosaicWidth, mosaicHeight;
- ImageType resultYVU = mosaic.getMosaic(mosaicWidth, mosaicHeight);
-
- ImageType imageRGB = ImageUtils::allocateImage(
- mosaicWidth, mosaicHeight, ImageUtils::IMAGE_TYPE_NUM_CHANNELS);
-
- clock_gettime(CLOCK_MONOTONIC, &t3);
-
- float elapsedTime =
- (t3.tv_sec - t1.tv_sec) + (t3.tv_nsec - t1.tv_nsec)/1e9;
- float addImageTime =
- (t2.tv_sec - t1.tv_sec) + (t2.tv_nsec - t1.tv_nsec)/1e9;
- float stitchImageTime =
- (t3.tv_sec - t2.tv_sec) + (t3.tv_nsec - t2.tv_nsec)/1e9;
-
- totalElapsedTime += elapsedTime;
-
- printf("Iteration %d: %dx%d moasic created: "
- "%.2f seconds (%.2f + %.2f)\n",
- iteration, mosaicWidth, mosaicHeight,
- elapsedTime, addImageTime, stitchImageTime);
-
- // Write the output only once for correctness check
- if (iteration == 0) {
- ImageUtils::yvu2rgb(imageRGB, resultYVU, mosaicWidth,
- mosaicHeight);
- ImageUtils::writeBinaryPPM(imageRGB, filename, mosaicWidth,
- mosaicHeight);
- }
- }
- printf("Total elapsed time: %.2f seconds\n", totalElapsedTime);
-
- return 0;
-}
diff --git a/perftests/panorama/input/test_001.ppm b/perftests/panorama/input/test_001.ppm
deleted file mode 100644
index e7218bf..0000000
--- a/perftests/panorama/input/test_001.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_002.ppm b/perftests/panorama/input/test_002.ppm
deleted file mode 100644
index 8975073..0000000
--- a/perftests/panorama/input/test_002.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_003.ppm b/perftests/panorama/input/test_003.ppm
deleted file mode 100644
index 58c9e34..0000000
--- a/perftests/panorama/input/test_003.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_004.ppm b/perftests/panorama/input/test_004.ppm
deleted file mode 100644
index 142c76b..0000000
--- a/perftests/panorama/input/test_004.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_005.ppm b/perftests/panorama/input/test_005.ppm
deleted file mode 100644
index ff229d3..0000000
--- a/perftests/panorama/input/test_005.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_006.ppm b/perftests/panorama/input/test_006.ppm
deleted file mode 100644
index 2fc5c09..0000000
--- a/perftests/panorama/input/test_006.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_007.ppm b/perftests/panorama/input/test_007.ppm
deleted file mode 100644
index d7f6a9a..0000000
--- a/perftests/panorama/input/test_007.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_008.ppm b/perftests/panorama/input/test_008.ppm
deleted file mode 100644
index 86d92b3..0000000
--- a/perftests/panorama/input/test_008.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_009.ppm b/perftests/panorama/input/test_009.ppm
deleted file mode 100644
index 72dd05f..0000000
--- a/perftests/panorama/input/test_009.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_010.ppm b/perftests/panorama/input/test_010.ppm
deleted file mode 100644
index a09a054..0000000
--- a/perftests/panorama/input/test_010.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_011.ppm b/perftests/panorama/input/test_011.ppm
deleted file mode 100644
index be7b61b..0000000
--- a/perftests/panorama/input/test_011.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_012.ppm b/perftests/panorama/input/test_012.ppm
deleted file mode 100644
index 67fad4a..0000000
--- a/perftests/panorama/input/test_012.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_013.ppm b/perftests/panorama/input/test_013.ppm
deleted file mode 100644
index 6d92fd1..0000000
--- a/perftests/panorama/input/test_013.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_014.ppm b/perftests/panorama/input/test_014.ppm
deleted file mode 100644
index 97aff41..0000000
--- a/perftests/panorama/input/test_014.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_015.ppm b/perftests/panorama/input/test_015.ppm
deleted file mode 100644
index d1de251..0000000
--- a/perftests/panorama/input/test_015.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_016.ppm b/perftests/panorama/input/test_016.ppm
deleted file mode 100644
index 70ea1f5..0000000
--- a/perftests/panorama/input/test_016.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_017.ppm b/perftests/panorama/input/test_017.ppm
deleted file mode 100644
index e075c9e..0000000
--- a/perftests/panorama/input/test_017.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_018.ppm b/perftests/panorama/input/test_018.ppm
deleted file mode 100644
index adf023b..0000000
--- a/perftests/panorama/input/test_018.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_019.ppm b/perftests/panorama/input/test_019.ppm
deleted file mode 100644
index 1f27d1d..0000000
--- a/perftests/panorama/input/test_019.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_020.ppm b/perftests/panorama/input/test_020.ppm
deleted file mode 100644
index fb95f52..0000000
--- a/perftests/panorama/input/test_020.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_021.ppm b/perftests/panorama/input/test_021.ppm
deleted file mode 100644
index 43baadf..0000000
--- a/perftests/panorama/input/test_021.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_022.ppm b/perftests/panorama/input/test_022.ppm
deleted file mode 100644
index f928c83..0000000
--- a/perftests/panorama/input/test_022.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_023.ppm b/perftests/panorama/input/test_023.ppm
deleted file mode 100644
index e21b275..0000000
--- a/perftests/panorama/input/test_023.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_024.ppm b/perftests/panorama/input/test_024.ppm
deleted file mode 100644
index 43ba0ba..0000000
--- a/perftests/panorama/input/test_024.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_025.ppm b/perftests/panorama/input/test_025.ppm
deleted file mode 100644
index b9f8892..0000000
--- a/perftests/panorama/input/test_025.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_026.ppm b/perftests/panorama/input/test_026.ppm
deleted file mode 100644
index 201615f..0000000
--- a/perftests/panorama/input/test_026.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_027.ppm b/perftests/panorama/input/test_027.ppm
deleted file mode 100644
index 07cf426..0000000
--- a/perftests/panorama/input/test_027.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_028.ppm b/perftests/panorama/input/test_028.ppm
deleted file mode 100644
index aedb023..0000000
--- a/perftests/panorama/input/test_028.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_029.ppm b/perftests/panorama/input/test_029.ppm
deleted file mode 100644
index 9a0d398..0000000
--- a/perftests/panorama/input/test_029.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_030.ppm b/perftests/panorama/input/test_030.ppm
deleted file mode 100644
index 26a8f53..0000000
--- a/perftests/panorama/input/test_030.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_031.ppm b/perftests/panorama/input/test_031.ppm
deleted file mode 100644
index 2300461..0000000
--- a/perftests/panorama/input/test_031.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_032.ppm b/perftests/panorama/input/test_032.ppm
deleted file mode 100644
index f5e93f8..0000000
--- a/perftests/panorama/input/test_032.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_033.ppm b/perftests/panorama/input/test_033.ppm
deleted file mode 100644
index c2f8ad9..0000000
--- a/perftests/panorama/input/test_033.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_034.ppm b/perftests/panorama/input/test_034.ppm
deleted file mode 100644
index de93b23..0000000
--- a/perftests/panorama/input/test_034.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_035.ppm b/perftests/panorama/input/test_035.ppm
deleted file mode 100644
index 62198de..0000000
--- a/perftests/panorama/input/test_035.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_036.ppm b/perftests/panorama/input/test_036.ppm
deleted file mode 100644
index bf252e4..0000000
--- a/perftests/panorama/input/test_036.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_037.ppm b/perftests/panorama/input/test_037.ppm
deleted file mode 100644
index 7cc7ace..0000000
--- a/perftests/panorama/input/test_037.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/input/test_038.ppm b/perftests/panorama/input/test_038.ppm
deleted file mode 100644
index d44e1f1..0000000
--- a/perftests/panorama/input/test_038.ppm
+++ /dev/null
Binary files differ
diff --git a/perftests/panorama/output/golden.ppm b/perftests/panorama/output/golden.ppm
deleted file mode 100644
index 5210933..0000000
--- a/perftests/panorama/output/golden.ppm
+++ /dev/null
Binary files differ
