summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge "stagefright: add graceful handling when setting port definition" into ↵Lajos Molnar2014-11-251-12/+12
|\ \ \ | |_|/ |/| | | | | lmp-mr1-dev
| * | stagefright: add graceful handling when setting port definitionLajos Molnar2014-11-251-12/+12
| |/ | | | | | | | | | | | | | | | | - don't crash when count of buffers is incorrect, or when the buffer size decreases. This allows configuring SW video encoders for smaller than QCIF size. Bug: 18513091 Change-Id: Ibfcd6b883a892156e408e94fbc329103b9ac09ac
* | fix the build.Eric Laurent2014-11-251-8/+1
| | | | | | | | Change-Id: Iab6b65327ae1adbf0b3a6da5a23b8107468f533e
* | audio: new routing strategies and stream typesEric Laurent2014-11-2112-54/+171
|/ | | | | | | | | | | | | Added new routing strategies and stream type for internal use by audio policy manager and audio flinger: - One for accessibility to allow different routing than media - One for re-routing (remote submix) in preparation of dynamic policies - Added stream type for "internal" audio flinger tracks used for audio patches and duplication. Bug: 18067208. Change-Id: I88f884b552e51e4a49c29125e5a1204cf58ff434
* Merge "Camera2: Fix CameraParameters parse segfault." into lmp-mr1-devRuben Brunk2014-11-212-0/+6
|\
| * Camera2: Fix CameraParameters parse segfault.Ruben Brunk2014-11-202-0/+6
| | | | | | | | | | Bug: 18331142 Change-Id: I41feec93f753f97b3e6bf963deb4a42b73406421
* | Merge "tunnel NuPlayer source and decoder input" into lmp-mr1-devChong Zhang2014-11-2113-1296/+1505
|\ \
| * | tunnel NuPlayer source and decoder inputChong Zhang2014-11-2013-1296/+1505
| | | | | | | | | | | | | | | | | | Bug: 18342383 Change-Id: Ieff1cd3bad2b39d46f127ddd5d5139b919992461
* | | Merge "SoundTrigger: allow sound model reloading" into lmp-mr1-devEric Laurent2014-11-202-0/+19
|\ \ \
| * | | SoundTrigger: allow sound model reloadingEric Laurent2014-11-202-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow reloading a sound model without unloading it before. Bug: 18308781. Change-Id: I31c83b81a03ee1c1e80f4339ca62e6d06fb1a33b
* | | | Merge "Fix format conversion in DuplicatingThread" into lmp-mr1-devGlenn Kasten2014-11-201-8/+8
|\ \ \ \
| * | | | Fix format conversion in DuplicatingThreadHaynes Mathew George2014-11-201-8/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DuplicatingThread converts PCM data from the format of the source thread to PCM_16BIT before writing to all connected output tracks. This needs to be done just once before writing to all tracks. Bug: 18461844 Change-Id: If05254f87f9198e09a0fa3c4e857afbb53ae7073
* | | | Merge "NuPlayer: invalid anchor time when render is flushed." into lmp-mr1-devRonghua Wu2014-11-202-0/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | NuPlayer: invalid anchor time when render is flushed.Ronghua Wu2014-11-192-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also rememeber the pause time in NuPlayerDriver. Bug: 18436336 Change-Id: If09f680a0d0f9137bd55c5f94201eb3aa783278a
* | | | Merge "camera2: fix an error reading a NULL string" into lmp-mr1-devChien-Yu Chen2014-11-201-3/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | camera2: fix an error reading a NULL stringChien-Yu Chen2014-11-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle the case where the surface name isn't set. Bug: 10461464 Change-Id: I3ee233a7a5f6489513e6d87241cda2aaefbfd43b
* | | | Merge "close fd if data source is reset without prepare" into lmp-mr1-devChong Zhang2014-11-201-1/+7
|\ \ \ \
| * | | | close fd if data source is reset without prepareChong Zhang2014-11-191-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | bug: 18434887 Change-Id: I70dff721710b7299d1ca1f8520278f82d355141d
* | | | | Merge "Fix missing loop count for static tracks." into lmp-mr1-devGlenn Kasten2014-11-202-23/+46
|\ \ \ \ \
| * | | | | Fix missing loop count for static tracks.Andy Hung2014-11-182-23/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | StaticAudioTrackServerProxy::framesReady() previously returned only the contiguous frames, update to return the total available frames. This resolves short-count looping in SoundPool for FastTracks. Also (1) Removes the racy condition of reading two variables and (2) Fixes buffer->mNonContig to return the correct value and (3) Restores behavior that loop count of 1 goes back to loopStart once during playback. Bug: 11830751 Bug: 12070295 Bug: 17456842 Change-Id: I64906e6036bb00a1d7375b03efe6deb69d6478ca
* | | | | | Merge "When aggregating buffers, make sure we don't lose data" into lmp-mr1-devMarco Nelissen2014-11-201-0/+6
|\ \ \ \ \ \
| * | | | | | When aggregating buffers, make sure we don't lose dataMarco Nelissen2014-11-191-0/+6
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Bug: 18277034 Change-Id: Ia8c35791eea88545a873cad339eb6b5fc25d1d97
* | | | | | Merge "AudioSystem: fix cross deadlock" into lmp-mr1-devEric Laurent2014-11-204-53/+71
|\ \ \ \ \ \
| * | | | | | AudioSystem: fix cross deadlockEric Laurent2014-11-204-53/+71
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not hold gLockAPS when calling AudioPolicyService::registerClient() in get_audio_policy_service(). registerClient() will need to acquire the AudioPolicyService mutex and if at the same time a method called from AudioPolicyService (with mutex held) calls back into AudioSystem and get_audio_policy_service() a cross deadlock occurs. Same preventive fix for get_audio_flinger(). Use a separate mutex for notification client list in AudioPolicyService. This prevents deadlocking if registerClient() is called as a consequence of AudioFlinger calling back into AudioPolicyManager while executing a method with AudioPolicyService locked Bug: 18403952. Bug: 18450065. Change-Id: Ia832e41aede8bc6c843fc615508fbdd74e0863b5
* | | | | | Merge "mediaplayer: request auto-frc for high quality avsync" into lmp-mr1-devLajos Molnar2014-11-201-0/+13
|\ \ \ \ \ \
| * | | | | | mediaplayer: request auto-frc for high quality avsyncLajos Molnar2014-11-191-0/+13
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17383204 Change-Id: I7209305b4ff3c2386019d7a09d6a0536e9f21522
* | | | | | stagefright: add (temporary) support for automatic video frcLajos Molnar2014-11-191-0/+18
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use MediaFormat.setInteger("auto-frc", 1) to turn this feature on. If supported, this feature will show up in codec.getOutputFormat().getInteger("auto-frc") Otherwise, this key will not be present. Bug: 17383204 Change-Id: I03549b3ede4de156e9e2d81b3883010360bb42ae
* | | | | Merge "NuPlayer: open audio sink in offload mode when resuming from timeout ↵Ronghua Wu2014-11-193-5/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | teardown." into lmp-mr1-dev
| * | | | | NuPlayer: open audio sink in offload mode when resuming from timeout teardown.Ronghua Wu2014-11-183-5/+36
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also always recheck if a new stream can do offload. Bug: 18154425 Change-Id: I121877834bd963eeeba91a2b951fd30d5dc36a8b
* | | | | Merge "Camera2Client: remove recording stream if necessary" into lmp-mr1-devYin-Chia Yeh2014-11-193-7/+56
|\ \ \ \ \
| * | | | | Camera2Client: remove recording stream if necessaryYin-Chia Yeh2014-11-183-7/+56
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Bug: 17495165 Change-Id: I11b763fde8f9448f4bddec3fe6c81581e7699edb
* | | | | Merge "AudioSystem: Add mutex for output cache" into lmp-mr1-devEric Laurent2014-11-192-41/+52
|\ \ \ \ \
| * | | | | AudioSystem: Add mutex for output cacheEric Laurent2014-11-192-41/+52
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cross deadlock with AudioFlinger by adding a dedicated mutex to protect access to cached output list and parameters. Bug: 18410728. Change-Id: Ia31283b1972d8865a46e84e63695173c187eb781
* | | | | Merge "HLS: fix live lock after missing the boat during configuration ↵Robert Shih2014-11-191-0/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | change" into lmp-mr1-dev
| * | | | | HLS: fix live lock after missing the boat during configuration changeRobert Shih2014-11-181-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:17488643 Change-Id: I4f5de42f86d6c616a67dc803f35c026b35347983
* | | | | | Merge "Don't autoloop notifications" into lmp-mr1-devMarco Nelissen2014-11-192-0/+20
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Don't autoloop notificationsMarco Nelissen2014-11-182-0/+20
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some apps think it's cool to use ringtones as notification sounds, but ringtones often loop, which is not appropriate for notifications. Bug: 15929273 Change-Id: I77c4277801cb2561743f8c676ef76ab4d1668b08
* | | | | Merge "NuPlayer: pass media time to selectTrack for responsiveness" into ↵Robert Shih2014-11-198-13/+39
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| * | | | | NuPlayer: pass media time to selectTrack for responsivenessRobert Shih2014-11-198-13/+39
| |/ / / / | | | | | | | | | | | | | | | Bug: 18020001 Change-Id: Id50f8473992f39d8c0aa86a1fabb2601093d2572
* | | | | Merge "audio policy: do not prevent routing to A2DP when suspended." into ↵Eric Laurent2014-11-182-4/+17
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | lmp-mr1-dev
| * | | | audio policy: do not prevent routing to A2DP when suspended.Eric Laurent2014-11-172-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow A2DP sink selection even if A2DP is suspended. It is not because use of A2DP is temporarily disabled by SCO selection that the policy rule routing a given use case to A2DP should be altered. The source will be routed to A2DP but it will remain silent until suspend condition is cleared which is the purpose of suspend mode. Also make sure that accessibility prompts are audible while in call by forcing stream type to STREAM_VOICE_CALL. Fix inconsistent logic between AudioTrack::setStreamTypeFromAttributes() and AudioPolicyManager::getStrategyForAttr() Bug: 18095151. Change-Id: I1c75dd8288ed3dd494eb942060eac9c9660dca50
* | | | | Merge "Fix missing mutex lock in Drm::binderDied" into lmp-mr1-devJeff Tinker2014-11-181-1/+5
|\ \ \ \ \
| * | | | | Fix missing mutex lock in Drm::binderDiedJeff Tinker2014-11-161-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 18194977 Change-Id: Ie6107a34237577c3b9cc6507d507f5c51f49fcf6
* | | | | | Merge "Prevent stopped audio tracks from mixing data" into lmp-mr1-devAndy Hung2014-11-181-8/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Prevent stopped audio tracks from mixing dataAndy Hung2014-11-171-8/+9
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Static tracks should have zero framesReady when stopping or stopped, to prevent mixer from running potentially indefinitely with loop mode. Bug: 16070883 Change-Id: Iab9968044d1a6f8543bbcbfb246f49f27d68cace
* | | | | Merge "Fix race condition in signaling completion for decode." into lmp-mr1-devAndy Hung2014-11-171-0/+1
|\ \ \ \ \
| * | | | | Fix race condition in signaling completion for decode.Andy Hung2014-11-171-0/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 18048775 Change-Id: I2207eb2cf30cf205d9bf414edbb1d3e709185f67
* | | | | Merge "NuPlayer HTTPLiveSource: impl getSelectedTrack" into lmp-mr1-devRobert Shih2014-11-176-0/+56
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | NuPlayer HTTPLiveSource: impl getSelectedTrackRobert Shih2014-11-066-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17514665 Change-Id: I81c62553f2c5acb4d2436a9d8f04c10fdbe315d0
* | | | | Merge "audiopolicy: Update input device check in checkInputsForDevice" into ↵Eric Laurent2014-11-171-3/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | lmp-mr1-dev
generated by cgit v1.1 at 2025-03-30 21:21:07 +0000