diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-02-20 17:43:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-20 17:43:36 +0000 |
| commit | ea1acdae6548e2afe1ceb74b6c177b22ad0d25c4 (patch) | |
| tree | 9484bdb150cf9f28aa009b4d00673dbd3a03f3cd | |
| parent | 794654f545aaf5b84d2249072284ddfc084afa08 (diff) | |
| parent | b30540c189f3e7d2bd77c783ecf50647921d3afd (diff) | |
| download | android_device_generic_goldfish-ea1acdae6548e2afe1ceb74b6c177b22ad0d25c4.tar.gz android_device_generic_goldfish-ea1acdae6548e2afe1ceb74b6c177b22ad0d25c4.tar.bz2 android_device_generic_goldfish-ea1acdae6548e2afe1ceb74b6c177b22ad0d25c4.zip | |
Merge "Replace HAL_PIXEL_FORMAT_RAW_SENSOR with RAW_16"
| -rw-r--r-- | camera/EmulatedFakeCamera2.cpp | 8 | ||||
| -rw-r--r-- | camera/fake-pipeline2/Sensor.cpp | 2 | ||||
| -rw-r--r-- | opengl/system/gralloc/gralloc.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/camera/EmulatedFakeCamera2.cpp b/camera/EmulatedFakeCamera2.cpp index 844a71e..cbc67ed 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: 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: diff --git a/opengl/system/gralloc/gralloc.cpp b/opengl/system/gralloc/gralloc.cpp index 059bf12..9659e3d 100644 --- a/opengl/system/gralloc/gralloc.cpp +++ b/opengl/system/gralloc/gralloc.cpp @@ -211,7 +211,7 @@ static int gralloc_alloc(alloc_device_t* dev, glFormat = GL_RGB; glType = GL_UNSIGNED_SHORT_5_6_5; break; - case HAL_PIXEL_FORMAT_RAW_SENSOR: + case HAL_PIXEL_FORMAT_RAW16: bpp = 2; align = 16*bpp; if (! ((sw_read || hw_cam_read) && (sw_write || hw_cam_write) ) ) { |