LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,029 Commits 2 Branches 0 Tags
c4ae6ea167225a609366f8fa25e95ed1b36a79f2
Commit Graph

68 Commits

Author SHA1 Message Date
Eino-Ville Talvala
cc588adda3 EmulatedFakeCamera2: Implement basic dump() 
Bug: 6243944
Change-Id: I84696ea79f8c36d34c2cccdac259c9baba048c1f
 2012-06-14 10:52:04 -07:00
Eino-Ville Talvala
e26e64f2de EmulatedFakeCamera2: Add support for JPEG output, multiple streams 
Required to support Camera.takePicture()

Bug: 6243944
Change-Id: I60d7a161a7037c25428eac5a6f9327aff47da584
 2012-06-13 12:08:28 -07:00
Eino-Ville Talvala
423650c32c EmulatedFakeCamera2: Minor fixes 
- Add some error checking
- Change default exposure/gain to avoid overexposure.
- Improve gain calculation for RGBA output

Bug: 6243944
Change-Id: Iaa9f35e0b62883a947cc9e63f86d0ec3ae828576
 2012-06-08 09:52:38 -07:00
Eino-Ville Talvala
c7bb6cf132 EmulatedFakeCamera2: Add opaque stream output support 
- Enables basic preview
- Opaque is RGBA for emulator
- Still only 1 stream max
- Preparations for YUV output support

Bug: 6243944
Change-Id: I11cb494d72c7c2ec5f542c79f1aa15d9a3ce00bf
 2012-05-22 10:38:56 -07:00
Eino-Ville Talvala
7b906a7ca9 EmulatedFakeCamera2: Add more static metadata 
- Add entries for all metadata
- Use better idiom for static metadata construction
- Revise dynamic and static metadata
  - New resolution reporting
  - Minor revision to some enums
- Quiet excess logging

Bug: 6243944
Change-Id: I0558d7d60ae97d2df9e209f24c1e04330737c220
 2012-05-21 14:10:25 -07:00
Eino-Ville Talvala
366eef524c EmulatedCamera2: Be more const, like the HAL. 
Bug: 6243944
Change-Id: I01f67c22b6e54dc49f22c6bc2c665b1db4ff6680
 2012-05-20 17:04:27 -07:00
Eino-Ville Talvala
ab463b3ece EmulatedFakeCamera2: Support construct_default_request HAL method. 
Bug: 6243944

Change-Id: I888fefae0b08532862171323774808cf241cdad1
 2012-05-15 14:56:54 -07:00
Eino-Ville Talvala
bb54bb03ec EmulatedFakeCamera2: Update to match camera_metadata changes 
Bug: 6243944
Change-Id: I3ff301829827b7e694c371efe7915667d9a66493
 2012-05-14 18:08:18 -07:00
Eino-Ville Talvala
7479f77186 Merge "Add minimal operation to new fake camera emulator." 2012-05-14 18:03:37 -07:00
Eino-Ville Talvala
61fbf61670 Add minimal operation to new fake camera emulator. 
- Rework to match latest camera 2 HAL.

- Somewhat realistic scene lighting simulation, for allowing a
  realistic range of exposure and gain values.

- Supports raw Bayer sensor data only, at 640x480

- Only one stream configurable

- No support for reprocessing, 3A, flash, YUV, JPEG, etc

Bug: 6243944
Change-Id: I14fbad58ffeff37162c56d9daff7e4f75ab879c3
 2012-05-10 16:23:28 -07:00
Jean-Michel Trivi
cb62e8bf28 Add FLAC encoder to the list of media codecs. 
Bug 5525503

Change-Id: I2326bfec38dbbb641d8c32f5dee98da9da6c3a83
 2012-05-09 15:54:27 -07:00
James Dong
d71b64f6c1 Added software mpeg4 and h263 video encoder to sdk/emulator build 
o related-to-bug: 6401068

Change-Id: If0711b68e1f6be88b123fc8117be970c87bc1d8f
 2012-04-25 18:12:43 -07:00
James Dong
1632bc614d Added software h264 video encoder for emulator/sdk build 
o related-to-bug: 6383440

Change-Id: I0abf595cd1cabd0be6d05bc9250c90300149f16b
 2012-04-25 13:51:56 -07:00
Eino-Ville Talvala
0819e42a0b Add skeleton implementation of a fake v2 camera device. 
Change-Id: Idd2485064548a6036ea318680065b7429463d9cd
 2012-04-17 10:05:17 -07:00
Eddy Talvala
3cd661a616 Merge "Revert "Revert "Multi-project commit, other commits weren't ready after all. (Revert)""" 2012-04-17 09:14:00 -07:00
Eddy Talvala
ee16c8342b Revert "Revert "Multi-project commit, other commits weren't ready after all. (Revert)"" 
This reverts commit a1e84accb5
 2012-04-17 09:12:39 -07:00
