summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* Fix theoretical memory leak in mConfigEventsGlenn Kasten2013-07-172-0/+7
| | | | Change-Id: I137f70676c8919661e716c33e0dd9c25c2b6285c
* Merge "Fix indentation"Glenn Kasten2013-07-171-74/+74
|\
| * Fix indentationGlenn Kasten2013-07-101-74/+74
| | | | | | | | Change-Id: Ia28720a7d0fad8cf110c2448b967d5648d42e017
* | Merge "Add comments"Glenn Kasten2013-07-172-1/+9
|\ \
| * | Add commentsGlenn Kasten2013-07-102-1/+9
| |/ | | | | | | Change-Id: Ifbf3a46a4183c8abc0feee1c588953ab10303cc1
* | Merge "always pass the BufferQueue explicitely to consumers"Mathias Agopian2013-07-165-5/+10
|\ \
| * | always pass the BufferQueue explicitely to consumersMathias Agopian2013-07-125-5/+10
| | | | | | | | | | | | Change-Id: Ic2d9a9cf184a482b3c78a481ed693ee32df5ca13
* | | camera2: Implement ICameraDeviceUser::getCameraInfoIgor Murashkin2013-07-152-13/+6
|/ / | | | | | | | | Bug: 9529161 Change-Id: I927e39c124cd5fb19e38423506f4463acc381cb0
* | Merge "Pass additional arg to acquireBuffer calls."Andy McFadden2013-07-113-4/+4
|\ \
| * | Pass additional arg to acquireBuffer calls.Andy McFadden2013-07-083-4/+4
| | | | | | | | | | | | | | | | | | Bug 7900302 Change-Id: I30b9cca783e0a48f77035b745b7d5e20edf10f27
* | | am adaa78c9: am a2520db0: camera2/3: set preview callback oneshot flag ↵Zhijun He2013-07-111-0/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | during still capture * commit 'adaa78c901a2f2509965b7acc1cde848dfc6bafe': camera2/3: set preview callback oneshot flag during still capture
| * | am a2520db0: camera2/3: set preview callback oneshot flag during still captureZhijun He2013-07-091-0/+1
| |\ \ | | | | | | | | | | | | | | | | * commit 'a2520db02bead68d4980783c41500ae96511bdf8': camera2/3: set preview callback oneshot flag during still capture
| | * | camera2/3: set preview callback oneshot flag during still captureZhijun He2013-07-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preview callback oneshot flag need set when a still picture is being captured and preview callback oneshot is enabled, otherwise, the callback enabling status could be lost when preview is restarted after still catpure. Bug 9742091 Change-Id: If9562369013e53727edfdd16f3d00d6a9392e70d
* | | | am 06a4604e: am 4a5c009b: Camera2/3: As a fallback, unilaterally free old ↵Eino-Ville Talvala2013-07-082-14/+119
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | recording buffers * commit '06a4604e77b5872857ef95fe712b6ce00c7aa506': Camera2/3: As a fallback, unilaterally free old recording buffers
| * | am 4a5c009b: Camera2/3: As a fallback, unilaterally free old recording buffersEino-Ville Talvala2013-07-082-14/+119
| |\ \ | | |/ | | | | | | | | | * commit '4a5c009bc2389304cf078c270bceb656479367d2': Camera2/3: As a fallback, unilaterally free old recording buffers
| | * Camera2/3: As a fallback, unilaterally free old recording buffersEino-Ville Talvala2013-07-082-14/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When starting a recording session, check for and clear out recording buffers still owned by stagefright from a previous recording session, if any. There should never be any, but in case they are due to a bug elsewhere in the system, clearing out the buffers makes recovery possible. Bug: 9591080 Change-Id: I3a2a1256860bd174381cd525948419f985c9b415
* | | am ace2378c: am f59a4b39: fix scheduling policy service death detectionEric Laurent2013-07-032-13/+31
|\ \ \ | |/ / | | | | | | | | | * commit 'ace2378c934b61fbd865b5ade9ff7d0df81dabe3': fix scheduling policy service death detection
| * | am f59a4b39: fix scheduling policy service death detectionEric Laurent2013-07-032-13/+31
| |\ \ | | |/ | | | | | | | | | * commit 'f59a4b393f4844c5bbc8d6212364bdddea33d232': fix scheduling policy service death detection
| | * fix scheduling policy service death detectionEric Laurent2013-07-022-13/+31
| | | | | | | | | | | | | | | | | | | | | | | | Check status of transactions to scheduling policy service and re-acquire a binder interface in case of DEAD_OBJECT. Bug: 8875559. Change-Id: I1e00bd44e2d4723b3ec95d5c31d9652ba08e238a
* | | Include what is neededGlenn Kasten2013-07-023-4/+3
| | | | | | | | | | | | | | | | | | | | | Remove old includes. Header files only include other header files that they directly need themselves. Change-Id: Ic471386808d9f42ea19ccbd59cb50a5f83a89dd0
* | | Merge "Camera2Api: Creating a JPEG stream needs to use the right size"Eino-Ville Talvala2013-07-011-2/+17
|\ \ \
| * | | Camera2Api: Creating a JPEG stream needs to use the right sizeEino-Ville Talvala2013-07-011-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | JPEG streams have variable size, so use the HAL-provided max size to size the stream buffers. Change-Id: Ie6900bc9ece6e972eae93fca6aca779224c9bfc6
* | | | Merge "Public API changes for audio offload support."Eric Laurent2013-06-285-22/+43
|\ \ \ \
| * | | | Public API changes for audio offload support.Richard Fitzgerald2013-06-275-22/+43
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOTE: this does _not_ include all private member variables added to classes as part of offload support. Only public/protected functions and stubs functions/variables needed to make the changes buildable. - isOffloadSupported() added to audio policy service A stub implementation is required to build, this always returns false - setParameters() added to IAudioTrack A stub implementation is required to build, this always returns INVALID_OPERATION - CBlk flag for stream end - Change AudioSystem::getRenderPosition() to take an audio_output_t so caller can specify which output to query - Add AudioSystem::isOffloadSupported() This is fully implemented down to the AudioFlinger function AudioPolicyServer::isOffloadSupported() which is just a stub that always returns false. - Add EVENT_STREAM_END to AudioTrack interface. STREAM_END is used to signal when the hardware has actually finished playing all the data it was sent. - Add event type enumeration to media player interface AudioSink callbacks so that the same callback can be used to handle multiple types of event. For offloaded tracks we also have to handle STREAM_END and TEAR_DOWN events - Pass audio_offload_info_t to various functions used for opening outputs, tracks and audio players. This passes additional information about the compressed stream down to the HAL when using offload. For publicly-available APIs this is an optional parameter (for some of the internal and low-level APIs around the HAL interface it is mandatory) - Add getParameters() and setParameters() API to AudioTrack Currently dummy implementations. - Change AudioPlayer contructor so that it takes a set of bitflags defining what options are required. This replaces the original bool which only specified whether to use deep buffering. - Changes to StageFright class definition related to handling tearing-down of an offloaded track when we need to switch back to software decode - Define new StageFright utility functions used for offloaded tracks Currently dummy implementations. - AudioFlinger changes to use extended audio_config_t. Fills in audio_offload_info_t member if this info is passed in when opening an output. - libvideoeditor changes required to add the new event type parameter to AudioSink callback functions - libmediaplayerservice changes required to add the new event type parameter to AudioSink callback functions Change-Id: I3ab41138aa1083d81fe83b886a9b1021ec7320f1 Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com> Signed-off-by: Eric Laurent <elaurent@google.com>
* | | | resolved conflicts for merge of 364a2677 to masterEino-Ville Talvala2013-06-282-32/+84
|\ \ \ \ | |/ / / |/| / / | |/ / Change-Id: I21f23c1c5e4408c24c359bef6270dffce47a988d
| * | am a691ff3c: Camera2/3: Don\'t allow recording and callbacks to coexist.Eino-Ville Talvala2013-06-282-29/+85
| |\ \ | | |/ | | | | | | | | | * commit 'a691ff3c03e38e148bbefed35ebb15e552a12613': Camera2/3: Don't allow recording and callbacks to coexist.
| | * Camera2/3: Don't allow recording and callbacks to coexist.Eino-Ville Talvala2013-06-272-29/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Tear down conflicting streams when necessary. - Shut down callbacks if recording starts - Do not allow callbacks to start if recording is active Per the current camera API, recording and preview callbacks cannot be active simultaneously. However, the framework did not explicitly disallow this, and in fact left the streams configured once they were created, even if switching between the two operational modes. In addition, no guards existed for trying to enable both recording and callbacks at the same time. Bug: 9423825 Change-Id: I7d6e6114c2e14fcfb5299b4c72ad557895cbf4b8
* | | Merge changes I5b2eeab2,I71568560Igor Murashkin2013-06-2510-45/+926
|\ \ \ | | | | | | | | | | | | | | | | | | | | * changes: Make android.hardware.photography.Camera work on HAL3+ devices Initial implementation of android.hardware.photography.CameraDevice (service)
| * | | Make android.hardware.photography.Camera work on HAL3+ devicesIgor Murashkin2013-06-207-19/+129
| | | | | | | | | | | | | | | | | | | | Bug: 9213377 Change-Id: I5b2eeab28985f53dfcb7b8e3029930f5adcd74f5
| * | | Initial implementation of android.hardware.photography.CameraDevice (service)Igor Murashkin2013-06-207-26/+797
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Verified preview streaming requests * Other things *should* work but unverified / unimplemented in client side Missing: * CameraService needs to return static camera info metadata Bug: 9213377 Change-Id: I71568560fcf18d0e2b408ed1c4d0066647314868
* | | | camera2/3: Warn on missing active array size parametersAlex Ray2013-06-201-0/+2
| | | | | | | | | | | | | | | | Change-Id: I752659e1f0522392b902839cd7f4d997dcd85966
* | | | am d3ac2fc0: am f3e21c30: am 60f3f102: Merge "Prevent AudioCommands being ↵Glenn Kasten2013-06-201-6/+8
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | freed before read" * commit 'd3ac2fc0c5429003f69d161e42bba7e94434ec09': Prevent AudioCommands being freed before read
| * | am f3e21c30: am 60f3f102: Merge "Prevent AudioCommands being freed before read"Glenn Kasten2013-06-201-6/+8
| |\ \ | | | | | | | | | | | | | | | | * commit 'f3e21c301b8fef49eecf9c716373fcbfbaa47670': Prevent AudioCommands being freed before read
| | * \ am 60f3f102: Merge "Prevent AudioCommands being freed before read"Glenn Kasten2013-06-201-6/+8
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '60f3f102ba2973cc31e5c7ea00d95bbf19968e8b': Prevent AudioCommands being freed before read
| | | * | Prevent AudioCommands being freed before readChrister Fletcher2013-06-201-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When AudioCommandThread::threadLoop process AudioCommands it was possible for it to delete a command where the posting thread still hadn't read that status from it. If a second command signaled the thread loop to continue after it had inserted a new command while the thread loop was actually waiting for the first command to report that it had read the status the thread loop would continue and delete the first command. Changed the wait condition when waiting for the calling thread to read status to use command->mCond instead of mWaitWorkCV. This way it's guaranteed that the signal to continue comes from the correct thread. Change-Id: Ia69b48cb4fdfaf8b4c83b56a197fb9f2058a92d1
* | | | | am 9c8714da: am e6478de7: Camera2/3: Avoid shutdown race in callback processor.Eino-Ville Talvala2013-06-191-1/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '9c8714daaf6a402abd85557e9b652c86f0df86e4': Camera2/3: Avoid shutdown race in callback processor.
| * | | | am e6478de7: Camera2/3: Avoid shutdown race in callback processor.Eino-Ville Talvala2013-06-191-1/+4
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit 'e6478de72a8ae1d3abb3e8c20898977c45354a4f': Camera2/3: Avoid shutdown race in callback processor.
| | * | | Camera2/3: Avoid shutdown race in callback processor.Eino-Ville Talvala2013-06-191-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's possible, during shutdown, for callback processor's heap to be destroyed when it's about to send the callback back to the user. Properly copy the heap reference to a local variable before unlocking the mutex. Bug: 9485959 Change-Id: I301347b77145f19c7ac721b9127dc74f122acce2
* | | | | am bda5d1f2: am 241b5279: Camera3: Power: Properly shut down unused thread.Eino-Ville Talvala2013-06-171-2/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'bda5d1f2a34f9b7ded0bc0441be4856e78ec066c': Camera3: Power: Properly shut down unused thread.
| * | | | am 241b5279: Camera3: Power: Properly shut down unused thread.Eino-Ville Talvala2013-06-171-2/+3
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '241b52798809d8db3d369af05ace1f73f723f29b': Camera3: Power: Properly shut down unused thread.
| | * | | Camera3: Power: Properly shut down unused thread.Eino-Ville Talvala2013-06-171-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9466221 Change-Id: I9ed0740561b2e04954eebc1b8aec89cfab40a3a0
* | | | | am 0cc75491: am 26bc908b: Camera2/3: Make sure to wait for idle after still ↵Eino-Ville Talvala2013-06-141-0/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | capture. * commit '0cc754918a3c1353164ccc5798f63b28f65db406': Camera2/3: Make sure to wait for idle after still capture.
| * | | | am 26bc908b: Camera2/3: Make sure to wait for idle after still capture.Eino-Ville Talvala2013-06-141-0/+6
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '26bc908b3dafb5d80f092a22c5c71116526eae06': Camera2/3: Make sure to wait for idle after still capture.
| | * | | Camera2/3: Make sure to wait for idle after still capture.Eino-Ville Talvala2013-06-131-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While this wait should be immediate, it's important to guarantee that preview is stopped when takePicture completes, and that the device knows itself to be idle. Bug: 9413025 Change-Id: I1c151ba920e226107ee048918187364990f444c0
* | | | | am e4a453d4: am 214a17fd: Camera3: Always close HAL device even in face of ↵Eino-Ville Talvala2013-06-141-10/+20
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | errors. * commit 'e4a453d4b7563d1dab674df6ce52c291e63c6ca7': Camera3: Always close HAL device even in face of errors.
| * | | | am 214a17fd: Camera3: Always close HAL device even in face of errors.Eino-Ville Talvala2013-06-141-10/+20
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '214a17fd37ef85fc841d3157b1e9096e1aa1b42f': Camera3: Always close HAL device even in face of errors.
| | * | | Camera3: Always close HAL device even in face of errors.Eino-Ville Talvala2013-06-131-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To improve robustness, make sure the HAL device instance is always closed, even if it cannot be put into the IDLE state. Bug: 9414167 Change-Id: I8e7035ff0afe7214951f9824e561b340cb37592e
* | | | | Merge "camera2: accept 4-value active array size"Alex Ray2013-06-131-3/+10
|\ \ \ \ \
| * | | | | camera2: accept 4-value active array sizeAlex Ray2013-06-131-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia320a022b201a938a025efc30a54c05fcfe5b02f
* | | | | | am ccc366a9: am 1191454a: Merge "Camera3: Skipping no-ops good, not updating ↵Eino-Ville Talvala2013-06-131-0/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | state machine bad." into jb-mr2-dev * commit 'ccc366a90fdd8d9df5de27820f04bc534d122c07': Camera3: Skipping no-ops good, not updating state machine bad.
generated by cgit v1.1 at 2024-06-09 22:23:01 +0000