57 Commits

Author SHA1 Message Date
Wu-cheng Li
086dddb3b5 Correct the spelling of posterize. 2009-07-23 17:37:12 -07:00
Wu-cheng Li
a196c4b99a am b48ad0f5: Make sure shutter callback is called before raw callback.
Merge commit 'b48ad0f59d93638adca58c60fbe667472de822f3'

* commit 'b48ad0f59d93638adca58c60fbe667472de822f3':
  Make sure shutter callback is called before raw callback.
2009-07-21 00:29:05 -07:00
Wu-cheng Li
a21ec0f3d3 Make sure shutter callback is called before raw callback. 2009-07-21 15:16:33 +08:00
Wu-cheng Li
11b42800f7 am 841ca492: Remove unsupported white balance and effect options.
Merge commit '841ca492ca5fc5f97e1bc8f7060b778b02382cf9'

* commit '841ca492ca5fc5f97e1bc8f7060b778b02382cf9':
  Remove unsupported white balance and effect options.
2009-07-20 03:39:05 -07:00
Wu-cheng Li
3e4574a187 Remove unsupported white balance and effect options. 2009-07-20 18:26:19 +08:00
Wu-cheng Li
9259fbeee0 am 0426b944: 1. Remove the zoom and brightness. 2. Set default value of antibanding, effect, and white-balance at initialization. 3. Do not set the parameter if it is not found.
Merge commit '0426b944de778822f49d4902ffc9650cbc19b4dc'

* commit '0426b944de778822f49d4902ffc9650cbc19b4dc':
  1. Remove the zoom and brightness.
2009-07-17 13:58:19 -07:00
Wu-cheng Li
bcb33e4db8 1. Remove the zoom and brightness.
2. Set default value of antibanding, effect, and white-balance at initialization.
3. Do not set the parameter if it is not found.
2009-07-17 16:25:16 +08:00
Rebecca Schultz Zavin
16cddff7d9 Change libcamera to load the vendor camera library by the new name, liboemcamera instead of libqcamera.
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
2009-07-16 14:09:35 -07:00
Chih-Chung Chang
9419711dad am db09771c: Fix 1956740: startPreview failed
Merge commit 'db09771cf93d6a82cadca93da4f86d26bd4163c0'

* commit 'db09771cf93d6a82cadca93da4f86d26bd4163c0':
  Fix 1956740: startPreview failed
2009-07-13 04:57:47 -07:00
Chih-Chung Chang
bb05604b8d Fix 1956740: startPreview failed
The problem is even after release() is done, the singleton
variable is not cleared, so a new openCameraHardware()
call could return an instance which is already released.

The singleton variable is cleared in the destructor, so
we wait until that happens in openCameraHardware().
2009-07-13 19:50:11 +08:00
James Dong
33276093a2 am be125559: The antibanding (60Hz) broke the bar code scanner. bug 1962986
Merge commit 'be125559561e66c1ed080dc6aca8fd9fd642b030'

* commit 'be125559561e66c1ed080dc6aca8fd9fd642b030':
  The antibanding (60Hz) broke the bar code scanner.
2009-07-12 21:56:09 -07:00
James Dong
dbdbc0d26c The antibanding (60Hz) broke the bar code scanner.
bug 1962986
2009-07-10 17:24:24 -07:00
Dave Sparks
128a305307 am 346ac60d: Add timestamps to video frames to improve A/V sync. Bug 1927069.
Merge commit '346ac60d65b406ef102c9f471f87a90b056a1efc'

* commit '346ac60d65b406ef102c9f471f87a90b056a1efc':
  Add timestamps to video frames to improve A/V sync.
2009-07-08 17:29:53 -07:00
Dave Sparks
12b41c417f Add timestamps to video frames to improve A/V sync.
Bug 1927069.
2009-07-08 15:58:41 -07:00
Wu-cheng Li
01bb426299 am 9280fbfe: Change the timing of shutter callback.
Merge commit '9280fbfee740ffff86673f5d0887d46dd134cc17'

* commit '9280fbfee740ffff86673f5d0887d46dd134cc17':
  Change the timing of shutter callback.
2009-07-06 11:21:55 -07:00
Wu-cheng Li
04b2c40f3c Change the timing of shutter callback. 2009-07-03 16:33:45 +08:00
Iliyan Malchev
7d63e73006 am bda01917: libcamera: set antibanding to 60Hz, use cropping information on snapshot
Merge commit 'bda01917a432b68a25d54839eb6f3da949f388bb'

* commit 'bda01917a432b68a25d54839eb6f3da949f388bb':
  libcamera: set antibanding to 60Hz, use cropping information on snapshot
2009-07-01 22:44:34 -07:00
Iliyan Malchev
84a23831dd am c9949de5: libcamera: dlopen() libqcamera in the AF thread
Merge commit 'c9949de51b0f7d585bd4185ee1e682cc2a5cab8e'

* commit 'c9949de51b0f7d585bd4185ee1e682cc2a5cab8e':
  libcamera: dlopen() libqcamera in the AF thread