Eddy Talvala
0ef6f51e59 Merge "Revert "Multi-project commit, other commits weren't ready after all. (Revert)"" 2012-04-17 08:57:47 -07:00
Eddy Talvala
a1e84accb5 Revert "Multi-project commit, other commits weren't ready after all. (Revert)" 
This reverts commit f3785f1414
 2012-04-05 18:06:40 -07:00
Eddy Talvala
a5a83d57e7 Merge "Multi-project commit, other commits weren't ready after all." 2012-04-05 16:47:59 -07:00
Eddy Talvala
f3785f1414 Multi-project commit, other commits weren't ready after all. 
Revert "Add skeleton implementation of a fake v2 camera device."

This reverts commit 5a35e724fc
 2012-04-05 16:45:02 -07:00
Eino-Ville Talvala
ea52f4fab4 Merge "Add skeleton implementation of a fake v2 camera device." 2012-04-05 16:30:20 -07:00
Eino-Ville Talvala
5a35e724fc Add skeleton implementation of a fake v2 camera device. 
Change-Id: I46df945117adef8d5c03846b1dd29435fa4c7d46
 2012-04-05 16:04:29 -07:00
Eino-Ville Talvala
5318919f7f Camera emulator: Add timestamps to PreviewWindow output. 
Change-Id: Ib0006fa98abebcc8ffa4b496a3bdd86b11e6c9be
 2012-04-05 15:45:55 -07:00
Eino-Ville Talvala
d6a3832650 Update emulated camera to support HAL v2.0 modules and devices. 
- Update camera HAL module to version 2

- Break out common camera HAL device functionality into
  EmulatedBaseCamera

- EmulatedCamera is now the base class for all version 1 camera
  devices.

- No camera device version 2 implementation included.

No change to supported functionality.

Change-Id: Iabb0b9a4e41f3c01dfd921256fa8fb1d40d71834
 2012-03-27 16:40:12 -07:00
Vladimir Chtchetkine
c9d6edeea5 Change camera HAL to catch up with changes in emulator. 
Emulator now allows fake camera to emulate both, back and front cameras at the same time.
Camera HAL is changed in this CL in order to support this.

Change-Id: I4dcf2d569bb0c6a3800b4a8da5edd4777b5a078a
 2012-03-19 13:34:28 -07:00
James Dong
7803a1db5b Merge "Switched to use header files in /frameworks/native" 2012-03-13 12:44:43 -07:00
Andreas Huber
bd7ef3835c Merge "We're configuring media codecs dynamically now." 2012-03-13 09:01:32 -07:00
James Dong
27b71c7383 Switched to use header files in /frameworks/native 
o related-to-bug: 6044887

Change-Id: Iea98db35e51aaf52063565818ecfea8a935693f3
 2012-03-12 20:37:02 -07:00
Derek Sollenberger
a96af3f6f8 am 3565ea1a: am 89e98da5: am a848b972: am 89b7a104: Merge "Add missing includes for threads.h" 
* commit '3565ea1a6ecccc59839d883ee74fc4ba83f4ab02':
  Add missing includes for threads.h
 2012-03-08 11:34:13 -08:00
Derek Sollenberger
94548b6323 Add missing includes for threads.h 
The missing headers were being transitively included through a
Skia header which is being removed.

Change-Id: I6a5b26c1f1bb3ed4c65e7e39fff3b927cb14eabf
 2012-03-06 10:13:19 -05:00
Andreas Huber
e01feb2d89 We're configuring media codecs dynamically now. 
Change-Id: I55dcc3a9976f6db8f9fc10bf1b33068b1b26d339
 2012-03-01 11:48:12 -08:00
Steve Block
5a622cba8c Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: Ic6cac56d137f705dfa7266f21e9b0269219bd5d1
 2012-01-09 10:39:43 +00:00
Steve Block
6aff44c27e Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/157065

Bug: 5449033
Change-Id: I03c41e20d8f5d7f3c7ef1f01506885e3e250e921
 2012-01-06 10:06:41 +00:00
Steve Block
112bc5e57e Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/156016

Bug: 5449033
Change-Id: Ia14c98936bb1dc74e681bf2de342ad6861646778
 2012-01-03 22:29:55 +00:00
Jean-Baptiste Queru
a98b9f28b1 Revert "Revert "Update the media_profiles.xml file to include..."" 
This reverts commit 2400b2c340.

Change-Id: I017f4a212ff34478e498513a6b8c0da2e7c0f27e
 2011-12-09 13:13:25 -08:00
Vladimir Chtchetkine
031b92f4c7 Pass white balance and exposure compensation to webcam emulator 
Using fake camera implementation for WB/exposure, implement the same functionality
on frames comming from webcam emulator. Note that due to heavy computations that
are involved in implementing this, we will do all that math in the emulator
application in order to provide a decent performance.

