diff options
| author | Mekala Natarajan <mekalan@codeaurora.org> | 2015-03-26 12:17:48 -0700 |
|---|---|---|
| committer | Mekala Natarajan <mekalan@codeaurora.org> | 2015-03-26 12:17:48 -0700 |
| commit | 3bcf04b5befd26624505f1baeebf31c79df5a26f (patch) | |
| tree | 9ed2f7dc434014c119cf6e97392c4a01eb195baa | |
| parent | c7e4a2382ffa337e3042e2e44eeb7d67553596d7 (diff) | |
| download | android_device_generic_goldfish-3bcf04b5befd26624505f1baeebf31c79df5a26f.tar.gz android_device_generic_goldfish-3bcf04b5befd26624505f1baeebf31c79df5a26f.tar.bz2 android_device_generic_goldfish-3bcf04b5befd26624505f1baeebf31c79df5a26f.zip | |
camera: Drop RAW_SENSOR, use RAW16 instead
Change-Id: I016831455ff2ef208ff5006f2860446245e2b965
| -rw-r--r-- | camera/EmulatedFakeCamera2.cpp | 10 | ||||
| -rw-r--r-- | camera/EmulatedFakeCamera3.cpp | 4 | ||||
| -rw-r--r-- | camera/fake-pipeline2/Sensor.cpp | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/camera/EmulatedFakeCamera2.cpp b/camera/EmulatedFakeCamera2.cpp index 844a71e..e5e955a 100644 --- a/camera/EmulatedFakeCamera2.cpp +++ b/camera/EmulatedFakeCamera2.cpp @@ -42,7 +42,7 @@ const int64_t MSEC = USEC * 1000LL; const int64_t SEC = MSEC * 1000LL; const uint32_t EmulatedFakeCamera2::kAvailableFormats[4] = { - HAL_PIXEL_FORMAT_RAW_SENSOR, + HAL_PIXEL_FORMAT_RAW16, HAL_PIXEL_FORMAT_BLOB, HAL_PIXEL_FORMAT_RGBA_8888, // HAL_PIXEL_FORMAT_YV12, @@ -374,7 +374,7 @@ int EmulatedFakeCamera2::allocateStream( const uint32_t *availableSizes; size_t availableSizeCount; switch (format) { - case HAL_PIXEL_FORMAT_RAW_SENSOR: + case HAL_PIXEL_FORMAT_RAW16: availableSizes = kAvailableRawSizes; availableSizeCount = sizeof(kAvailableRawSizes)/sizeof(uint32_t); break; @@ -412,7 +412,7 @@ int EmulatedFakeCamera2::allocateStream( } switch (format) { - case HAL_PIXEL_FORMAT_RAW_SENSOR: + case HAL_PIXEL_FORMAT_RAW16: if (mRawStreamCount >= kMaxRawStreamCount) { ALOGE("%s: Cannot allocate another raw stream (%d already allocated)", __FUNCTION__, mRawStreamCount); @@ -523,7 +523,7 @@ int EmulatedFakeCamera2::releaseStream(uint32_t stream_id) { } switch(mStreams.valueAt(streamIndex).format) { - case HAL_PIXEL_FORMAT_RAW_SENSOR: + case HAL_PIXEL_FORMAT_RAW16: mRawStreamCount--; break; case HAL_PIXEL_FORMAT_BLOB: @@ -2116,7 +2116,7 @@ status_t EmulatedFakeCamera2::constructStaticInfo( lensPosition[1] = 20; lensPosition[2] = 0; } - ADD_OR_SIZE(ANDROID_LENS_POSITION, lensPosition, sizeof(lensPosition)/ + ADD_OR_SIZE(ANDROID_LENS_POSE_TRANSLATION, lensPosition, sizeof(lensPosition)/ sizeof(float)); // android.sensor diff --git a/camera/EmulatedFakeCamera3.cpp b/camera/EmulatedFakeCamera3.cpp index fe07a25..7bd216a 100644 --- a/camera/EmulatedFakeCamera3.cpp +++ b/camera/EmulatedFakeCamera3.cpp @@ -54,7 +54,7 @@ const int64_t MSEC = USEC * 1000LL; const int64_t SEC = MSEC * 1000LL; const int32_t EmulatedFakeCamera3::kAvailableFormats[5] = { - HAL_PIXEL_FORMAT_RAW_SENSOR, + HAL_PIXEL_FORMAT_RAW16, HAL_PIXEL_FORMAT_BLOB, HAL_PIXEL_FORMAT_RGBA_8888, HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, @@ -1076,7 +1076,7 @@ status_t EmulatedFakeCamera3::constructStaticInfo() { lensPosition[1] = 20; lensPosition[2] = 0; } - info.update(ANDROID_LENS_POSITION, lensPosition, sizeof(lensPosition)/ + info.update(ANDROID_LENS_POSE_TRANSLATION, lensPosition, sizeof(lensPosition)/ sizeof(float)); // android.sensor diff --git a/camera/fake-pipeline2/Sensor.cpp b/camera/fake-pipeline2/Sensor.cpp index aa54ef4..594a060 100644 --- a/camera/fake-pipeline2/Sensor.cpp +++ b/camera/fake-pipeline2/Sensor.cpp @@ -323,7 +323,7 @@ bool Sensor::threadLoop() { i, b.streamId, b.width, b.height, b.format, b.stride, b.buffer, b.img); switch(b.format) { - case HAL_PIXEL_FORMAT_RAW_SENSOR: + case HAL_PIXEL_FORMAT_RAW16: captureRaw(b.img, gain, b.stride); break; case HAL_PIXEL_FORMAT_RGB_888: |