summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* Added command type to play recording sound.Nipun Kwatra2010-09-141-0/+2
| | | | | | | | | Added CAMERA_CMD_PLAY_RECORDING_SOUND command type to play recording sound through sendCommand. This is currently needed by time lapse recording using still mode capture, which disables the shutter sound but needs to play the recording sound. Change-Id: I376aa40f45b6064fd862abc065456b06fc338020
* Adding enable/disable option for sendCommand()Nipun Kwatra2010-09-142-1/+50
| | | | | | | | | | | | - Added enum CAMERA_CMD_ENABLE_SHUTTER_SOUND which corresponds to command type for enabling/disabling shutter sound. - The implementation checks if it is legal to disable shutter sound. If it is, then any process can disable the sound. If not, then only the mediaserver process is allowed to do this. Currently time lapse capture needs this functionality to disable shutter sound when still mode is used to capture time lapse video. Change-Id: Id147a3bcc6a345c2c6a6d52bf98fd8292386bb19
* am 4d987850: am bd2e9ec6: Merge "Fix volume problems with insert revert" ↵Eric Laurent2010-09-131-29/+31
|\ | | | | | | | | | | | | | | | | into gingerbread Merge commit '4d9878502f7661ed34540a485a5942d859e209c7' * commit '4d9878502f7661ed34540a485a5942d859e209c7': Fix volume problems with insert revert
| * Fix volume problems with insert revertEric Laurent2010-09-131-29/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use a constant input level to the reverb engine and implement volume control in the insert reverb. This avoids the volume spikes when an effect that was inserted after the reverb is disabled or removed. - Fix clicks (one silent buffer) at the end of the reverb disable period. - Modified volume management in audioflinger so that the volume ramp is also done by the insert effect if present when the track is paused (avoids clicks). - Increased room level for all presets. Also fixed problems with output stage session (-1): - effect bundle wrapper was not designed to support session -1 - the permission check in audioflinger for using session -1 failed due to a wrong usage of getCallingPid() Change-Id: Id1ff51327263364bf71d3f2668fa5cde4311d84f
* | Only enable CAMERA_MSG_PREVIEW_FRAME when necessary.Wu-cheng Li2010-09-091-14/+5
| | | | | | | | | | | | | | | | | | Now camera driver uses ANativeWindow for display. CameraService should not request preview callback from camera hardware if applications have not requested it. bug:2951018 Change-Id: I85f74ea4a61104feca018867bc9d6dfe3a9479f5
* | am 937056c1: am 32ec1ad1: Merge "Fix problem in AudioEffect::command() ↵Eric Laurent2010-09-021-5/+9
|\ \ | |/ | | | | | | | | | | | | | | status." into gingerbread Merge commit '937056c1a7ce71e6881305a31f76e62a76685f24' * commit '937056c1a7ce71e6881305a31f76e62a76685f24': Fix problem in AudioEffect::command() status.
| * Fix problem in AudioEffect::command() status.Eric Laurent2010-09-021-5/+9
| | | | | | | | | | | | | | The *pReplyData argument of the command() function was left unitialized by EffectHandle::command() when command was EFFECT_CMD_ENABLE, EFFECT_CMD_DISABLE and EFFECT_CMD_SET_PARAM_COMMIT. Change-Id: I91a19817ead2a8cfbdd8e2d77ca270c7ce9d5bd4
* | Merge "Remove setPreviewDisplay in CameraService::Client::~Client()."Wu-cheng Li2010-09-011-5/+0
|\ \
| * | Remove setPreviewDisplay in CameraService::Client::~Client().Wu-cheng Li2010-08-311-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | mSurface is released in destructor and setPreviewWindow(0) is called in Client::disconnect(). setPreviewDisplay is not needed in destructor. bug:2964479 Change-Id: I329901659a2af407816c34e02f37143b28183a89
* | | am 55e79374: am f560ceab: Merge "Audio Effects: fix problems in volume ↵Eric Laurent2010-08-312-7/+32
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | control." into gingerbread Merge commit '55e7937462d107b469a58651d3d51e15086f8e9e' * commit '55e7937462d107b469a58651d3d51e15086f8e9e': Audio Effects: fix problems in volume control.
| * | Audio Effects: fix problems in volume control.Eric Laurent2010-08-312-7/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed click when re-enabling effect during the turn off phase: make sure the effect states where effect is processed are the same where volume control is delegated to effect. - Fixed click when effect is deleted while still active: do not apply volume ramp if an effect having volume control was just removed from the effect chain. Also fixed a crash when PCM dump is enabled in effect bundle wrapper. Change-Id: Ib562f5cf75c69af75df0e862536262e2514493e4
* | | am 44217848: am ae6bdc23: Merge "Fix issue 2952766." into gingerbreadEric Laurent2010-08-301-18/+24
|\ \ \ | |/ / | | / | |/ |/| | | | | Merge commit '4421784895a58bb7bcf90236a9e443b372b5b80e' * commit '4421784895a58bb7bcf90236a9e443b372b5b80e': Fix issue 2952766.
| * Fix issue 2952766.Eric Laurent2010-08-271-18/+24
| | | | | | | | | | | | | | | | | | | | | | | | The problem is that the audio policy manager does not handle the input devices when forced use for telephony is changed. The problem does not appear in a call over PSTN becasue only teh output devices drives the routing of in call audio to/from the base band. The fix consists in modifying AudioPolicyManagerBase::setForceUse() to check for active inputs and update the input device if needed. Change-Id: I0d36d1f5eef1cce527929180c29b025439902f10
* | Add the setPreviewWindow camera HAL API to the camera stub.Jamie Gennis2010-08-232-3/+3
| | | | | | | | Change-Id: Ic669f9d5f5ae8f1fe5bd055f55aa4a18fa6d84cd
* | Change the framework to use the new camera preview path.Jamie Gennis2010-08-232-70/+41
| | | | | | | | | | | | | | | | | | | | | | | | This change makes the camera HAL interface take an ANativeWindow interface from which all the camera preview buffers will be allocated. The framework code running in application processes now passes a Surface object rather than an ISurface to the camera server via Binder when setting the preview surface. The camera server then forwards that Surface object (which implements the ANativeWindow interface) to the camera HAL, which uses it to communicate with SurfaceFlinger to allocate the camera preview buffers. Change-Id: Ie438f721559cd7de5e4f848a26d96360dda07b5f
* | am caaf7fe3: am 271c1bfd: Merge "Handle the camera open failure better." ↵Wu-cheng Li2010-08-232-4/+11
|\ \ | |/ | | | | | | | | | | | | | | into gingerbread Merge commit 'caaf7fe3a407c764f643585d050c16f5fb56503c' * commit 'caaf7fe3a407c764f643585d050c16f5fb56503c': Handle the camera open failure better.
| * Handle the camera open failure better.Wu-cheng Li2010-08-192-4/+11
| | | | | | | | | | | | Check if camera hardware is NULL to avoid mediaserver crash. Change-Id: Ibde0251f30bdb6b36a5d5380222d7be25ec9449c
* | am 3a899b85: am 0b9a12bf: Merge "Fix issue 2929440" into gingerbreadEric Laurent2010-08-212-3/+23
|\ \ | |/ | | | | | | | | | | Merge commit '3a899b85102f6d51585b3d46ced3038c8602f202' * commit '3a899b85102f6d51585b3d46ced3038c8602f202': Fix issue 2929440
| * Fix issue 2929440Eric Laurent2010-08-192-3/+23
| | | | | | | | | | | | | | | | Fixed regression introduced by change a54d7d3d7dd691334189aab20d23c65710092869 in audioflinger mixer thread: When the output stream is suspended, the sleep time between two writes must match the actual duration of one output stream buffer otherwise the playback rate is not respected. Change-Id: Ic5bebe890290d1f44aeff9dd3c142d18e26fff2a
* | am f28608cd: am c8d0d630: Merge "Fix issue 2909189: System property ↵Eric Laurent2010-08-131-4/+4
|\ \ | |/ | | | | | | | | | | | | | | ro.audio.silent no longer mutes system." into gingerbread Merge commit 'f28608cdf4f6a0075d0811ccd32123baf4daec31' * commit 'f28608cdf4f6a0075d0811ccd32123baf4daec31': Fix issue 2909189: System property ro.audio.silent no longer mutes system.
| * Fix issue 2909189: System property ro.audio.silent no longer mutes system.Eric Laurent2010-08-111-4/+4
| | | | | | | | | | | | | | Fixed regression introduced by commit 2a6b80bc65c4782b5a7168b300e1dc5ec9f617ee: master mute was not working if no effect chains were present on session 0. Change-Id: I66d107e045d159cb94d29c7476fa1e12d92f2ae7
* | am 1ece7d68: am 2a6b80bc: Fixed several audio effects problems.Eric Laurent2010-08-091-5/+8
|\ \ | |/ | | | | | | | | | | Merge commit '1ece7d6873027068a3e7b055597045e9387b217c' * commit '1ece7d6873027068a3e7b055597045e9387b217c': Fixed several audio effects problems.
| * Fixed several audio effects problems.Eric Laurent2010-08-091-5/+8
| | | | | | | | | | | | | | | | | | | | - Fixed constant inversions in AudioEffect.java - Do not return error when enabling an already enabled effect - Update cached effect state in native AudioEffect class when effect is enabled/disabled by command() method - Remove click when restarting effect during disable sequence - Fixed problem in master mute management when volume control is delegated to effect. Change-Id: I6df4ce9fcc54fdc7345df858f639d20d802d6712
| * resolved conflicts for merge of 27eecb70 to gingerbreadJean-Baptiste Queru2010-07-302-2/+0
| | | | | | | | Change-Id: If064f2f4950fc1a4ff38e6927fe2120af76b26f1
* | am 0c51c98f: am 4506c62a: fix inaccurate copyrightsJean-Baptiste Queru2010-07-292-2/+0
|\ \ | | | | | | | | | | | | | | | | | | Merge commit '0c51c98fd9edf0bdc8f2c567470fc332b5ae3adf' * commit '0c51c98fd9edf0bdc8f2c567470fc332b5ae3adf': fix inaccurate copyrights
| * \ am 4506c62a: fix inaccurate copyrightsJean-Baptiste Queru2010-07-292-2/+0
| |\ \ | | |/ | |/| | | | | | | | | | | | | Merge commit '4506c62abd5767d6d42a97e8e87793a1b3bcb625' into gingerbread-plus-aosp * commit '4506c62abd5767d6d42a97e8e87793a1b3bcb625': fix inaccurate copyrights
| | * fix inaccurate copyrightsJean-Baptiste Queru2010-07-292-2/+0
| | | | | | | | | | | | Change-Id: I33b0f68f2da34ca4728211d83159cf32a127f6dd
| | * move native services under services/Mathias Agopian2010-07-2234-0/+17367
| | | | | | | | | | | | | | | | moved surfaceflinger, audioflinger, cameraservice all native services should now reside in this location. Change-Id: Icd7336f7289db35df9c8c1857a5122bb8a6f1c86
* | am ba676a00: am a54d7d3d: Fixed underrun in audioflinger mixer.Eric Laurent2010-07-291-2/+2
|\ \ | |/ | | | | | | | | | | Merge commit 'ba676a00c1b9ba59b30fe805b83d03d1768fffbd' * commit 'ba676a00c1b9ba59b30fe805b83d03d1768fffbd': Fixed underrun in audioflinger mixer.
| * Fixed underrun in audioflinger mixer.Eric Laurent2010-07-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | When all audio tracks have been disabled and the mixer is running idle before the output stream is placed in standby, the mixer sometimes fails to write to the output stream on time to avoid underrun. This is because the sleep period used to wait before the next write to output stream is too close to the actual buffer duration. In fact this sleep time is not critical as if we write too early to the output stream, the kernel driver will wait for free buffers from the audio DSP DMA and we will sleep anyways. The fix consists in dividing the calculated wait period by 2 to increase the margin. Change-Id: I5730887dc2ccce2a511bc858494a6f7da6b392a0
* | am 45dc4f82: am 493941b8: Allow creation of an audio effect on a session ↵Eric Laurent2010-07-292-16/+72
|\ \ | |/ | | | | | | | | | | | | | | with no audio tracks. Merge commit '45dc4f82a00e52b12389b22a7cfbbee5609e8e28' * commit '45dc4f82a00e52b12389b22a7cfbbee5609e8e28': Allow creation of an audio effect on a session with no audio tracks.
| * Allow creation of an audio effect on a session with no audio tracks.Eric Laurent2010-07-292-16/+72
| | | | | | | | | | | | | | | | This is necessary to allow creating and enabling an effect attached to a particular player session before the playback is started. As a matter of fact, the implementation of the mediaplayer does not create the AudioTrack before playback starts. Change-Id: I1266e8885f9d756acc949303321aaac0fbf83e34
* | am 6fa88882: am 62d83a0c: Merge "Audio effects: modified command() parameter ↵Eric Laurent2010-07-282-26/+97
|\ \ | |/ | | | | | | | | | | | | | | types." into gingerbread Merge commit '6fa8888254deb4961dc64c6ac03dc103c9cd8bcf' * commit '6fa8888254deb4961dc64c6ac03dc103c9cd8bcf': Audio effects: modified command() parameter types.
| * Audio effects: modified command() parameter types.Eric Laurent2010-07-282-26/+97
| | | | | | | | | | | | | | The type of the cmd, cmdSize and *pReplySize parameters of the effect control interface command() function have been modified from int to uint32_t. This is more consistent with their role. Change-Id: I84d289fc262d6753747910f06f485597dfee6591
* | resolved conflicts for merge of dd206093 to masterEric Laurent2010-07-205-200/+651
|\ \ | |/ | | | | Change-Id: I21dd2321a4839d034d49092baccbf40986f17dae
| * Audio policy manager changes for audio effectsEric Laurent2010-07-205-200/+652
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added methods for audio effects management by audio policy manager. - control of total CPU load and memory used by effect engines - selection of output stream for global effects - added audio session id in parameter list for startOutput() and stopOutput(). this is not used in default audio policy manager implementation. Modifications of audio effect framework in AudioFlinger to allow moving and reconfiguring effect engines from one output mixer thread to another when audio tracks in the same session are moved or when requested by audio policy manager. Also fixed mutex deadlock problem with effect chains locks. Change-Id: Ida43484b06e9b890d6b9e53c13958d042720ebdb
* | am 3c6ea955: am 7203272f: Merge "Fixed problems in audio effect volume ↵Eric Laurent2010-07-192-10/+24
|\ \ | |/ | | | | | | | | | | | | | | control." into gingerbread Merge commit '3c6ea95553d3a0e416874c583a41efff3f6fbc57' * commit '3c6ea95553d3a0e416874c583a41efff3f6fbc57': Fixed problems in audio effect volume control.
| * Fixed problems in audio effect volume control.Eric Laurent2010-07-192-10/+24
| | | | | | | | | | | | | | | | | | | | Fixed the following problems in audio effect volume control in AudioFlinger: - Make sure that the volumes returned by EffectChain::setVolume_l() are correct even is no change is detected since last call - Do not use isEnabled() to validate volume control but mState >= ACTIVE instead as the volume control must be also active in STOPPING and STOPPED states. Change-Id: Id62da3164fad500ee8a5efd6cd78c77e8fdcb541
* | am f16b3f10: am b0374a0e: Merge "Several improvements in audio effects ↵Eric Laurent2010-07-162-70/+73
|\ \ | |/ | | | | | | | | | | | | | | volume control." into gingerbread Merge commit 'f16b3f104f60738447db60bcf2c44c7610e17199' * commit 'f16b3f104f60738447db60bcf2c44c7610e17199': Several improvements in audio effects volume control.
| * Several improvements in audio effects volume control.Eric Laurent2010-07-152-70/+73
| | | | | | | | | | | | | | | | | | | | - Fixed crash when deleting an effect chained before an effect having volume control - Changed EFFECT_FLAG_VOLUME_CTRL to implicitely include EFFECT_FLAG_VOLUME_IND (not need to set both in effect descriptor). - Volume control changes from one effect to another if needed according to effect enable state - EFFECT_CMD_SET_VOLUME is only sent when their is an actual change in volume Change-Id: Ieebaf09157e2627366023569d95516646e03e26c
* | am c74034b6: am 24651682: added BinderService<> template to help creating ↵Mathias Agopian2010-07-144-17/+15
|\ \ | |/ | | | | | | | | | | | | | | native binder services Merge commit 'c74034b6bf0940dc80c4d4efa1e677ad0d2dfd6c' * commit 'c74034b6bf0940dc80c4d4efa1e677ad0d2dfd6c': added BinderService<> template to help creating native binder services
| * added BinderService<> template to help creating native binder servicesMathias Agopian2010-07-144-17/+15
| | | | | | | | Change-Id: Id980899d2647b56479f8a27c89eaa949f9209dfe
* | am 78983a91: am 4055b780: Merge "move native services under services/" into ↵Mathias Agopian2010-07-141-12/+22
|/ | | | | | | | | gingerbread Merge commit '78983a9133d3dd3f08b1ec462a7e2f9e7bfa9e2f' * commit '78983a9133d3dd3f08b1ec462a7e2f9e7bfa9e2f': move native services under services/
* move native services under services/Mathias Agopian2010-07-1434-0/+19972
moved surfaceflinger, audioflinger, cameraservice all native services should now reside in this location. Change-Id: Iee42b83dd2a94c3bf5107ab0895fe2dfcd5337a8