summaryrefslogtreecommitdiffstats
path: root/camera/tests
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2015-02-20 01:04:44 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-02-20 01:04:48 +0000
commit9a4fa2dfb7ce565fabfb7a7bef4f4adfea191f05 (patch)
treeb91d3bdf39760c82e54ab0be64c74d277f9a57fd /camera/tests
parent9d19e392f61de3e8cd365afa12d7836bd3721602 (diff)
parenta97dfeb91aae9569ff11a5a40634e2960c03915e (diff)
downloadframeworks_av-9a4fa2dfb7ce565fabfb7a7bef4f4adfea191f05.zip
frameworks_av-9a4fa2dfb7ce565fabfb7a7bef4f4adfea191f05.tar.gz
frameworks_av-9a4fa2dfb7ce565fabfb7a7bef4f4adfea191f05.tar.bz2
Merge "Camera: Remove RAW_SENSOR in favor of RAW16"
Diffstat (limited to 'camera/tests')
-rw-r--r--camera/tests/ProCameraTests.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/camera/tests/ProCameraTests.cpp b/camera/tests/ProCameraTests.cpp
index 6212678..24b2327 100644
--- a/camera/tests/ProCameraTests.cpp
+++ b/camera/tests/ProCameraTests.cpp
@@ -475,7 +475,7 @@ protected:
CMP_STR(NV16, YCbCr_422_SP);
CMP_STR(NV21, YCrCb_420_SP);
CMP_STR(YUY2, YCbCr_422_I);
- CMP_STR(RAW, RAW_SENSOR);
+ CMP_STR(RAW, RAW16);
CMP_STR(RGBA, RGBA_8888);
std::cerr << "Unknown format string " << str << std::endl;