summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 5abc1201: am 3cc93734: Merge "Fix build with clang"Lajos Molnar2014-12-091-2/+1
|\ | | | | | | | | * commit '5abc1201bbdb27b855c85bd4f8e63748a941835b': Fix build with clang
| * am 3cc93734: Merge "Fix build with clang"Lajos Molnar2014-12-091-2/+1
| |\ | | | | | | | | | | | | * commit '3cc937346baf31fda7f0587a8e622938fbb68983': Fix build with clang
| | * Merge "Fix build with clang"Lajos Molnar2014-12-091-2/+1
| | |\
| | | * Fix build with clangBernhard Rosenkränzer2014-12-081-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the -DNDEBUG case, nextOffset is unused, causing clang to spew a warning in code build with -Werror. Change-Id: If0101dcdf735672050f985a1de25a983edb02a52 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | am 54a6b2e1: am 56335ae2: Merge "Prevent ANR when AudioTrack is paused or ↵Glenn Kasten2014-12-090-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | re-routed" * commit '54a6b2e104dc72bc898ae81b8928119108c3f4d1': Prevent ANR when AudioTrack is paused or re-routed
| * | | am 56335ae2: Merge "Prevent ANR when AudioTrack is paused or re-routed"Glenn Kasten2014-12-091-0/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '56335ae2978765e3bbc510468d4812b691545d04': Prevent ANR when AudioTrack is paused or re-routed
| | * | Merge "Prevent ANR when AudioTrack is paused or re-routed"Glenn Kasten2014-12-091-0/+2
| | |\ \
| | | * | 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 ce48b3a8: am f3df58c7: Merge "Stagefright: Fix unused variables"Andreas Gampe2014-12-092-4/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'ce48b3a821f0c17aa68b114d964a26fce22cdd49': Stagefright: Fix unused variables
| * | | | am f3df58c7: Merge "Stagefright: Fix unused variables"Andreas Gampe2014-12-082-4/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'f3df58c77ea506fb00e696313b0ea127dbebf02c': Stagefright: Fix unused variables
| | * | | Merge "Stagefright: Fix unused variables"Andreas Gampe2014-12-082-4/+1
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Stagefright: Fix unused variablesAndreas Gampe2014-12-042-4/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For build-system CFLAGS clean-up, fix unused variables. These variables are unused in aarch64. Bug: 18632512 Change-Id: I6ae41f64e721a0f3188f0ee045a734b366ee72a6
* | | | am c1b0d49c: am 82a69ea8: Prevent ANR when AudioTrack is paused or re-routedzunkyu.lee2014-12-091-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'c1b0d49cacde26c2420528169d157d2c778a9b0d': Prevent ANR when AudioTrack is paused or re-routed
| * \ \ \ 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 0b672c8b: am ca7b4bc4: mediaplayerservice: add support for legacy DRMLajos Molnar2014-12-081-3/+32
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '0b672c8bc2d96db90c97cf3673e2d3650c96d945': mediaplayerservice: add support for legacy DRM
| * | | | | 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 6874ed79: am a9d2f9fb: Merge "stagefright: preserve output format flags ↵Lajos Molnar2014-12-082-2/+6
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on format change" into lmp-mr1-dev * commit '6874ed79fd525cf5d6ec8a953475c14f5a185cb4': stagefright: preserve output format flags on format change
| * | | | | 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 2b02f140: am 80c57d57: Merge "NuPlayerRenderer: Update mAnchorMaxMediaUs ↵Wei Jia2014-12-084-1/+16
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when anchor time is changed to fix pause-seek-getCurrentPosition." into lmp-mr1-dev * commit '2b02f140d6a54ec2a704449463eb2c1ba760ddfb': NuPlayerRenderer: Update mAnchorMaxMediaUs when anchor time is changed to fix pause-seek-getCurrentPosition.
| * | | | | | 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 427aca5b: am 18265202: Merge "audio policy: fix inifinite loop in ↵Eric Laurent2014-12-081-5/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clearAudioPatches()" into lmp-mr1-dev * commit '427aca5bebaacfd5639b85661689ebd554bd0822': audio policy: fix inifinite loop in clearAudioPatches()
| * | | | | | | 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 876c21b1: am a147c17a: Merge "fixes for non-secure widevine playback" ↵Chong Zhang2014-12-082-13/+32
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '876c21b1c10c953fac6acefdfb2cb8658cb462db': fixes for non-secure widevine playback
| * | | | | | | 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 a9450bbc: am cbbe1ccc: Merge "audio policy: fix AudioPort parameter ↵Eric Laurent2014-12-081-0/+20
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checks" into lmp-mr1-dev * commit 'a9450bbc6274451bbb4241595d74d6ce9a4160d1': audio policy: fix AudioPort parameter checks
| * | | | | | | 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 41d8d8e7: am 57216ca4: Merge "Track volume should be maintained even if ↵Glenn Kasten2014-12-080-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | track is restored" into lmp-mr1-dev * commit '41d8d8e79f41f1295c5763c4257bf7c743088678': Track volume should be maintained even if track is restored
| * | | | | | | | 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 668b0550: am 597ce69a: Merge "Camera: Add support for SCENE_MODE_HDR for ↵Eino-Ville Talvala2014-12-081-0/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | newer HALs" into lmp-mr1-dev * commit '668b055081bb9d0d61775acf67bb27ce66b214f6': Camera: Add support for SCENE_MODE_HDR for newer HALs
| * | | | | | | | 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 07e19019: am 9257000c: camera: fix logging in ZslProcessor to avoid spamRuchit Sharma2014-12-081-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '07e190190ffddfbc32ecbf0bd9a9679817da232b': camera: fix logging in ZslProcessor to avoid spam
| * | | | | | | 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 4df79c2c: am d6e7f1e1: Merge "Fix for AOSP force virtualization mode" ↵Ricardo Garcia2014-12-081-4/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '4df79c2c13f6163f7d99360a7fb34bf3bd2a5115': Fix for AOSP force virtualization mode
generated by cgit v1.1 at 2024-07-02 17:45:56 +0000