2009-07-01 00:06:51 -07:00
Iliyan Malchev
ad48d0f080 libcamera: set antibanding to 60Hz, use cropping information on snapshot
-- Set the antibanding to 60Hz for the US (Should be 50Hz for the
   rest of the world.)
-- Save the cropping info returned when taking a picture and then
   pass it to the JPEG encoder.  This enables digital zoom for JPEG
   images (cropping and upsampling).

Signed-off-by: Iliyan Malchev <malchev@google.com>
2009-06-30 16:10:20 -07:00
Iliyan Malchev
3c05a4483c libcamera: dlopen() libqcamera in the AF thread
Signed-off-by: Iliyan Malchev <malchev@google.com>
2009-06-29 13:09:24 -07:00
Wu-cheng Li
0e7e6b2cef am f00632c5: Add preview size 384x288.
Merge commit 'f00632c5be8f857fbb76644c852bf21610f624b3'

* commit 'f00632c5be8f857fbb76644c852bf21610f624b3':
  Add preview size 384x288.
2009-06-25 05:01:35 -07:00
Wu-cheng Li
9db8a0fc26 Add preview size 384x288. 2009-06-25 19:56:47 +08:00
Iliyan Malchev
044cd5b162 am 97f25b17: libcamera fixes
Merge commit '97f25b170171936184e43f6a96a334771f33d725'

* commit '97f25b170171936184e43f6a96a334771f33d725':
  libcamera fixes
2009-06-24 15:44:57 -07:00
Iliyan Malchev
3ba00f29ba libcamera fixes
-- general cleanup: made a bunch of functions static to
   QualcommCameraHardware.cpp, not class members; got rid of unnecessary
   private member variables.  The only functions that remain as members
   are native_set_dimension() and native_jpeg_encode()
-- removed kRawFrameHeaderSize; aDSP frame offsets are zero now;
-- simplify reg_unreg_buf
-- Removed PreviewPmemPool and RawPmemPool, which do not need to be
   specialized on top of PmemPool.  We use PmemPool instead.
-- use PmemPool to both create pmem pools and register them with the driver
-- takePicture runs in a separate thread
-- the destructor keeps a singleton lock
-- PmemPool calls dup() on the camera-control file descriptor to guard against
   release() calling close() on it before PmemPool has a chance to deregister
   pmem from the camera driver.
-- got rid of hal_mmap() and hal_munmap() entirely and created a PmemHeap to
   manage thumbnails.
-- removed support for CAPTURE_RAW.  The CameraService can already do this.

Signed-off-by: Iliyan Malchev <malchev@google.com>
2009-06-23 19:10:08 -07:00
Wu-cheng Li
e2639fac15 am 5cd6e44e: Add location to exif.
Merge commit '5cd6e44e2f5f718ee846cc5acbc230db7451d573'

* commit '5cd6e44e2f5f718ee846cc5acbc230db7451d573':
  Add location to exif.
2009-06-22 02:27:25 -07:00
Wu-cheng Li
321cfafbf5 Add location to exif. 2009-06-22 17:04:45 +08:00
Wu-cheng Li
188b3f7c62 am 39ae23b3: Add picture size values and fix effect values.
Merge commit '39ae23b3beeb0fb5649bb55f2dd4e3fe2343e938'

* commit '39ae23b3beeb0fb5649bb55f2dd4e3fe2343e938':
  Add picture size values and fix effect values.
2009-06-17 15:38:49 -07:00
Wu-cheng Li
2c2e8580d6 Add picture size values and fix effect values. 2009-06-17 19:03:42 +08:00
Wu-cheng Li
533e912361 am efaedb94: Get the values returned from CAMERA_GET_PARM_ZOOM correctly.
Merge commit 'efaedb948a67d90bc0a61fcdfd778e1ce5629e7f'

* commit 'efaedb948a67d90bc0a61fcdfd778e1ce5629e7f':
  Get the values returned from CAMERA_GET_PARM_ZOOM correctly.
2009-06-16 08:37:47 -07:00
Chih-Chung Chang
9a21ec683c am feb4e9a7: Enable more debug message to debug the Camera startPreview bug.
Merge commit 'feb4e9a7da6264007786b161ab6273ba08094570'

* commit 'feb4e9a7da6264007786b161ab6273ba08094570':
  Enable more debug message to debug the Camera startPreview bug.
2009-06-16 08:37:40 -07:00
Iliyan Malchev
261e53ebec am 384fc2db: libcamera2: update to match new libqcamera.so
Merge commit '384fc2db5ad3ec835b72dd84240a2552f84e2a52'

* commit '384fc2db5ad3ec835b72dd84240a2552f84e2a52':
  libcamera2: update to match new libqcamera.so
2009-06-16 08:35:57 -07:00
Wu-cheng Li
e610e2518d Get the values returned from CAMERA_GET_PARM_ZOOM correctly. 2009-06-16 19:46:34 +08:00
Chih-Chung Chang
105a7f6c76 Enable more debug message to debug the Camera startPreview bug. 2009-06-16 17:15:48 +08:00
Iliyan Malchev
9e7909b439 libcamera2: update to match new libqcamera.so
Signed-off-by: Iliyan Malchev <malchev@google.com>
2009-06-15 15:22:17 -07:00
Chih-Chung Chang
945ea689b5 am 31a2ffa6: Add set rotation function.
Merge commit '31a2ffa6ca0cc5ce6f389ac44799f92f0329cd74'

