summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge "Work around bug in offload driver" into mnc-devMarco Nelissen2015-05-121-2/+12
|\ \ \ \
| * | | | Work around bug in offload driverMarco Nelissen2015-05-121-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a bug in the offload driver that causes the last offload buffer(s) to be dropped unless the device is on power or holding a wake lock. To avoid truncated playback, we now hold a wake lock during the drain phase of offloaded playback. Bug: 19928717 Change-Id: I8df22e965ec791448aa5d9b74e743f48ef886fc4
* | | | | Merge "mediaresourcemanager: change resource manager service log to use ring ↵Ronghua Wu2015-05-126-397/+62
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | buffer." into mnc-dev
| * | | | | mediaresourcemanager: change resource manager service log to use ring buffer.Ronghua Wu2015-05-116-397/+62
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | move the ring buffer implementation from libcameraservice to media include. also add line prefix support to the service log. Bug: 20637674 Change-Id: Ib6b32f31abe92c42644ef7012f1e3d46220ccfbd
* | | | | Fail gracefully when camera app op is not enabled.Svetoslav2015-05-121-1/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: I0c7c1dca1c0966efaf30bcfe12636953683712ab
* | | | | Merge "Revert "Add camera app op - camera"" into mnc-devSvetoslav Ganov2015-05-123-89/+55
|\ \ \ \ \
| * | | | | Revert "Add camera app op - camera"Svetoslav Ganov2015-05-123-89/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not needed duplication of work This reverts commit 32fa6d0e65dbf956e253a1006e9419dce2fe75c9. Change-Id: I2c81b0dacb2ed99c408c79c1f9e22a4baa564494
* | | | | | Merge "Support channel index masks for output hal" into mnc-devAndy Hung2015-05-122-40/+8
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Support channel index masks for output halAndy Hung2015-05-062-40/+8
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib3e61ff6faf91c71b85102b5d77f90f124c08220
* | | | | | Merge "Allow 8 channels in RecordThread" into mnc-devAndy Hung2015-05-121-3/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Allow 8 channels in RecordThreadAndy Hung2015-05-051-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I738d4975188695e568015e1bc64d160550e958f5
* | | | | | audiopolicy: Use AUDIO_OUTPUT_FLAG_TTS for TTS streamRavi Kumar Alamanda2015-05-111-0/+3
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use AUDIO_OUTPUT_FLAG_TTS by default for TTS stream to see if the HW supports a dedicated output for the same. If not, fallback to primary output as it is done currently. Change-Id: Ifb2ef7066e75c61fe4c1b9783c12627386a00ea5
* | | | | Merge "AudioMixer: fix for volume ramp in float mode" into mnc-devEric Laurent2015-05-091-1/+2
|\ \ \ \ \
| * | | | | AudioMixer: fix for volume ramp in float modeEric Laurent2015-05-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20912450. Bug: 19952126. Change-Id: I1ff3c3f4c0dd673bbbc17ce8da14d446fdb7e8a8
* | | | | | Merge "Revert "Revert "Enable full floating point path in AudioMixer""" into ↵Eric Laurent2015-05-091-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | mnc-dev
| * | | | | | Revert "Revert "Enable full floating point path in AudioMixer""Eric Laurent2015-05-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5dcaebbea5dca62ca55d6137777caa67fc757dd6. Change-Id: I8bfc668baf53dc03a9516c50e2a4d625ec767d0a
* | | | | | | Merge "audio flinger: fix fuzz test crash" into mnc-devEric Laurent2015-05-083-7/+22
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | audio flinger: fix fuzz test crashEric Laurent2015-05-083-7/+22
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clear output stream pointer in duplicating thread when the main output to which it is attached is closed. Also do not forward master mute and volume commands to duplicating threads as this is not applicable. Also fix logic in AudioFlinger::primaryPlaybackThread_l() that could accidentally return a duplicating thread. This never happens because the primary thread is always first in the list. Bug: 20731946. Change-Id: Ic8869699836920351b23d09544c50a258d3fb585
* | | | | | libstagefright: config resource manager with secure codec co-existing policy.Ronghua Wu2015-05-082-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I0d729782c1622f23e9c37b7a9231e58e3f807470
* | | | | | Merge "Kill a new user of stlport." into mnc-devDan Albert2015-05-081-2/+0
|\ \ \ \ \ \
| * | | | | | Kill a new user of stlport.Dan Albert2015-05-071-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/15193147 Change-Id: I20d21a040f0c2c6c291053fe02fdf82e33ed56a0 (cherry picked from commit 1b5a73358b72b8ff1bee05cc44d94b47b73ede44)
* | | | | | | Merge "mediaresourcemanager: add ServiceLog to track the calling history for ↵Ronghua Wu2015-05-087-13/+222
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | dumpsys." into mnc-dev
| * | | | | | | mediaresourcemanager: add ServiceLog to track the calling history for dumpsys.Ronghua Wu2015-05-077-13/+222
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20637674 Change-Id: I9d74d98f8eb729a8681877f86419aa2c979f3b7c
* | | | | | | Merge "Revert "Enable full floating point path in AudioMixer"" into mnc-devEric Laurent2015-05-071-3/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | Revert "Enable full floating point path in AudioMixer"Eric Laurent2015-05-071-3/+3
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5b8fde71e08f57478ef25d040fc5f66294011ac6. temporary revert while we investigate. Bug: 20912450.
* | | | | Merge "Camera2: allow mixing regular/reprocess requests" into mnc-devChien-Yu Chen2015-05-072-11/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Camera2: allow mixing regular/reprocess requestsChien-Yu Chen2015-05-052-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow mixing regular and reprocess requests in a capture burst. Also call abandon() when deleting an input stream. Bug: 20537735 Change-Id: If8c7781038173ab21c73f5ddc32f53793cf86fd9
* | | | | Merge "audio policy: clarify use of mName field for audio devices" into mnc-devEric Laurent2015-05-075-37/+33
|\ \ \ \ \
| * | | | | audio policy: clarify use of mName field for audio devicesEric Laurent2015-05-065-37/+33
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The audio port field mName was used for two different purposes which caused a problem when exposing this information at the SDK API. Create a new "mTag" field storing the audio_policy.conf device tag if needed. Field "mName" is now used to store any additional name associated to a given device when available (e.g Manufacturer and model name for a USB device). Change-Id: I17fa872e4a3a2e1b7cbb807c6f72e095a8a2c9c5
* | | | | Make header functions "inline" to avoid warning when unused.Chih-Hung Hsieh2015-05-061-2/+2
| |_|_|/ |/| | | | | | | | | | | | | | | Change-Id: Iefac44f3c0e1c3fd4b19833d9692744100f92e00 (cherry picked from commit 5e9febef197a9852c833a0aedc6bfee179c4ae9e)
* | | | Merge "Implement audio device callback" into mnc-devEric Laurent2015-05-062-0/+9
|\ \ \ \ | |/ / / |/| | |
| * | | Implement audio device callbackEric Laurent2015-05-062-0/+9
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add class AudioSystem::AudioDeviceCallback notifying AudioSystem clients upon device selection change on a given input or output thread. Maintain a list of installed callback per I/O handle in AudioSystem and call registered callbacks when an OPEN of CONFIG_CHANGED event is received on IAudioFlingerClient::ioConfigChanged(). Add methods to AudioTrack and AudioRecord to add and remove device change callbacks. Add methods to AudioTrack and AudioRecord to query currently selected device. ioConfigChanged() events now convey the audio patch describing the input or output thread routing. Fix AudioRecord failure to start when invalidation is handled by start(). Change-Id: I9e938adf025fa712337c63b1e02a8c18f2a20d39
* | | Merge "CameraService: update android.control.availableModes" into mnc-devZhijun He2015-05-051-2/+37
|\ \ \
| * | | CameraService: update android.control.availableModesZhijun He2015-05-051-2/+37
| |/ / | | | | | | | | | | | | | | | | | | | | | Only advertise CONTROL_MODE_OFF when manual 3A controls are supported. Also fixed some bug regarding static metadata update. Bug: 20734940 Change-Id: I5061f3c49ec20dc8cf5d849771c000fb82543e8f
* | | Merge "AudioRecord keeps track of UID" into mnc-devJean-Michel Trivi2015-05-052-2/+3
|\ \ \ | |/ / |/| |
| * | AudioRecord keeps track of UIDJean-Michel Trivi2015-05-052-2/+3
| | | | | | | | | | | | | | | | | | Bug 20832981 Change-Id: If5f3c61fae02d86b9d6fdf411711f854fd56c77d
* | | Add camera app op - cameraSvet Ganov2015-05-023-55/+89
| | | | | | | | | | | | Change-Id: I26570cc0a23fdea740b416a26838d40cac296c85
* | | Merge "AudioTrack: fix direct tracks not pausing" into mnc-devPhil Burk2015-05-022-10/+12
|\ \ \
| * | | AudioTrack: fix direct tracks not pausingPhil Burk2015-05-012-10/+12
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | When a Direct Track is paused and the HAL does not support pause() and resume() then the HW never gets paused. The app can just keep writing data, which gets played. Bug: 18899620 Change-Id: Ice0f360956ff7ca425f6f24a0a2a8640d8b43fa8 Signed-off-by: Phil Burk <philburk@google.com>
* | | Merge "AudioSystem: refactor audio config cache and callbacks" into mnc-devEric Laurent2015-05-014-62/+61
|\ \ \
| * | | AudioSystem: refactor audio config cache and callbacksEric Laurent2015-05-014-62/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up implementation of audio configuration cache and callback events from AudioFlinger: - Define class AudioIoDescriptor for audio input and output configurations outside of AudioSystem class. - Do not use void * but an AudioIoDescriptor as argument to audio config callbacks from AudioFlinger. - Remove unused configuration events. - Move AudioSystem audio input and output cache from static singletons to members of AudioFlingerClient subclass. Change-Id: I67c196c32c09ce2756af0755ee1fe631040c3270
* | | | camera2: Fix fuzztesting segfault in connect.Ruben Brunk2015-05-012-2/+23
| |/ / |/| | | | | | | | | | | Bug: 20721655 Change-Id: I0d974cad19683a8c86a76dac7f61ac0010bd977a
* | | Merge "PatchPanel: do not use setParameters() internally." into mnc-devEric Laurent2015-05-015-135/+219
|\ \ \ | |/ /
| * | PatchPanel: do not use setParameters() internally.Eric Laurent2015-04-285-135/+219
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not use setParameters() with AUDIO_PARAMETER_STREAM_ROUTING when communicating the input or output device selected to playback or record threads, even for HAL version less than 3.0. Use createAudioPatch()/releaseAudioPatch() instead. This allows to send more information on the output or input device being selected. Also fix a regression introduced in L where the output device selection was not communicated to effects on record threads. Change-Id: I4780ada53241d56694b005c992171e173c3bf8f5
* | | Merge "Camera: API1 shim: Don't tightly apply crop region" into mnc-devEino-Ville Talvala2015-04-302-93/+37
|\ \ \
| * | | Camera: API1 shim: Don't tightly apply crop regionEino-Ville Talvala2015-04-302-93/+37
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to older HAL compatibility, we have been setting a tight crop region that just bounds the current output streams. However, this did not take into account any possible ZSL output stream, so correct application of our stream cropping rules to ZSL results in double-crop scenarios, if the ZSL stream aspect ratio does not match the aspect ratio of the other output streams. Since all current HALs follow the correct stream cropping rules (or at least sufficiently ignore them for ZSL), simplify the cropping substantially - now either calculate the crop region based purely off the active array dimensions and zoom factor, or purely off the preview stream and zoom factor. The former is used for setting the request crop, and the latter is used for converting coordinates for metering regions. Bug: 20316691 Change-Id: I5a0bc2e7c09cf60fbae4220566540ca9e674d652
* | | Merge "AudioTrack: fix spurious retrograde messages" into mnc-devPhil Burk2015-04-302-50/+2
|\ \ \
| * | | AudioTrack: fix spurious retrograde messagesPhil Burk2015-04-292-50/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The retrograde motion was confused by some positions coming from the DSP on offloaded tracks. So the retrograde check was moved up into AudioTrack.cpp. This allows us to take advantage of the checks for invalid positions based on timing. Bug: 2047891 Change-Id: Ifcad2349201443a7f1711347c203297100449536 Signed-off-by: Phil Burk <philburk@google.com>
* | | | Merge "audio policy: session routes continued." into mnc-devEric Laurent2015-04-308-55/+196
|\ \ \ \
| * | | | audio policy: session routes continued.Eric Laurent2015-04-308-55/+196
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Clear session routes when client process dies. - Enforce the route only when the requesting session is active. - Fix requested route not working if an output mix change is required (e.g forcing to SPEAKER when the default route is USB or A2DP). - Make sure all sessions sharing the strategy with a rerouted session have the same route (needed for volume control consistency) Change-Id: I0ab347a8fb97e73e2c5965374544c5f4fe509ef1