summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | 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
| |\ \ \ \
| | * | | | fix threading in RTSPSource and StreamingSourceChong Zhang2014-12-034-39/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18532335 Change-Id: I9c34401a928dc0ddbd0923aa5f127dc628efbb92
* | | | | | am 852dc963: Merge "avc_util: try to find the first start code prefix ↵Wei Jia2014-12-052-17/+15
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0x000001 even though there is non-zero byte at the beginning of the buffer." into lmp-mr1-dev * commit '852dc963a53487f2e2f197ab095299aed9c60a5e': avc_util: try to find the first start code prefix 0x000001 even though there is non-zero byte at the beginning of the buffer.
| * | | | | 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
* | | | | | | am db995fe3: Merge "Fix getTimestamp if offload thread is not initialized." ↵Andy Hung2014-12-051-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit 'db995fe3239276be9dfd9e446b10417e07948acc': Fix getTimestamp if offload thread is not initialized.
| * | | | | | 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
* | | | | | am 8790740d: media_codecs.xml: extend vorbis sample rate to 8-96kHzLajos Molnar2014-12-051-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '8790740d6bb1546dee6c87270976415503283820': media_codecs.xml: extend vorbis sample rate to 8-96kHz
| * | | | | media_codecs.xml: extend vorbis sample rate to 8-96kHzLajos Molnar2014-12-041-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Bug: 18615604 Change-Id: I0245556b8164959dd52fe677901cbfc517627cb4
* | | | | am 814cbb4e: Merge "ESQueue: add frame length checking in validation of ADTS ↵Wei Jia2014-12-041-4/+19
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | header." into lmp-mr1-dev * commit '814cbb4e33396fce559475270d6f6c0bd7c43fc5': ESQueue: add frame length checking in validation of ADTS header.
| * | | | 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
* | | | | am 18f2f90c: [FM] Fix Buganizer ID: 18456930 - FM radio audio got routed to ↵Hochi Huang2014-12-041-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | loudspeaker unexpectedly * commit '18f2f90cff65c384a4e8292cc3296dafafb43d52': [FM] Fix Buganizer ID: 18456930 - FM radio audio got routed to loudspeaker unexpectedly
generated by cgit v1.1 at 2024-07-01 07:21:34 +0000