* commit '31a2ffa6ca0cc5ce6f389ac44799f92f0329cd74':
  Add set rotation function.
2009-06-15 02:55:37 -07:00
Chih-Chung Chang
4f48dacada Add set rotation function. 2009-06-15 17:00:23 +08:00
Chih-Chung Chang
3bcd703dac am 332a7c3c: Accept parameter "jpeg-thumbnail-quality" to specify thumbnail quality.
Merge commit '332a7c3c0fcc65d766208b901142ff924d8a7eda'

* commit '332a7c3c0fcc65d766208b901142ff924d8a7eda':
  Accept parameter "jpeg-thumbnail-quality" to specify thumbnail quality.
2009-06-15 00:34:56 -07:00
Chih-Chung Chang
93cde78899 Accept parameter "jpeg-thumbnail-quality" to specify thumbnail quality. 2009-06-15 15:32:20 +08:00
Wu-cheng Li
d5b245b737 am 7c51cb81: Cancel autofocus in stopPreview.
Merge commit '7c51cb81f6aa8030d893463cbc65c0e18e2a6956'

* commit '7c51cb81f6aa8030d893463cbc65c0e18e2a6956':
  Cancel autofocus in stopPreview.
2009-06-14 21:31:22 -07:00
Wu-cheng Li
2e8a9ddd4c Cancel autofocus in stopPreview. 2009-06-12 21:57:55 +08:00
James Dong
37c4d652b8 am 2697f855: Fix deadlock in camera hal when auto focus failed
Merge commit '2697f855be4d8b0bccbb3ba5bf1ae1547d2cf595'

* commit '2697f855be4d8b0bccbb3ba5bf1ae1547d2cf595':
  Fix deadlock in camera hal when auto focus failed
2009-06-11 01:02:50 -07:00
Iliyan Malchev
8dd361b496 am 0233cce1: libcamera: avoid a race condition on starting and stopping a recording
Merge commit '0233cce1fad9b150c93f80a06aeaac8de6da8cdf'

* commit '0233cce1fad9b150c93f80a06aeaac8de6da8cdf':
  libcamera: avoid a race condition on starting and stopping a recording
2009-06-11 00:45:16 -07:00
Iliyan Malchev
dcf86dca1a am 5fe5fdf8: libcamera: default brightness to 5 when not specified by camera
Merge commit '5fe5fdf8082f6ebde346d2a32c50d567dd3eeb5b'

* commit '5fe5fdf8082f6ebde346d2a32c50d567dd3eeb5b':
  libcamera: default brightness to 5 when not specified by camera
2009-06-11 00:45:14 -07:00
Iliyan Malchev
75767da3f7 am 4c9f9c81: remove floats from libcamera2
Merge commit '4c9f9c818223cc5ad0db63553796a54f29e959d1'

* commit '4c9f9c818223cc5ad0db63553796a54f29e959d1':
  remove floats from libcamera2
2009-06-11 00:45:06 -07:00
James Dong
c11ce4c954 Fix deadlock in camera hal when auto focus failed 2009-06-10 19:59:25 -07:00
Iliyan Malchev
32b7f2804e libcamera: avoid a race condition on starting and stopping a recording
precondition: preview is running
-- call startRecording()
-- a preview frame arrives, causing the record callback to be called, and then
   blocks on mRecordWait.wait()
-- call stopRecording(), which sets mReleasedRecordingFrame and signals
   mRecordWait;
-- call startRecording(), which clears mReleasedRecordingFrame;
-- receivePreviewFrame() wakes up, checks mReleasedRecordingFrame, and
   blocks again on mRecordWait.wait(), without having notified the client.

Signed-off-by: Iliyan Malchev <malchev@google.com>
2009-06-10 18:40:32 -07:00
Iliyan Malchev
ed604c67ee libcamera: default brightness to 5 when not specified by camera
Signed-off-by: Iliyan Malchev <malchev@google.com>
2009-06-10 18:33:50 -07:00
Iliyan Malchev
79003a001f am 9ef7ea7e: libcamera2: update the frame offset after we call the recording callback
Merge commit '9ef7ea7ef81ae46de84e660024a73047372cc133'

* commit '9ef7ea7ef81ae46de84e660024a73047372cc133':
  libcamera2: update the frame offset after we call the recording callback
2009-06-10 17:20:00 -07:00
Iliyan Malchev
f5e21dce16 remove floats from libcamera2
Signed-off-by: Iliyan Malchev <malchev@google.com>
2009-06-10 16:46:51 -07:00
Iliyan Malchev
59b25b06c8 libcamera2: update the frame offset after we call the recording callback
Signed-off-by: Iliyan Malchev <malchev@google.com>
2009-06-10 15:32:57 -07:00