Change-Id: Id6c37b472860674c91e6ca37522fc61f497515a3
 2011-12-05 09:16:23 -08:00
Xavier Ducrohet
6038109394 am 2400b2c3: Revert "Update the media_profiles.xml file to include..." do not merge. 
* commit '2400b2c3402e6585437274f8acd5fd6e32367bb3':
  Revert "Update the media_profiles.xml file to include..."  do not merge.
 2011-11-23 14:41:05 -08:00
Xavier Ducrohet
2400b2c340 Revert "Update the media_profiles.xml file to include..." do not merge. 
This reverts commit a8fe85ea64.
 2011-11-23 14:36:58 -08:00
Vladimir Chtchetkine
9a1a290e58 am fd1bdd61: Update supported frame sizes for fake camera. do not merge. 
* commit 'fd1bdd611a2954bfb171548b8fa288b0319a0aa9':
  Update supported frame sizes for fake camera. do not merge.
 2011-11-23 14:04:29 -08:00
James Dong
a8fe85ea64 Update the media_profiles.xml file to include maximum memory usage support for video editor. do not merge. 
related-to-bug: 5625690

(cherry picked from commit f8781452d9)

Change-Id: Id27eb9052f00328ba04bac8486c9ed23f3c6a09b
 2011-11-23 13:14:50 -08:00
Vladimir Chtchetkine
fd1bdd611a Update supported frame sizes for fake camera. do not merge. 
Camera framework requires 352x288, and 320x240 frames for video preview and video
recording. If these dimensions are missing in camera properties the camera app
may abort when entering video mode, or start video recording.

Also truned off switching fake frames, leaving only the checker board.

(cherry picked from commit 6f00e7fc48)

Change-Id: Ic50225e1700ea3b04ae5445549548f2ffe4ae2df
 2011-11-23 13:14:16 -08:00
Vladimir Chtchetkine
6f00e7fc48 Update supported frame sizes for fake camera 
Camera framework requires 352x288, and 320x240 frames for video preview and video
recording. If these dimensions are missing in camera properties the camera app
may abort when entering video mode, or start video recording.

Also truned off switching fake frames, leaving only the checker board.

Change-Id: I63d145c967f1ba83992141ec97700f094a9d53a7
 2011-11-22 15:15:57 -08:00
James Dong
43a67b48c2 am b62c5b91: am f8781452: Update the media_profiles.xml file to include maximum memory usage support for video editor 
* commit 'b62c5b9156d589ea8aaa6c441530b2ef371f1915':
  Update the media_profiles.xml file to include maximum memory usage support for video editor
 2011-11-17 07:48:19 -08:00
James Dong
f8781452d9 Update the media_profiles.xml file to include maximum memory usage support for video editor 
Change-Id: I26eacaaca76b72fc5a43ee8fabacf62060418edd
related-to-bug: 5625690
 2011-11-16 14:37:49 -08:00
Steve Block
629719e390 Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/#/c/143865

Bug: 5449033
Change-Id: Iad3a485eed0dc273d66607d30a7b9b79b02c03b6
 2011-10-25 18:24:59 +01:00
Christine Chen
12c0b21abe Added white balance settings to the camera Emulator. 
- Added the white balance control to the fake camera.

Change-Id: I5ada253a3ae7195ca5625a3601c9e4ed819fa2cc
 2011-10-20 17:49:35 -07:00
Vladimir Chtchetkine
f7f6886820 Cherry picked from c9a94b0f in master. Do not merge. 
Implement CAMERA_MSG_PREVIEW_FRAME callback

Also does better work detecting pixel format for video frames, depending on the
mode that camera is intended to be operated with.

Change-Id: Idb2dfc7c0a79e81eff58f83a14af769afc713096
 2011-10-18 12:32:24 -07:00
Vladimir Chtchetkine
caa1aeafba Implement CAMERA_MSG_PREVIEW_FRAME callback 
Also does better work detecting pixel format for video frames, depending on the
mode that camera is intended to be operated with.

Change-Id: I352204b8d6d1a9e7857d77b6363de2bb5d5db0dd
 2011-10-17 12:56:54 -07:00
Christine Chen
366396d9b0 Added exposure compensation control for the fake camera. 
Change-Id: I10bc16d9d521f82e12ff335eed29465ac08b5595
 2011-10-14 15:14:36 -07:00
Vladimir Chtchetkine
e466a63ab4 Include correct endian.h file 
Apparently including sys/endian.h directly produces uninitialized endianness macros.
Should include target CPU-dependent header instead.

Change-Id: Ib16f0470d27baa085bf1675a403c02efa6f994c4
 2011-09-27 15:41:12 -07:00