summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 1487d270: Merge "audio policy: binder calls for dynamic audio policy ↵Eric Laurent2014-12-108-2/+95
|\ | | | | | | | | | | | | mixes" into lmp-mr1-dev * commit '1487d270e86845e93a9abd1af020b45d6799b257': audio policy: binder calls for dynamic audio policy mixes
| * Merge "audio policy: binder calls for dynamic audio policy mixes" into ↵Eric Laurent2014-12-108-2/+95
| |\ | | | | | | | | | lmp-mr1-dev
| | * audio policy: binder calls for dynamic audio policy mixesEric Laurent2014-12-098-2/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add binder calls to register and unregister dynamic mixes to AudioPolicyManager. Bug: 16009464. Change-Id: I4ef38166d0cfc88c984970969380d0cd6eb083ac
* | | am 2dda40d6: Merge "audio policy: add support for custom mixes" into lmp-mr1-devEric Laurent2014-12-108-106/+648
|\ \ \ | |/ / | | | | | | | | | * commit '2dda40d638138c426cf4a66ddd0da8794c87f5c7': audio policy: add support for custom mixes
| * | Merge "audio policy: add support for custom mixes" into lmp-mr1-devEric Laurent2014-12-108-106/+648
| |\ \ | | |/
| | * audio policy: add support for custom mixesEric Laurent2014-12-098-106/+648
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for custom mixes in AudioPolicyManager. Two methods are added to register or unregister a list of custom mixes with their attributes and format. getOutputForAttr() and getInputForAttr() first look for a match in registered mixes before defaulting to normal output/input selection Remote submix device connection disconnection now takes address into account to identify the correspnoding custom mix. Bug: 16009464. Change-Id: I3f1c2a485a0fb71b1f984ed0adc9b68aa971e408
* | | am 9cea7aa4: Merge "Camera3Device: support shutter after result" into ↵Chien-Yu Chen2014-12-092-141/+234
|\ \ \ | |/ / | | | | | | | | | | | | | | | lmp-mr1-dev * commit '9cea7aa494f6f93a473cab936af79868fc8efea6': Camera3Device: support shutter after result
| * | Merge "Camera3Device: support shutter after result" into lmp-mr1-devChien-Yu Chen2014-12-092-141/+234
| |\ \
| | * | Camera3Device: support shutter after resultChien-Yu Chen2014-12-092-141/+234
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the code to remove in-flight requests from processCaptureResult to a separate function so it can be called when the framework receives a result or a shutter event. An in-flight request will only be removed when both results and the shutter event arrive in the case of a successful request. Also send out results only after the shutter event receives. Bug: 18135776 Change-Id: I340db1a495c711b0913784d43fd0f144871e4420
* | | | am 6533dc1c: Merge "Camera2: Round unsupported surface sizes in configure." ↵Ruben Brunk2014-12-092-4/+81
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '6533dc1c576af241c9c1753f29d6777802d4c496': Camera2: Round unsupported surface sizes in configure.
| * | | Merge "Camera2: Round unsupported surface sizes in configure." into lmp-mr1-devRuben Brunk2014-12-092-4/+81
| |\ \ \ | | |/ / | |/| |
| | * | Camera2: Round unsupported surface sizes in configure.Ruben Brunk2014-12-052-4/+81
| | | | | | | | | | | | | | | | | | | | Bug: 16030677 Change-Id: Ida04e04f41983b9126609522dd12064a7bf9645f
* | | | am f6a364ed: Merge "Fix AAC recording issue" into lmp-mr1-devMarco Nelissen2014-12-091-1/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'f6a364ed92945bf8a39dbadddb674c3f2e3b7d53': Fix AAC recording issue
| * | | Merge "Fix AAC recording issue" into lmp-mr1-devMarco Nelissen2014-12-091-1/+2
| |\ \ \ | | |_|/ | |/| |
| | * | Fix AAC recording issueMarco Nelissen2014-12-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix uninitialized variable that caused ADTS recording to incorrectly specify LTP object in the header. Bug: 17895547 Change-Id: I75650f4963f4f371cd191bc635e32c9ab17fa8c9
* | | | am 82a69ea8: Prevent ANR when AudioTrack is paused or re-routedzunkyu.lee2014-12-091-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '82a69ea8b090d57bff5e02774688b546a711bbb8': Prevent ANR when AudioTrack is paused or re-routed
| * | | Prevent ANR when AudioTrack is paused or re-routedzunkyu.lee2014-12-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If ClientProxy was interrupted by AudioTrack::pause() just before futex syscall() in obtainBuffer() was called, It will not call releaseBuffer to wake up AudioTrackThread. It puts the AudioTrackThread to sleep and then a deadlock occurs. In this case, CBLK_INTERRUPT flags can't prevent a deadlock, so this patch set mFutex to FUTEX_WAKE during interrupt() to avoid deadlock. A similar problem could occur due to re-route or recovery after mediaserver death. Bug: 18641665 Change-Id: I66fcae43af9a91eb55f6cdb52c644ee6c0999772
* | | | am ca7b4bc4: mediaplayerservice: add support for legacy DRMLajos Molnar2014-12-061-3/+32
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'ca7b4bc40604ae4f06718cb34945fdab278987ae': mediaplayerservice: add support for legacy DRM
| * | | mediaplayerservice: add support for legacy DRMLajos Molnar2014-12-051-3/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Legacy DRM uses AwesomePlayer for widevine content. Bug: 18006370 Change-Id: I1de9e33de51b60352a9c79c2dcedec330160abe4
* | | | am a9d2f9fb: Merge "stagefright: preserve output format flags on format ↵Lajos Molnar2014-12-062-2/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | change" into lmp-mr1-dev * commit 'a9d2f9fbbfa6e8daa3252e88e9861d7f80a974ff': stagefright: preserve output format flags on format change
| * | | Merge "stagefright: preserve output format flags on format change" into ↵Lajos Molnar2014-12-062-2/+6
| |\ \ \ | | | | | | | | | | | | | | | lmp-mr1-dev
| | * | | stagefright: preserve output format flags on format changeLajos Molnar2014-12-052-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some flags are only set in configure, and get lost when output format changes. Bug: 17383204 Change-Id: I2011bce70920c4ee46fccc378da3b428f3395c11
* | | | | am 80c57d57: Merge "NuPlayerRenderer: Update mAnchorMaxMediaUs when anchor ↵Wei Jia2014-12-064-1/+16
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | time is changed to fix pause-seek-getCurrentPosition." into lmp-mr1-dev * commit '80c57d570238f9f213ccfe818e285090daeafd63': NuPlayerRenderer: Update mAnchorMaxMediaUs when anchor time is changed to fix pause-seek-getCurrentPosition.
| * | | | Merge "NuPlayerRenderer: Update mAnchorMaxMediaUs when anchor time is ↵Wei Jia2014-12-064-1/+16
| |\ \ \ \ | | | | | | | | | | | | | | | | | | changed to fix pause-seek-getCurrentPosition." into lmp-mr1-dev
| | * | | | NuPlayerRenderer: Update mAnchorMaxMediaUs when anchor time is changed to ↵Wei Jia2014-12-054-1/+16
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix pause-seek-getCurrentPosition. NuPlayerDecoder: Notify resume is done when EOS is reached. GenericSource: add code to signal pre-roll for seek so that it will seek to the requested position, not only I-frame. This code is disabled temporarily till we have a full solution to handle both single seek and continous seek gracefully. Bug: 18625723 Change-Id: I99a54d4d549e0d805e3abcc227fbf96c16405af0
* | | | | am 18265202: Merge "audio policy: fix inifinite loop in clearAudioPatches()" ↵Eric Laurent2014-12-061-5/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '18265202049bfa53fe5b18a95d956325acca9c7b': audio policy: fix inifinite loop in clearAudioPatches()
| * | | | Merge "audio policy: fix inifinite loop in clearAudioPatches()" into lmp-mr1-devEric Laurent2014-12-061-5/+2
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | audio policy: fix inifinite loop in clearAudioPatches()Eric Laurent2014-12-051-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | releaseAudioPatch() does not necessarily remove the audio patch from the list. Scan the list from the top down to avoid adjusting the index. Bug: 18621514. Change-Id: I58787154680f7cb1818509017835b1693d62190f
* | | | | am a147c17a: Merge "fixes for non-secure widevine playback" into lmp-mr1-devChong Zhang2014-12-052-13/+32
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'a147c17adabaab819ac108fbc448c49525cf74bc': fixes for non-secure widevine playback
| * | | | Merge "fixes for non-secure widevine playback" into lmp-mr1-devChong Zhang2014-12-052-13/+32
| |\ \ \ \
| | * | | | fixes for non-secure widevine playbackChong Zhang2014-12-052-13/+32
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - separate secure decoding from widevine - use non-blocking mode when reading from widevine source - schedule buffer read when packet source is empty bug: 18536934 Change-Id: I65a8e5e819975ca6900ed8e887a442940f2d5d38
* | | | | am cbbe1ccc: Merge "audio policy: fix AudioPort parameter checks" into ↵Eric Laurent2014-12-051-0/+20
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'cbbe1ccc41a86fbf009767bbdab43232e6c369c0': audio policy: fix AudioPort parameter checks
| * | | | Merge "audio policy: fix AudioPort parameter checks" into lmp-mr1-devEric Laurent2014-12-051-0/+20
| |\ \ \ \
| | * | | | audio policy: fix AudioPort parameter checksEric Laurent2014-12-041-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Accept any value for sampling rate, format or channel mask if the list of supported values is empty in the AudioPort. Bug: 18575607. Change-Id: I93e1942b89c630e3fee490799a8f8d79f7831ab7
* | | | | | am 57216ca4: Merge "Track volume should be maintained even if track is ↵Glenn Kasten2014-12-051-1/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | restored" into lmp-mr1-dev * commit '57216ca41b2d7e35bda01ce910ae6e72ed01bfae': Track volume should be maintained even if track is restored
| * | | | | Merge "Track volume should be maintained even if track is restored" into ↵Glenn Kasten2014-12-051-1/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | * | | | | Track volume should be maintained even if track is restoredseunghak.han2014-12-051-1/+5
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If track is restored when it set its volume to a non-unity value (such as mute), the volume was forced to unity again. Now, the previous volume is restored. Bug: 18570664 Change-Id: I79f34c6c7d6f535baba813fd3b8ba8e55cac8ad7
* | | | | | am 597ce69a: Merge "Camera: Add support for SCENE_MODE_HDR for newer HALs" ↵Eino-Ville Talvala2014-12-051-0/+6
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '597ce69a77636eab073fc83ded01e8af51e887e2': Camera: Add support for SCENE_MODE_HDR for newer HALs
| * | | | | Merge "Camera: Add support for SCENE_MODE_HDR for newer HALs" into lmp-mr1-devEino-Ville Talvala2014-12-051-0/+6
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Camera: Add support for SCENE_MODE_HDR for newer HALsEino-Ville Talvala2014-12-051-0/+6
| | |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 18640480 Change-Id: I7b772d10b2bd136c78395fd2816114b27bb48d00
* | | | | am 9257000c: camera: fix logging in ZslProcessor to avoid spamRuchit Sharma2014-12-051-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '9257000c453c1a6f6bf073ff0bf3ba7ef9baf183': camera: fix logging in ZslProcessor to avoid spam
| * | | | camera: fix logging in ZslProcessor to avoid spamRuchit Sharma2014-12-051-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AF state mismatch while selecting ZSL candidate should not be treated as a warning. This results into undesriable spam in the logs. ALso, using ALOGVV is consistent with how AE state mismatch is handled in ZslProcessor3.cpp Bug: 18634318 Change-Id: Ia9d7f2bb98f784990b1a6f923983c35f622c3791
* | | | am d6e7f1e1: Merge "Fix for AOSP force virtualization mode" into lmp-mr1-devRicardo Garcia2014-12-051-4/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'd6e7f1e1f8b1dfa6a87c7c0b1a5c68d435096b01': Fix for AOSP force virtualization mode
| * | | Merge "Fix for AOSP force virtualization mode" into lmp-mr1-devRicardo Garcia2014-12-051-4/+6
| |\ \ \
| | * | | Fix for AOSP force virtualization modeRicardo Garcia2014-12-041-4/+6
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forcing virtualization mode with AOSP code might erroneously return a failed code, whilst it was correct. Fixing the condition for Automatic mode. bug: 18538537 Change-Id: I5837ff40cfed04c99889813cd56ebe3d90793e74
* | | | am b65842dd: Merge "Fix NuPlayer assertion on failure to create AudioTrack" ↵Andy Hung2014-12-0510-82/+88
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit 'b65842dd9447a7925046b2285b2aa8459dc63ed3': Fix NuPlayer assertion on failure to create AudioTrack
| * | | Merge "Fix NuPlayer assertion on failure to create AudioTrack" into lmp-mr1-devAndy Hung2014-12-0510-82/+88
| |\ \ \
| | * | | Fix NuPlayer assertion on failure to create AudioTrackAndy Hung2014-12-0310-82/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under heavy media load or monkey/stress testing, more than 32 AudioTracks may be created or memory resources may be scarce. Remove the assertion on failure to create AudioTrack and signal MEDIA_ERROR. Bug: 17319843 Change-Id: I5d4e200b5f50d800046851a33e035cdc6ff10075
* | | | | am 76c156f7: Merge "fix threading in RTSPSource and StreamingSource" into ↵Chong Zhang2014-12-054-39/+172
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '76c156f71f398d08fd88100f499a8a41ddfd3808': fix threading in RTSPSource and StreamingSource
| * | | | Merge "fix threading in RTSPSource and StreamingSource" into lmp-mr1-devChong Zhang2014-12-054-39/+172
| |\ \ \ \
generated by cgit v1.1 at 2024-08-02 01:23:42 +0000