summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Add test-mixer AudioMixer test program"Andy Hung2014-06-233-0/+458
|\
| * Add test-mixer AudioMixer test programAndy Hung2014-06-203-0/+458
| | | | | | | | | | | | | | The shell script mixer_to_wav_tests.sh shows how to use test-mixer. Change-Id: Ia7f1a368972c9c33fadc96df4cb1fc8b22446c8c
* | Camera2: get stream configs by device verisonYin-Chia Yeh2014-06-209-82/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting from device version 3.2, the following tags: ANDROID_SCALER_AVAILABLE_FORMATS ANDROID_SCALER_AVAILABLE_JPEG_MIN_DURATIONS ANDROID_SCALER_AVAILABLE_JPEG_SIZES ANDROID_SCALER_AVAILABLE_PROCESSED_MIN_DURATIONS ANDROID_SCALER_AVAILABLE_PROCESSED_SIZES ANDROID_SCALER_AVAILABLE_RAW_MIN_DURATIONS ANDROID_SCALER_AVAILABLE_RAW_SIZES are deprecated and replaced by: ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS Change-Id: Iadc34af0ea985a16a25759d7a9a3eb4845c486fd
* | Merge "Camera2: Fix lastFrameNumber counter in flush case"Yin-Chia Yeh2014-06-202-0/+26
|\ \
| * | Camera2: Fix lastFrameNumber counter in flush caseYin-Chia Yeh2014-06-202-0/+26
| | | | | | | | | | | | | | | | | | | | | Decrement the counter for those repeating requests never sent to device. Change-Id: I2064e51cb5d509d86dbde4a89e8157de33f574b0
* | | Merge "Camera2/3: Don't release recording buffer when stream is active"Zhijun He2014-06-201-4/+7
|\ \ \
| * | | Camera2/3: Don't release recording buffer when stream is activeZhijun He2014-06-181-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is dangerous to release all recording buffers when recording stream is actively sending buffer to encoder. This change only releases all buffers when recording stream is idle and recording stream is about to start. Bug: 15667833 Change-Id: Ia4a84cac84a2062c13333467c66698273ffb0e23
* | | | libcameraservice: 64-bit compile warningsMark Salyzyn2014-06-201-2/+2
| | | | | | | | | | | | | | | | Change-Id: I168332a0d4699f6f5597d4883342aa7af7ed92c6
* | | | audiopolicy: 64-bit compile warningsMark Salyzyn2014-06-201-9/+9
| | | | | | | | | | | | | | | | Change-Id: I71db11499c4b0c434df8144c633d42282f5823c2
* | | | Merge "camera: Let #connectLegacy calls through with unspecified HAL version"Igor Murashkin2014-06-201-1/+8
|\ \ \ \
| * | | | camera: Let #connectLegacy calls through with unspecified HAL versionIgor Murashkin2014-06-201-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables the camera2 shim to open a camera1 device without turning the error codes into a RuntimeException. Change-Id: I08d9d1e30e72025c41bd54b702d7ae95b32257be
* | | | | Merge "Extract out test utility functions from resampler_tests"Andy Hung2014-06-203-202/+322
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Extract out test utility functions from resampler_testsAndy Hung2014-06-183-202/+322
| | |/ | |/| | | | | | | | | | | | | These will be used for mixer tests later. Change-Id: I22b1c89857058cfb2450afe15e80d6c9306a31f1
* | | cameraservice: Implement HAL1 and higher HAL API coexistenceZhijun He2014-06-194-27/+126
| | | | | | | | | | | | | | | | | | | | | A higher hal version device like HAL3.2 can be opened as HAL1.0 device if HAL supports it. This only applies to camera API1. Change-Id: I4ae9f59f4317158cc1bd7ed7726e4032cdd1fa07
* | | AudioTrack: add support for compressed audioEric Laurent2014-06-194-16/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for compressed audio playback by use of an AudioTrack attached to a direct output thread. Bug: 9428304. Change-Id: I4a61be9cf0e31003ca85935d6e0ee38ca8192e03
* | | Merge changes I0fef0584,I322b91faJean-Michel Trivi2014-06-185-2/+169
|\ \ \ | |_|/ |/| | | | | | | | | | | * changes: AudioPolicyManager: return output for audio attributes AudioTrack construction with audio attributes
| * | AudioPolicyManager: return output for audio attributesJean-Michel Trivi2014-06-185-2/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In AudioPolicyManager, support querying an output or playback strategy for audio attributes, instead of a stream type, In AudioTrack creation, use the output returned for the track's attributes. Change-Id: I0fef05845ba676404775e2e338c10e6a96237268
* | | Merge "camera: Add #getLegacyParameters, #supportsCameraApi to ICameraService"Igor Murashkin2014-06-172-23/+145
|\ \ \
| * | | camera: Add #getLegacyParameters, #supportsCameraApi to ICameraServiceIgor Murashkin2014-06-172-23/+145
| | |/ | |/| | | | | | | Change-Id: Ic86c8df3d703e7cf89caa856387e2c0a1b977401
* | | CameraService: Fix permissions check issuesEino-Ville Talvala2014-06-171-4/+5
|/ / | | | | | | | | Bug: 15677063 Change-Id: I012c111fff90fefd9eb0fef7c9d6034f00c9c6df
* | am a3603693: Merge "Fix deadlock" into lmp-preview-devGlenn Kasten2014-06-161-5/+8
|\ \ | | | | | | | | | | | | * commit 'a3603693fb784d7e1a820ee4629a69730a0bb424': Fix deadlock
| * \ Merge "Fix deadlock" into lmp-preview-devGlenn Kasten2014-06-161-5/+8
| |\ \
| | * | Fix deadlockGlenn Kasten2014-06-161-5/+8
| | | | | | | | | | | | | | | | | | | | Bug: 15591052 Change-Id: I76154e1640646d2ae8fae65e163e1f3ed1be17dc
* | | | Merge "camera2: Add jpeg sizes to legacy mode static characteristics."Ruben Brunk2014-06-161-9/+20
|\ \ \ \ | |_|_|/ |/| | |
| * | | camera2: Add jpeg sizes to legacy mode static characteristics.Ruben Brunk2014-06-121-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15116722 - Adds jpeg size mapping to available output formats. Change-Id: I73e46dd4309767ba41156d9ba03c4724bf234758
* | | | am 3bcffa13: force command flush after releasing a reference to shared memoryEric Laurent2014-06-131-2/+2
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '3bcffa136909c1fb6e88ee4efd12ccac18360a85': force command flush after releasing a reference to shared memory
| * | | force command flush after releasing a reference to shared memoryEric Laurent2014-06-131-2/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After releasing a reference to a shared memory interface, IPCThreadState::self()->flushCommands() must be called to ensure that the corresponding reference is also cleared immediately in the remote process. Otherwise the binder implementaiton will not push the clear systematically causing the memory region not to be freed. See issues 10711502 and 2801375. Bug: 14057166. Change-Id: If55f36f00d452d6cf00cf83bd2fba1c8f3abcb57
* | | frameworks: av: fix bug in the volume managementBryant Liu2014-06-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | which can cause volume levels to be applied twice. After applying volume in the effect chain, the remaining volume needs to be converted back to floating point before providing to mAudioMixer. Bug: 15583440 Change-Id: I3c884f95b0fa9ad1b554285b069601c850c54776 Signed-off-by: Glenn Kasten <gkasten@google.com>
* | | am 0ac53364: Merge "Fix non-monotonic AudioTrack::getTimestamp after pause" ↵Glenn Kasten2014-06-122-3/+36
|\ \ \ | |/ / | | | | | | | | | | | | | | | into lmp-preview-dev * commit '0ac53364b79dc72ee0c09f0efc46a22ab4374dbf': Fix non-monotonic AudioTrack::getTimestamp after pause
| * | Merge "Fix non-monotonic AudioTrack::getTimestamp after pause" into ↵Glenn Kasten2014-06-102-3/+36
| |\ \ | | | | | | | | | | | | lmp-preview-dev
| | * | Fix non-monotonic AudioTrack::getTimestamp after pauseGlenn Kasten2014-06-102-3/+36
| | | | | | | | | | | | | | | | | | | | Bug: 15523502 Change-Id: Ifd4aa7fca197bc041c1620fc3f7d953a8902551a
| * | | Merge "Update resampler to fetch exactly the frames needed" into lmp-preview-devAndy Hung2014-06-101-20/+36
| |\ \ \
| | * | | Update resampler to fetch exactly the frames neededAndy Hung2014-06-111-20/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids unnecessary overfetching/releasing, which could cause problems with the upstream AudioBufferProvider. A one input sample delay is placed on the stream compared with the previous implementation. This change only affects the Dynamic resampler. Bug: 15548547 Change-Id: Ic7fcff130e0081b4724cfb5a00dc8e8b4a8b1af3 (cherry picked from commit 717007429a50c02d2acc704a8c1ebbe6760a2c22)
| * | | | Merge "DO NOT MERGE: camera2: Disallow connectDevice for all old HALs." into ↵Ruben Brunk2014-06-101-3/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | lmp-preview-dev
| | * | | | DO NOT MERGE: camera2: Disallow connectDevice for all old HALs.Ruben Brunk2014-06-101-3/+2
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (preview only) Bug: 15515564 Change-Id: I14ab73b130ee5355d9cc8b3602738022a5a18710
* | | | | Merge "Camera3: Separate the video and preview size filtering"Zhijun He2014-06-102-14/+36
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Camera3: Separate the video and preview size filteringZhijun He2014-06-102-14/+36
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Supported video sizes were generated from supported preview sizes, which effectively filtered out sizes larger than 1080p. This change filters the supported video sizes based on the media profiles supported h.264 max video frame width and height. Bug: 15287656 Change-Id: Ifbd9d37fb775371e2a4ee5cf80abbf83a75ffd65
* | | | am 3416f9ac: Merge "Camera2: Add null check to createStream" into ↵Yin-Chia Yeh2014-06-111-0/+4
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | lmp-preview-dev * commit '3416f9ac471f97e9544ee821a97a101cbdd25b11': Camera2: Add null check to createStream
| * | | Camera2: Add null check to createStreamYin-Chia Yeh2014-06-101-0/+4
| |/ / | | | | | | | | | | | | | | | | | | Prevent a native null dereference crash. bug: 15332257 Change-Id: I10c4053a0b4f07fbf52c37dd2f2853b501def669
| * | DO NOT MERGE - AudioFlinger: increase per client memory poolEric Laurent2014-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Temporary workaround for issue 14057166 allowing AudioTracks from a given client to use up to 4MB of shared memory. Bug: 14057166. Change-Id: I19adb8d424ed170df61c1cd706be3d10788edfc1
* | | Merge "audio policy: use factory to create audio policy manager"Eric Laurent2014-06-104-4/+50
|\ \ \
| * | | audio policy: use factory to create audio policy managerEric Laurent2014-06-104-4/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the class factory to create the audio policy mamager instead of AudioPolicyManager class constructor and use a pointer to an AudioPolicyInterface. Change-Id: Ibb5a8eee5d597db67cf13f279c909181cfee9949
* | | | Merge "sound trigger: stop recognition on sound model unload"Eric Laurent2014-06-101-1/+5
|\ \ \ \
| * | | | sound trigger: stop recognition on sound model unloadEric Laurent2014-06-091-1/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Force a stop recognition command to the HAL when unloading a sound model and recognition is still active. Change-Id: I7379a64a37bbc3eeea08e0e1d59e427de9544a10
* | | | Merge "Add tests directory for AudioFlinger"Andy Hung2014-06-094-0/+535
|\ \ \ \
| * | | | Add tests directory for AudioFlingerAndy Hung2014-05-284-0/+535
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Native tests for audio resampler through gtest framework. Change-Id: Ia340ca51f9b9b78d67e03e3541e4462b98578c95
* | | | | audio policy service: fix potential deadlock in destructorEric Laurent2014-06-081-8/+16
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the AudioCommandThread loop, release mLock before releasing the strong reference on the service as AudioPolicyService destructor calls AudioCommandThread::exit() which acquires mLock. Also check exiPending in thread loop before processing pending commands or sleeping. Bug: 15449050. Change-Id: I148bf21bd67ef721b5b5ee2c1a6afb185c59daa3
* | | | am 318cd78e: Merge "audio policy: added audio HAL version in ↵Eric Laurent2014-06-074-3/+160
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | audio_policy.conf" into lmp-preview-dev * commit '318cd78e3b8503113919191b3711eb8be5d23d35': audio policy: added audio HAL version in audio_policy.conf
| * | | audio policy: added audio HAL version in audio_policy.confEric Laurent2014-06-064-3/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each hardware module section in audio_policy.conf indicates the audio HAL version it implements. Also added a template audio_policy.conf file with examples of device and gain descriptors added for audio HAL version3.0. Bug: 14815883. Change-Id: Id219d121f81f687363f6c18f2d1684b2448dcdf4
* | | | Merge "Audio policy: new media volume curve for speaker with DRC"Jean-Michel Trivi2014-06-062-0/+8
|\ \ \ \