| 5f0ef5fb0c2e65ca3d0aa4fcd2b300d4cd0a2b4b |
|
21-Sep-2011 |
Wu-cheng Li <wuchengli@google.com> |
Fix jpeg callback is lost if setPreviewCallbackWithBuffer has been called.
mManualBufferMode is only for CAMERA_MSG_PREVIEW_FRAME. If it is
CAMERA_MSG_COMPRESSED_IMAGE, a new byte array should be allocated.
bug:5340480
Change-Id: I4f33bd6297bfd30505e0e15ae46012ea44e85962
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| bb1e275c0e684dd213f124da77110cdd9d6f090c |
|
29-Jul-2011 |
Wu-cheng Li <wuchengli@google.com> |
Pass camera frame metadata from camera service to Java.
bug:4460717
Change-Id: I2fae6e1dfca6b8f3a5ee5716fc7817f5417bf657
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| f0d6a48c6ad852b84687127f14b1ffde02416dc4 |
|
27-Jul-2011 |
Wu-cheng Li <wuchengli@google.com> |
Add frame metadata parameter to camera data_callback.
bug:4460717
Change-Id: Ib47d7d7df20af8155a719f3dabefe030893bfebc
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| 4c2292efbbfe7338138a9a0e8eefeaabdef1a0b4 |
|
21-Jul-2011 |
Wu-cheng Li <wuchengli@google.com> |
Add camera face detection API.
API are still hidden.
bug:4460717
Change-Id: I1a515061f141a89bd61c875257712789fb15d2d4
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| 9c7ac0d142eaf4b083a309299ab023932a9bb109 |
|
15-Apr-2011 |
Iliyan Malchev <malchev@google.com> |
frameworks/base: include system/core header camera.h in Camera.h
We define struct CameraInfo in this camera/Camera.h, even though an identical
struct camera_info is defined in hardware/camera.h (but not in
hardware/camera_defs.h). We may not export struct definitions from the HAL
into headers which may find their way into the NDK.
This commit also renames FRAME_CALLBACK_FLAG_xxx to CAMERA_FRAME_CALLBACK_xxx.
Change-Id: I3e2ddd01d61bf5371ff2fc1a397995e0f1ee11f8
Signed-off-by: Iliyan Malchev <malchev@google.com>
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| 69a017bc1d1649350f830dfada5c6ed5eac0b770 |
|
08-Apr-2011 |
Elliott Hughes <enh@google.com> |
More JNI exception-throwing cleanup.
There are a few (unimportant) bug fixes here. There were several attempts to
throw exceptions in situations where there's already a pending exception.
There were also cases where the code was wrong; it was checking for a NULL
return from Get*ArrayElements and throwing NPE, but passing NULL is an error
that causes a crash and a NULL return means an exception has already been
thrown. I didn't want to get into the Scoped* classes just yet, but that
was by far the easiest way to fix this.
Change-Id: I0b31160ee51b96e82539f6514b8412b149dba7c3
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| e00cab707dcaf6f05adb5ccb9c80fdf25c483427 |
|
18-Feb-2011 |
James Dong <jdong@google.com> |
Application-managed callback buffer support for raw image
bug - 3292153
Change-Id: I9789f7c5cde3a3889d7375e881181e9152d95fc2
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| fd6f39e147dc077139a41b9c2a4039fbaa20224e |
|
20-Dec-2010 |
Jamie Gennis <jgennis@google.com> |
Enable camera preview to a SurfaceTexture.
This change adds a public Java API to use a SurfaceTexture as the
destination of camera preview frames.
Change-Id: If537fed2df12c5c181e2af5f817985c1bda853fb
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| 3fd5fa4ca9dbdd5be46ec2952c7038cdd59e35d5 |
|
16-Sep-2010 |
Wu-cheng Li <wuchengli@google.com> |
Fix the runtime restart due to name change.
bug:3001395
bug:3001399
Change-Id: I73fd1a63fea0807531b01ae2a754b32efffd41b1
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| b8bb78f54b48868465a9d69d65fda08524ab5ae1 |
|
10-Jun-2010 |
Chih-Chung Chang <chihchung@google.com> |
Change camera interface to support multiple cameras.
Change-Id: Ie88fe706d2278acf762eca87780de349434778a4
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| e25cc656392d8866e163f78b60c7791455d0fb44 |
|
06-May-2010 |
Chih-Chung Chang <chihchung@google.com> |
Support multiple cameras in framework.
Change-Id: I081f0fbdca4b633715ea7c3b3d42f8662d27598a
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| 8b138323d54e36fd66b22a634494648e20c53373 |
|
13-Apr-2010 |
Mathias Agopian <mathias@google.com> |
don't hardcode "mSurface" throughout our source code
this is used in a few places to get access to the android.view.Surface
native surface. use a macro instead. Also rename the field to mNativeSurface.
Change-Id: I1c6dea14abd6b8b1392c7f97b304115999355094
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| 0ca25191c663ef229f1f475b17899f2017ed6980 |
|
29-Mar-2010 |
Wu-cheng Li <wuchengli@google.com> |
Add some comments for zoom methods.
Also change RuntimeException to IllegalArgumentException.
bug:2458926
Change-Id: I87af31f5f3f10244131a1117bd1725c2d292b587
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| 000479f9e325b4e426a67033abd92d47da412725 |
|
10-Feb-2010 |
Mathias Agopian <mathias@google.com> |
split libsurfaceflinger_client and libcamera_client out of libui
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| f5dbf6a62af04af9e88c5552aa7eeffb0a2394a4 |
|
30-Jan-2010 |
Wu-cheng Li <wuchengli@google.com> |
Remove excessive logging.
bug:2346606
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| d1d7706fce19a9a0cf71ff9b65f3aba9b89eeb3b |
|
23-Jan-2010 |
Chih-Chung Chang <chihchung@google.com> |
Add support for setting camera display orientation.
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| f5d95cbc1a6974afeb4d3155bdaa8dae55722a39 |
|
08-Jan-2010 |
Joe Onorato <joeo@android.com> |
less log spew
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| c95a176d6f0aa48314d98f5c1f50821ac86137a7 |
|
04-Jan-2010 |
Dave Sparks <davidsparks@android.com> |
Remove some logging from camera operations. Bug 2346606.
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| 94927dffce1626898b59579dfc5af53b5de8cef6 |
|
20-Oct-2009 |
Andrew Harp <andrewharp@google.com> |
Patching in hidden API to allow app managed preview frame buffers.
Commit-Id: If3c30fc932697afa966cc97b17749e9996de92ee
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| 36f68b8f24df906c969581b0b8e1a47f95dc03cb |
|
29-Sep-2009 |
Wu-cheng Li <wuchengli@google.com> |
Add zoom functions and sendCommand.
b2060030
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| 6157de0e2d87568d6d5071b11aeb033a7986b279 |
|
25-Sep-2009 |
Chih-Chung Chang <chihchung@google.com> |
Fix 2101425: Camera crashes spontaneously in preview.
The problem is we missed an "obj" parameter while calling
postEventFromNative (which put it in a field of a Message object),
so a garbage value on stack is used.
When the GC tries to follow that "obj" field, expecting to find
another object, it crashes.
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| ffe1cf251a4f8469695b8acfa37270684dc1b70c |
|
10-Sep-2009 |
Wu-cheng Li <wuchengli@google.com> |
Unhide Camera lock and unlock API.
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| 244f8c26365a303d9dd861bd48a29a4b48578da1 |
|
15-Sep-2009 |
Chih-Chung Chang <chihchung@google.com> |
Fix 2083478: Camera needs an auto-focus cancel API
Change-Id: I13bda991b32aee47e82b5cf9d43b3021c416a9a2
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| 4b5a8f84b107a34a8030be2d3f3a5793d8e0ccce |
|
21-Jul-2009 |
Dave Sparks <davidsparks@android.com> |
am da57856d: Add logging to help track down intermittent bug
Merge commit 'da57856d749457e495bd860c4ff45aaaf87c9dab'
* commit 'da57856d749457e495bd860c4ff45aaaf87c9dab':
Add logging to help track down intermittent bug
|
| da57856d749457e495bd860c4ff45aaaf87c9dab |
|
21-Jul-2009 |
Dave Sparks <davidsparks@android.com> |
Add logging to help track down intermittent bug
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| 0d4586d326a60052503619076d143e73e5780ac7 |
|
14-Jul-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 9181bc9a: Merge change 7079 into donut
Merge commit '9181bc9ab75f97f11f2188237ba4a0f31569dfb5'
* commit '9181bc9ab75f97f11f2188237ba4a0f31569dfb5':
Cleanup of unused enums
|
| 8978bd01744f39270b6a193187dbb231f761e874 |
|
14-Jul-2009 |
Dave Sparks <davidsparks@android.com> |
Cleanup of unused enums
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| 02035132ffb6a37d8ec573df7199ed055e733bd0 |
|
13-Jul-2009 |
Dave Sparks <davidsparks@android.com> |
am c4ca4206: Fix build
Merge commit 'c4ca420625183a8efa619e06287b47f3d2e72283'
* commit 'c4ca420625183a8efa619e06287b47f3d2e72283':
Fix build
|
| c4ca420625183a8efa619e06287b47f3d2e72283 |
|
13-Jul-2009 |
Dave Sparks <davidsparks@android.com> |
Fix build
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| e3ea663686d42477e8b7585e2e3681a6ffd8d81a |
|
13-Jul-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 8ceba810: Merge change 6871 into donut
Merge commit '8ceba810d5a5831544790e18ed05eeed7e2fa994'
* commit '8ceba810d5a5831544790e18ed05eeed7e2fa994':
Use SetByteArrayRegion to minimize copy overhead and JNI calls.
|
| b4424782f943fd459e9a10d0f41c0ff252840ac6 |
|
12-Jul-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 086bd7fe: Merge change 6846 into donut
Merge commit '086bd7fed122f636e210b03eb114051a489f347b'
* commit '086bd7fed122f636e210b03eb114051a489f347b':
Avoid memcpy's by using GetPrimitiveArrayCritical.
|
| a95f495f75d0516ad48576500f64a3ffea037af8 |
|
11-Jul-2009 |
Dave Sparks <davidsparks@android.com> |
Use SetByteArrayRegion to minimize copy overhead and JNI calls.
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| 75acd896483b65ffd6cd445201b9cdcfa201ad78 |
|
11-Jul-2009 |
Dave Sparks <davidsparks@android.com> |
Avoid memcpy's by using GetPrimitiveArrayCritical.
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| 6698d16b951370a0cc6aa87bcd2ca91122a57410 |
|
09-Jul-2009 |
Dave Sparks <davidsparks@android.com> |
resolved conflicts for merge of 04c7d0f8 to master
|
| 59c1a935295cb30c2ba2f759855e89c174b42a07 |
|
09-Jul-2009 |
Dave Sparks <davidsparks@android.com> |
Add timestamps to video frames to improve A/V sync.
Bug 1927069.
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| fee47b699f51e52d3551c0fdbcc9fc2760a0d837 |
|
06-Jul-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am c7396025: Merge change 6084 into donut
Merge commit 'c7396025e59524e7ef639fd86fc23123939ee91c'
* commit 'c7396025e59524e7ef639fd86fc23123939ee91c':
Return CAMERA_ERROR_SERVER_DIED to camera app when camera service dies (bug 1956726)
|
| a1b653d41df9a7999e1dba2a508295671ff6771d |
|
02-Jul-2009 |
James Dong <jdong@google.com> |
Return CAMERA_ERROR_SERVER_DIED to camera app when camera service dies (bug 1956726)
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| 1b4308996483bb02c105fee18d32ef3db1e62a74 |
|
02-Jul-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am b1a97523: Merge change 5739 into donut
Merge commit 'b1a975234112cb98ddd5a3ff5f991007eecaff2e'
* commit 'b1a975234112cb98ddd5a3ff5f991007eecaff2e':
Check to make sure the Java camera object is still valid on the
|
| 0795684839b60fc5e7edb14c301e7797b6645d05 |
|
01-Jul-2009 |
Wu-cheng Li <wuchengli@google.com> |
am b8a10fe4: Allow setPreviewDisplay after startPreview.
Merge commit 'b8a10fe45657f2dcc50cae8a06805f8438a6937e'
* commit 'b8a10fe45657f2dcc50cae8a06805f8438a6937e':
Allow setPreviewDisplay after startPreview.
|
| d0cbb1a52d1b2b8b04a122501d696938b295e502 |
|
30-Jun-2009 |
Dave Sparks <davidsparks@android.com> |
Check to make sure the Java camera object is still valid on the
callback from native. Omitted from previous fix. Bug 1936850.
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| b8a10fe45657f2dcc50cae8a06805f8438a6937e |
|
23-Jun-2009 |
Wu-cheng Li <wuchengli@google.com> |
Allow setPreviewDisplay after startPreview.
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| 6034cb565c3b3ffb21057851cff179e2d5cb56a9 |
|
30-Jun-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 17a80081: Merge change 5544 into donut
Merge commit '17a80081a42410f541a220ab7e6afc64fc6cc399'
* commit '17a80081a42410f541a220ab7e6afc64fc6cc399':
Pipe all the camera callbacks to Java to facilitate the addition
|
| c62f9bd13327937aa2d2f20b44215397120634c1 |
|
26-Jun-2009 |
Dave Sparks <davidsparks@android.com> |
Pipe all the camera callbacks to Java to facilitate the addition
of new features. This will make it easy to add things like zoom
callbacks without modifying the entire camera stack.
Bug 1837832.
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| 2387208c9ecb5dba01bd933312c80c5133bd3c41 |
|
24-Jun-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 3d7b8d1a: Merge change 5158 into donut
Merge commit '3d7b8d1aa6a362292f56defbe8fb2d5653f79282'
* commit '3d7b8d1aa6a362292f56defbe8fb2d5653f79282':
Use a ref-counted callback interface for Camera.
|
| 5e27115995c4506dddf4f1271effd4fb4c935ad3 |
|
24-Jun-2009 |
Dave Sparks <davidsparks@android.com> |
Use a ref-counted callback interface for Camera.
This allows the camera service to hang onto the callback interface
until all callbacks have been processed. This prevents problems
where pending callbacks in binder worker threads are processed
after the Java camera object and its associated native resources
have been released.
Bug 1884362
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| af08ee3eaa7e38ea7e26526b5684f66a3ad75d3b |
|
10-Jun-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 3b277c70: Merge change 3702 into donut
Merge commit '3b277c700e6907ee0813839604ac60df2141c557'
* commit '3b277c700e6907ee0813839604ac60df2141c557':
Change exceptions to RuntimeException.
Fix the way gestures are rasterized to bitmaps.
|
| ba55b3654b3eb4b9ab340b4635c4400a4c66237c |
|
10-Jun-2009 |
Wu-cheng Li <wuchengli@google.com> |
Change exceptions to RuntimeException.
This is to follow hardware/Cmaera.java because those exceptiones are not declared to be thrown.
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| 0795272aa226f4e965968a03daddc53ce30b7cda |
|
20-May-2009 |
Mathias Agopian <mathias@google.com> |
move libbinder's header files under includes/binder
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| fa3e5562793c5bd7d4513a9e1a5869e763a47ab5 |
|
04-May-2009 |
Wu-cheng Li <wuchengli@google.com> |
Change error message.
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| 9066cfe9886ac131c34d59ed0e2d287b0e3c0087 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| d83a98f4ce9cfa908f5c54bbd70f03eec07e7553 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| 076357b8567458d4b6dfdcf839ef751634cd2bfb |
|
03-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@132589
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| 3dec7d563a2f3e1eb967ce2054a00b6620e3558c |
|
03-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@137055
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| 3001a035439d8134a7d70d796376d1dfbff3cdcd |
|
19-Feb-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@132276
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| d24b8183b93e781080b2c16c487e60d51c12da31 |
|
11-Feb-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@130745
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| 22f7dfd23490a3de2f21ff96949ba47003aac8f8 |
|
20-Jan-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@127101
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| b798689749c64baba81f02e10cf2157c747d6b46 |
|
10-Jan-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@125939
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| f013e1afd1e68af5e3b868c26a653bbfb39538f8 |
|
18-Dec-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Code drop from //branches/cupcake/...@124589
/frameworks/base/core/jni/android_hardware_Camera.cpp
|
| 54b6cfa9a9e5b861a9930af873580d6dc20f773c |
|
21-Oct-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Initial Contribution
/frameworks/base/core/jni/android_hardware_Camera.cpp
|