summaryrefslogtreecommitdiffstats
path: root/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2014-12-11 12:55:44 -0800
committerRuben Brunk <rubenbrunk@google.com>2015-02-10 21:21:30 +0000
commit8973597944890db9e7ad90a29ff8a44e6b2e2a7b (patch)
treeb45f9b978761aafe099a0d1f776c96ab15736e8c /core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp
parent4b79268cb7f4fdf7a024c9802d4f176db267eba7 (diff)
downloadframeworks_base-8973597944890db9e7ad90a29ff8a44e6b2e2a7b.zip
frameworks_base-8973597944890db9e7ad90a29ff8a44e6b2e2a7b.tar.gz
frameworks_base-8973597944890db9e7ad90a29ff8a44e6b2e2a7b.tar.bz2
camera2: Fix local variable names in rgb->ycbcr conversion.
Change-Id: I413becdd8dcc4faff74d747badaffb66f220c99a
Diffstat (limited to 'core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp')
-rw-r--r--core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp b/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp
index aabf320..7aa548b 100644
--- a/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp
+++ b/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp
@@ -52,12 +52,12 @@ using namespace android;
* Convert from RGB 888 to Y'CbCr using the conversion specified in JFIF v1.02
*/
static void rgbToYuv420(uint8_t* rgbBuf, size_t width, size_t height, uint8_t* yPlane,
- uint8_t* uPlane, uint8_t* vPlane, size_t chromaStep, size_t yStride, size_t chromaStride) {
+ uint8_t* crPlane, uint8_t* cbPlane, size_t chromaStep, size_t yStride, size_t chromaStride) {
uint8_t R, G, B;
size_t index = 0;
for (size_t j = 0; j < height; j++) {
- uint8_t* u = uPlane;
- uint8_t* v = vPlane;
+ uint8_t* cr = crPlane;
+ uint8_t* cb = cbPlane;
uint8_t* y = yPlane;
bool jEven = (j & 1) == 0;
for (size_t i = 0; i < width; i++) {
@@ -66,18 +66,18 @@ static void rgbToYuv420(uint8_t* rgbBuf, size_t width, size_t height, uint8_t* y
B = rgbBuf[index++];
*y++ = (77 * R + 150 * G + 29 * B) >> 8;
if (jEven && (i & 1) == 0) {
- *v = (( -43 * R - 85 * G + 128 * B) >> 8) + 128;
- *u = (( 128 * R - 107 * G - 21 * B) >> 8) + 128;
- u += chromaStep;
- v += chromaStep;
+ *cb = (( -43 * R - 85 * G + 128 * B) >> 8) + 128;
+ *cr = (( 128 * R - 107 * G - 21 * B) >> 8) + 128;
+ cr += chromaStep;
+ cb += chromaStep;
}
// Skip alpha
index++;
}
yPlane += yStride;
if (jEven) {
- uPlane += chromaStride;
- vPlane += chromaStride;
+ crPlane += chromaStride;
+ cbPlane += chromaStride;
}
}
}