summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix FastMixer high bit depth Hal support" into mnc-devAndy Hung2015-06-221-0/+4
|\
| * Fix FastMixer high bit depth Hal supportAndy Hung2015-06-191-0/+4
| | | | | | | | | | Bug: 21959591 Change-Id: Ia3351ea5644b36852a1f0dad1314beac97d840e1
* | Merge "AudioFlinger: reset SPDIF encoder on flush" into mnc-devPhil Burk2015-06-201-1/+2
|\ \
| * | AudioFlinger: reset SPDIF encoder on flushPhil Burk2015-06-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | This may prevent corrupt data from reaching the AVR. Bug: 19604395 Change-Id: I3dbdd002326917b9f14dda46a3e5170e1ec799bb Signed-off-by: Phil Burk <philburk@google.com>
* | | Merge "Camera3Device: Fix high speed configuration" into mnc-devChien-Yu Chen2015-06-191-1/+5
|\ \ \
| * | | Camera3Device: Fix high speed configurationChien-Yu Chen2015-06-181-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If high speed mode changed, HAL needs to reconfigure the streams even when the stream configurations don't change. Bug: 21900311 Change-Id: I76aee456b3b6d8c8f599a1638dcd38d75553a235
* | | | Merge "Fixing no rates, chans & encodings on input devices for device enum ↵Paul McLean2015-06-192-7/+20
|\ \ \ \ | | | | | | | | | | | | | | | API. Filtering digital attributes for non-digital audio devices." into mnc-dev
| * | | | Fixing no rates, chans & encodings on input devices for device enum API.Paul McLean2015-06-192-7/+20
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filtering digital attributes for non-digital audio devices. Bug: 21876072 21903975 Change-Id: Ia5c81a8160f4b4ebf5941dd0c5dfb68d01699ca6
* | | | Merge "Fix clamp issue with AudioMixer with float input and int16 output" ↵Andy Hung2015-06-191-3/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | into mnc-dev
| * | | Fix clamp issue with AudioMixer with float input and int16 outputAndy Hung2015-06-181-3/+2
| | | | | | | | | | | | | | | | | | | | Bug: 20706338 Change-Id: I7e3ab0da96901870cc57fbe2e79163bc81157465
* | | | Merge "Reduce log messages on AudioFlinger throttle" into mnc-devAndy Hung2015-06-182-2/+17
|\ \ \ \ | |_|_|/ |/| | |
| * | | Reduce log messages on AudioFlinger throttleAndy Hung2015-06-182-2/+17
| |/ / | | | | | | | | | | | | Bug: 21858740 Change-Id: I8f291b64c1033867bb57ffceaa3b7d94aa998715
* | | Merge "Bug fix on Engine Configurable" into mnc-devEric Laurent2015-06-184-109/+38
|\ \ \
| * | | Bug fix on Engine ConfigurableFrançois Gaffie2015-06-184-109/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a couple of issue within audio policy engine configurable -valgrind error detected within the parsing of the configuration file -configuration file typos -start of the PFW delayed to the init in order to wait the full construction of the engine object -wrong specialization of template functions. -broadcast volume min / max init to stream collection of manager & PFW Change-Id: I08823ab4040c92b719747c60cc3fa5c8b5f172ac Signed-off-by: François Gaffie <francois.gaffie@intel.com>
* | | | Merge "Add a configurable version of the policy engine based on PFW" into ↵Eric Laurent2015-06-1863-2/+20495
|\ \ \ \ | |/ / / | | | | | | | | mnc-dev
| * | | Add a configurable version of the policy engine based on PFWFrançois Gaffie2015-06-1863-2/+20495
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a configurable version of the policy engine based on the parameter framework. This configurable engine shall be activated with a flag USE_CONFIGURABLE_AUDIO_POLICY within BoardConfig.mk This patch provides the generic configuration as an example. This configuration provides the same user experience as the default policy engine. - Fix M Issue on configurable policy engine version. - Remove the "empty static lib include trick" hack The code was using a hack to import headers only through an empty lib. This trick was used not only by the PFW and its plugin but also internally with policy. This patch removes this hack and either links againts the real libraries if exist or point on the path of the header. However, since header directories are not recursively detected on Andoid, we need to manually add all necessary libraries. (for example libicuuc needed by libxml2) - let the build system decide which compiler and which stl is to be used - Disable by default Audio Policy Settings XML file generation at compilation time In order not to depend on python tool for the configurable policy example, this patch adds the generated Settings XML file and disables the generation from .pfw files at compile time. If the user wishes to regenerate it, he may use the pfw_rebuild_settings option. - Fix Clang issues within Configurable Audio Policy Fix compilation issues revealed when switching to CLANG compiler within the configurable version of policy engine. Change-Id: I3edc26db94c0bf8a76430ab8081bae52e9193705 Signed-off-by: François Gaffie <francois.gaffie@intel.com>
* | | Merge "audiopolicy: Add AUDIO_OUTPUT_FLAG_TTS to flags enum table" into mnc-devEric Laurent2015-06-181-0/+1
|\ \ \ | |/ / |/| |
| * | audiopolicy: Add AUDIO_OUTPUT_FLAG_TTS to flags enum tableRavi Kumar Alamanda2015-06-181-0/+1
| |/ | | | | | | | | | | | | | | Without an entry in sOutputFlagNameToEnumTable, a profile with specific output flag in the audio_policy.conf will not be detected by AudioPolicyManager. Change-Id: Id242e6819aab1a67d72c564f3cc39af3de8e1ef7
* | Merge "audio policy: fix explicit routing and accessibility" into mnc-devEric Laurent2015-06-181-1/+8
|\ \ | |/ |/|
| * audio policy: fix explicit routing and accessibilityEric Laurent2015-06-111-1/+8
| | | | | | | | | | | | | | | | | | If a session has an active explicit routing request, this routing must also be applied to accessibility prompts if accessibility usage is currrently remapped to the strategy used by this session. Bug: 20873151. Change-Id: I97c6ece98cf1af9c64c2d2eb1fe382c7c0d657b4
* | Merge "Fix AudioRecord cleanup if construction fails" into mnc-devAndy Hung2015-06-131-1/+3
|\ \
| * | Fix AudioRecord cleanup if construction failsAndy Hung2015-06-121-1/+3
| | | | | | | | | | | | | | | Bug: 11671194 Change-Id: Id48350264f8b5ce53bf7ce2b308bf4ba21e59241
* | | Merge "Fix rounding width." into mnc-devRuben Brunk2015-06-121-3/+2
|\ \ \
| * | | Fix rounding width.Ruben Brunk2015-06-121-3/+2
| | | | | | | | | | | | | | | | | | | | Bug: 19930700 Change-Id: I9d5685bd98a049fcb01f6ecc649f15f3b4498e6d
* | | | Merge "audiopolicy: use deep buffer output by default for music streams" ↵Andy Hung2015-06-111-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | into mnc-dev
| * | | | audiopolicy: use deep buffer output by default for music streamsRavi Kumar Alamanda2015-06-111-0/+5
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default disabled. This is enabled by adb shell setprop audio.deep_buffer.media 1 Applications that use AudioTrack java interface for audio rendering defaults to primary output as flags indicated as FLAG_NONE. If the primary output is low latency output, it results higher power consumption than deep-buffer path if used. Make the deep buffer output as default option for music streams if flags are not specified. It may also be used for testing audio glitches from heavy CPU or DRM which may cause issues with the FastMixer. Bug: 21198655 Bug: 21785618 Change-Id: I909c296ddcf4484b9a877ef1c0230ea58537e06a
* | | | Merge "AudioFlinger: flush stream when switching tracks" into mnc-devPhil Burk2015-06-112-24/+45
|\ \ \ \ | |_|_|/ |/| | |
| * | | AudioFlinger: flush stream when switching tracksPhil Burk2015-06-112-24/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For direct threads, when recycling a stream, perform a flush so that the frame position is reset. Bug: 21145353 Change-Id: I08611cd64bb249a9659c44f9e4c47e7455f4838f Signed-off-by: Phil Burk <philburk@google.com>
* | | | Merge "audio policy: route media to BT SCO in call" into mnc-devEric Laurent2015-06-101-0/+4
|\ \ \ \
| * | | | audio policy: route media to BT SCO in callEric Laurent2015-06-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow media (and Navigation instructions) to be routed to BT SCO in call. Bug: 18986190. Change-Id: I1fa4decfbf035623fdcc8681b53cbd61e1d5f933
* | | | | Merge "CameraService: Add consumer name to output stream dumpsys" into mnc-devEino-Ville Talvala2015-06-0921-47/+56
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | CameraService: Add consumer name to output stream dumpsysEino-Ville Talvala2015-06-0921-47/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also switch use of ANativeWindow to Surface, to get to the getConsumerName() method where necessary. Surface can always be cast to ANativeWindow, but not the other way around, so it's a better option anyway. Change-Id: Ie5c2d30821c1a754f9e382699ff50b4b328288b3
* | | | | Merge "Camera3Device: Default-initialize operating mode." into mnc-devEino-Ville Talvala2015-06-091-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Camera3Device: Default-initialize operating mode.Eino-Ville Talvala2015-06-091-1/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Since configureStreams is only called by CameraDeviceClient, the operation mode could default-initialize to CONSTRAINED_HIGH_SPEED for API1 operation. Change-Id: Ide71af07ca3925db8e450d00def1daeb44d8046a
* | | | Merge "Take advantage of audio_channel_in_mask_from_count" into mnc-devGlenn Kasten2015-06-091-5/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Take advantage of audio_channel_in_mask_from_countGlenn Kasten2015-06-091-5/+3
| |/ / | | | | | | | | | | | | | | | Bug: 21375533 Bug: 21721483 Change-Id: I1ccd5d1d68a25f415dc4a62bf7a44d9db12a256b
* | | Camera1 API: Support SW encoders for new camera HALsEino-Ville Talvala2015-06-0815-50/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Support new set video format/dataspace command in camera service - HALv3: Select gralloc usage flags based on format - HALv1: Pass format command directly to HAL layer - Use format/dataspace command in CameraSource - Switch all API1 recording to use metadata mode - Switch all >= HALv2 API1 recording to use kMetadataBufferTypeANWBuffer Bug: 13222807 Change-Id: I2e609b92c65792611bb1dab09e0c41c363ebbc42
* | | audio policy: fix very verbose log build.Eric Laurent2015-06-081-1/+2
|/ / | | | | | | Change-Id: I94a69207059d8010ded14bce5d6e39c3f3074649
* | Camera: Change error for app ops reject, propagate binder errorsEino-Ville Talvala2015-06-051-1/+2
|/ | | | | | | | | | | | | | | | | | | | | | INVALID_OPERATION surfaces as an non-specific device-level error to applications in the onError callback. This is not a condition apps targeting camera2 in L will generally have to deal with. Instead, return -EACCESS which maps to throwing CameraAccessException.CAMERA_DISABLED, same as disabling camera access with DevicePolicyManager. The old camera API converts any error code to -EACCESS at the JNI layer, so this doesn't change anything for the older API. Also update the various native ICameraService binder connect calls to check for the transact error code, and return it if it is not OK. Without this, PERMISSION_DENIED transact errors from the camera service cannot be distinguished from CAMERA_DISABLED errors in some codepaths. Bug: 21604925 Change-Id: Ifccc8989b8c20653429e2d3e51dba7abb2be9c35
* Camera2: implement high speed video APIsZhijun He2015-06-038-10/+53
| | | | | Bug: 21442271 Change-Id: Ia0ae5bbd3e8c81bad293c29987301a2457817d12
* Merge "Throttle MixerThread data pull to no more than twice expected rate" ↵Andy Hung2015-06-032-3/+38
|\ | | | | | | into mnc-dev
| * Throttle MixerThread data pull to no more than twice expected rateAndy Hung2015-06-032-3/+38
| | | | | | | | | | | | | | | | | | | | | | | | This helps prevent underruns with NuPlayer and other applications which set up buffers that are close to minimum size or use deep buffers, and rely on a double-buffering sleep strategy to fill. Enabled by default. Disabled by setting af.thread.throttle 0 Bug: 19062223 Bug: 21198655 Change-Id: Ia52b48e0c99588af5db53c43fede2afd775b8899
* | Fix buildGlenn Kasten2015-06-021-0/+1
| | | | | | | | Change-Id: I4d1e396d812b6a22087d35156633451d5c1c36bc
* | Allow capture by root for command-line native testingGlenn Kasten2015-06-021-0/+4
|/ | | | Change-Id: I3cafd70b7770c7e4b578d39a8d570572829f2c59
* Merge "Add property to control audio offload with video content" into mnc-devAndy Hung2015-06-021-2/+3
|\
| * Add property to control audio offload with video contentAndy Hung2015-06-011-2/+3
| | | | | | | | | | | | | | Property audio.offload.video normally disabled (set to 1 to enable) Bug: 21198655 Change-Id: Ib1c457b1e3950f18d91b855424aa80bd23c723b0
* | Merge "Track camera and flashlight usage in battery stats." into mnc-devRuben Brunk2015-06-024-51/+205
|\ \
| * | Track camera and flashlight usage in battery stats.Ruben Brunk2015-06-014-51/+205
| | | | | | | | | | | | | | | | | | Bug: 15986092 Change-Id: I9dc6828332e4091fd93bf2d82839e8e3862a2fc2
* | | Merge "Camera3: fix aborting reprocess requests" into mnc-devChien-Yu Chen2015-06-012-24/+39
|\ \ \
| * | | Camera3: fix aborting reprocess requestsChien-Yu Chen2015-06-012-24/+39
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get an input buffer right after camera service takes one reprocess capture request from the request queue to prevent the input buffers getting out of order. When aborting pending reprocess requests in the request queue, also abort the same amount of input buffers. Bug: 21028914 Change-Id: I7cfacecb4c24509f59c983abd587db5a403237bd