summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Fix bounds checking for GetPartialObject commandMike Lockwood2014-12-171-2/+8
| | | | | | | GetPartialObject has only 3 arguments, whereas the 64 bit version takes 4. Bug: 18786282 Change-Id: I4376962769ed0eae2f4991c2569244db22509204
* Merge "audioflinger: implement pause/resume for direct outputs" into lmp-mr1-devEric Laurent2014-12-171-0/+5
|\
| * audioflinger: implement pause/resume for direct outputsEric Laurent2014-12-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend pause/resume support to direct output threads (was only for offload threads). If the HAL implements pause/resume, track pause/resume is forwarded to the HAL. Pause, flush, resume sequence is respected by executing the HAL calls in the playback thread (same as offload). Make sure the track flags on client side are consistent with the flags on server side. Bug: 17883772. Change-Id: I89b360d69818f7a9204bd36e3ec63a79e106ecf1
* | Merge "ESQueue: change warning message of one buffer containing multiple ↵Wei Jia2014-12-161-1/+1
|\ \ | | | | | | | | | ADTS frames into verbose." into lmp-mr1-dev
| * | ESQueue: change warning message of one buffer containing multiple ADTS ↵Wei Jia2014-12-161-1/+1
| |/ | | | | | | | | | | | | frames into verbose. Bug: 18741580 Change-Id: I35b38e106c3ca5421e0985d5e7feeaafe773ed6d
* | Merge "Fix for Bundled Effects level compensation" into lmp-mr1-devRicardo Garcia2014-12-162-104/+144
|\ \
| * | Fix for Bundled Effects level compensationRicardo Garcia2014-12-092-104/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From the bundled effects, only the EQ had some sort of level compensation based on the settings of the effect. This patch takes into account all the status and levels of EQ, BassBoost and Virtualizer bundled effects and makes an informed decision on the overall level compensation. bug: 18213779 Change-Id: I23c7b94fe7da5482f0bbef0cbe715ea464631420
* | | Merge "Fix for apps that forget to use widevine:// urls" into lmp-mr1-devJeff Tinker2014-12-151-0/+8
|\ \ \
| * | | Fix for apps that forget to use widevine:// urlsJeff Tinker2014-12-151-0/+8
| | | | | | | | | | | | | | | | | | | | bug: 18554455 Change-Id: I8ff08e7270c65c375205169eb068f361f2a4a727
* | | | Merge "MediaCodecList: handle binder death" into lmp-mr1-devLajos Molnar2014-12-151-1/+12
|\ \ \ \
| * | | | MediaCodecList: handle binder deathLajos Molnar2014-12-121-1/+12
| | |_|/ | |/| | | | | | | | | | | | | | Bug: 18691591 Change-Id: Icc402d6ea9b0de4ac642c3b403fb64e865481b2e
* | | | Merge "NuPlayer: send NOT_SEEKABLE media info to client when the source is ↵Wei Jia2014-12-152-2/+6
|\ \ \ \ | |/ / / |/| | | | | | | not seekable." into lmp-mr1-dev
| * | | NuPlayer: send NOT_SEEKABLE media info to client when the source is not ↵Wei Jia2014-12-122-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | seekable. LiveSession: return -1 for duration when it's not available. Bug: 18599325 Change-Id: Iecd040f48750806f98d1799e2aaab2f90c6f3887
* | | | Merge "Tunneled video Playback/Max resolution: Call ↵Rachad2014-12-131-1/+15
|\ \ \ \ | | | | | | | | | | | | | | | mOmx->prepareForAdaptivePlayback() to provide max resolution information to tunneled OMX component." into lmp-mr1-dev
| * | | | Tunneled video Playback/Max resolution:Rachad2014-12-121-1/+15
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Call mOmx->prepareForAdaptivePlayback() to provide max resolution information to tunneled OMX component. bug: 17883772 Change-Id: I8f634824103e66483527828993bb24f65e68e419
* | | | stagefright: advertise 8kHz AAC decoder supportLajos Molnar2014-12-131-1/+2
|/ / / | | | | | | | | | Bug: 18738266 Change-Id: I1e5a1dc04b4deabfac069e70e4f730be6023a8ef
* | | stagefright: misc fixes to software video encoders (and decoders)Lajos Molnar2014-12-1018-997/+594
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - move logic to set encoder parameters to common encoder class (similarly to what was done for decoders) - set compressed buffer size based on frame size and compression ratio, and codec-specific minimum size - set raw buffer size based on frame size and metadata mode - do not set stride and slice height on compressed ports - advertise only QCIF support for google H263 encoder - set large-enough input size for video decoders to support adaptive playback - do not change input buffer size on output port reconfiguration, as no input buffer reallocation takes place - do not return empty buffers with EOS after EOS has been signaled Bug: 18513091 Bug: 18639027 Change-Id: Ib13492ef66adf331aa4572c67d2b283ea020cb41
* | | 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>
* | | Merge "audio policy: binder calls for dynamic audio policy mixes" into ↵Eric Laurent2014-12-102-1/+59
|\ \ \ | | | | | | | | | | | | lmp-mr1-dev
| * | | audio policy: binder calls for dynamic audio policy mixesEric Laurent2014-12-092-1/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-103-1/+125
|\ \ \ \ | |/ / /
| * | | audio policy: add support for custom mixesEric Laurent2014-12-093-1/+125
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 "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-061-2/+5
|\ \ | | | | | | | | | lmp-mr1-dev
| * | stagefright: preserve output format flags on format changeLajos Molnar2014-12-051-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | 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 "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
* | 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 "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
* | | | media_codecs.xml: extend vorbis sample rate to 8-96kHzLajos Molnar2014-12-041-1/+1
|/ / / | | | | | | | | | | | | Bug: 18615604 Change-Id: I0245556b8164959dd52fe677901cbfc517627cb4
* | | 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
* | 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
* | Merge "AudioRecord: use audio attributes instead of audio source." into ↵Eric Laurent2014-11-264-39/+75
|\ \ | | | | | | | | | lmp-mr1-dev
| * | AudioRecord: use audio attributes instead of audio source.Eric Laurent2014-11-254-39/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added AudioRecord constructor with audio attributes. Replaced AudioPolicymanager::getInput() by getInputForAttr(). No new functionality for now. Also: - Fixed warnings in AudioPolicyManager - Allocate audio session ID before calling getOutputForAttr() in AudioTrack. Bug: 16006090. Change-Id: I15df21e4411db688e3096dd801cf579d76d81711