summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "[audio][audioflinger] Consume all frames when a DirectThread is ↵Phil Burk2014-12-111-2/+7
|\ | | | | | | done." into lmp-mr1-dev
| * [audio][audioflinger] Consume all frames when a DirectThread is done.Phil Burk2014-12-101-2/+7
| | | | | | | | | | | | | | | | This bug was causing movies to think there was still data left to play so they never finished. Bug: 18360054 Change-Id: If7aee81d62b7af8532abd14579677848a06fe2b1 Signed-off-by: Phil Burk <philburk@google.com>
* | mediaplayer: allow setVideoSurface before setDataSourceLajos Molnar2014-12-101-1/+1
| | | | | | | | | | Bug: 18709604 Change-Id: I41e4734faed48b5583feb29896cd5783b8cd7e33
* | Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitionsBernhard Rosenkränzer2014-12-092-3/+3
| | | | | | | | | | | | | | | | | | An overloaded function should take the same parameters as the function it is overloading. Bug: 18639027 Change-Id: I8327fe1b363917515cf76c8f76bdbc05b2c0fbf0 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | AudioPolicyManager: distinguish between mirroring and reroutingJean-Michel Trivi2014-12-092-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the screen mirroring case, the notification manager queries the policy to see if media "is playing remotely": if yes, it will not request audio focus before playing a notification. This is the correct behavior for screen mirroring, but doesn't work when audio is rerouted to an external policy. This change consists in not reporting "remote" activity when playing to a mix of an external policy by looking at the address of the output on which playback is active for the given stream type. Bug 16009464 Change-Id: Iebbf5a8c738ab36c1cf2055e921c0a3472503125
* | 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
* | | 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
* | | 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
* | | | 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
* | | | 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
* | | 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
* | | mediaplayerservice: add support for legacy DRMLajos Molnar2014-12-051-3/+32
| | | | | | | | | | | | | | | | | | | | | Legacy DRM uses AwesomePlayer for widevine content. Bug: 18006370 Change-Id: I1de9e33de51b60352a9c79c2dcedec330160abe4
* | | 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
* | | | 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
* | | | 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
* | | | 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
* | | | 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
* | | | | 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
* | | | | 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
* | | | 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
* | | 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
* | | 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
* | | | Merge "fix threading in RTSPSource and StreamingSource" into lmp-mr1-devChong Zhang2014-12-054-39/+172
|\ \ \ \
| * | | | fix threading in RTSPSource and StreamingSourceChong Zhang2014-12-034-39/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18532335 Change-Id: I9c34401a928dc0ddbd0923aa5f127dc628efbb92
* | | | | Merge "avc_util: try to find the first start code prefix 0x000001 even ↵Wei Jia2014-12-052-17/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | though there is non-zero byte at the beginning of the buffer." into lmp-mr1-dev
| * | | | | avc_util: try to find the first start code prefix 0x000001 even though there ↵Wei Jia2014-12-042-17/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is non-zero byte at the beginning of the buffer. ESQueue: allow one PES playload contains multiple ADTS AAC frames. Bug: 18532335 Change-Id: I1f42017cff139d5e932e0aaa3e7d33164d1a48e7
* | | | | | Merge "Fix getTimestamp if offload thread is not initialized." into lmp-mr1-devAndy Hung2014-12-051-1/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Fix getTimestamp if offload thread is not initialized.Andy Hung2014-12-031-1/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Returns INVALID_OPERATION. Bug: 18605649 Change-Id: I440fb687fbf9249098e049982fa83bcd1515fd80
* | | | | media_codecs.xml: extend vorbis sample rate to 8-96kHzLajos Molnar2014-12-041-1/+1
| |/ / / |/| | | | | | | | | | | | | | | Bug: 18615604 Change-Id: I0245556b8164959dd52fe677901cbfc517627cb4
* | | | Merge "ESQueue: add frame length checking in validation of ADTS header." ↵Wei Jia2014-12-041-4/+19
|\ \ \ \ | | | | | | | | | | | | | | | into lmp-mr1-dev
| * | | | ESQueue: add frame length checking in validation of ADTS header.Wei Jia2014-12-031-4/+19
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows an invalid ADTS buffer to be abandoned when frame length in the header exceeds buffer size. Bug: 18532335 Change-Id: I8057db525d06ff00ca24afd075a7c6c17b87eaa8
* | | | [FM] Fix Buganizer ID: 18456930 - FM radio audio got routed to loudspeaker ↵Hochi Huang2014-12-041-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | unexpectedly https://partner-android-review.git.corp.google.com/#/c/187894/ Change-Id: I3f9175bbc302e382155e568e66b88400ec05ffa5 Signed-off-by: Hochi Huang <hochi.huang@mediatek.com>
* | | StreamingSource: check mTSParser before dereferencing it.Wei Jia2014-12-021-0/+4
|/ / | | | | | | | | Bug: 18532335 Change-Id: I7819d8d359fe75ea4c827138e9aaa2454ccfe3b1
* | nuplayer: clear pending audio access unit on flush.Ronghua Wu2014-12-012-6/+14
| | | | | | | | | | | | | | Also add flag to avoid reading on flush. Bug: 18540219 Change-Id: I2fc351c32c87db9a8c8c2aad12ee2bd56a0370ab
* | Merge "notify seek complete upon first video output frame" into lmp-mr1-devChong Zhang2014-12-028-28/+107
|\ \
| * | notify seek complete upon first video output frameChong Zhang2014-12-018-28/+107
| | | | | | | | | | | | | | | Bug: 18541814 Change-Id: Ie4e0976885f26eb253460eab371cb181ea85f2db