summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* GenericSource: fix selectTrack parameterRobert Shih2014-09-161-1/+1
| | | | | Bug: 17512187 Change-Id: I19a0915fb0fb1b1ae036bf5df85b9c9e7657a7ea
* Merge "ASessionDescription: allow open-ended NTP range." into lmp-devWei Jia2014-09-161-0/+5
|\
| * ASessionDescription: allow open-ended NTP range.Wei Jia2014-09-151-0/+5
| | | | | | | | | | Bug: 17435211 Change-Id: I450d512abdc4368f5180d9859f3b4e207e3b5591
* | Merge "ESQueue: do not merge aac packets" into lmp-devRobert Shih2014-09-162-1/+46
|\ \ | |/ |/|
| * ESQueue: do not merge aac packetsRobert Shih2014-09-152-1/+46
| | | | | | | | | | Bug: 17310061 Change-Id: Ie0fb0702b0af1c4094415190fdfdf132d5fcd511
* | Merge "Optimize the YUV buffer copy a little bit to skip unnecessary ↵hkuang2014-09-151-18/+15
|\ \ | | | | | | | | | operation." into lmp-dev
| * | Optimize the YUV buffer copy a little bit to skip unnecessary operation.hkuang2014-09-151-18/+15
| | | | | | | | | | | | | | | Bug: 17326758 Change-Id: I2505751cb40a53242ceeb3be8f362c3754c2ee3f
* | | Merge "PlaylistFetcher: find the correct sequence number to start fetching" ↵Robert Shih2014-09-152-51/+107
|\ \ \ | | | | | | | | | | | | into lmp-dev
| * | | PlaylistFetcher: find the correct sequence number to start fetchingRobert Shih2014-09-152-51/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - skip over bad segemnts - if we skipped too far into the future when adapting in live streams, adjust back Bug: 17141635 Bug: 17416657 Change-Id: I0877ceaf6e69cab751bf9e92579071f9e61643eb
* | | | Merge "mediaplayer: handle surface dis/connection errors" into lmp-devLajos Molnar2014-09-151-5/+8
|\ \ \ \
| * | | | mediaplayer: handle surface dis/connection errorsLajos Molnar2014-09-151-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17408008 Change-Id: I752d5372086772b79b1300a2d3fabbc4985954a8
* | | | | Merge "Camera2: handle one more videosnapshot failure" into lmp-devYin-Chia Yeh2014-09-151-13/+7
|\ \ \ \ \
| * | | | | Camera2: handle one more videosnapshot failureYin-Chia Yeh2014-09-151-13/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle one more corner case. Also remove redundant re-try path. Bug: 17484683 Change-Id: I0b3e1223f4f28022e7ec6abe028ca3c2623829de
* | | | | | Merge "audioflinger: fix pre processing effect leak" into lmp-devEric Laurent2014-09-158-37/+133
|\ \ \ \ \ \
| * | | | | | audioflinger: fix pre processing effect leakEric Laurent2014-09-158-37/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a capture thread was closed, the effects attached to this thread were left dangling and the associated effect chain destroyed. When their last client was disconnected, the effects were not released properly from the effect library because the destruction process could not be completed without the effect being attached to a thread. A similar problem prevented a RecordTrack to be properly released if its client was destroyed after the capture thread. The fix consists in allowing the effect or record track to be properly released even if its parent thread cannot be promoted. Also save any effect chain still present on a closed capture thread in case a new client wants to reuse the effects on the same session later. Bug: 17110064. Change-Id: I5cd644daa357afd1f3548f9bcb28e6152d95fdb8
* | | | | | | Merge "mediaplayer: optimize buffer queue management" into lmp-devPhil Burk2014-09-155-65/+93
|\ \ \ \ \ \ \
| * | | | | | | mediaplayer: optimize buffer queue managementPhil Burk2014-09-125-65/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Various changes for power consumption including: Restrict the number of messages in flight. Buffer more frames in the GenericSource so reads occur in a burst. Bug: 15094301 Change-Id: I783481fd91f3fdd445b95e88ab82178f649f1a38 Signed-off-by: Phil Burk <philburk@google.com>
* | | | | | | | Merge "Camera3Device: Treat failure to idle as an error" into lmp-devEino-Ville Talvala2014-09-151-0/+4
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Camera3Device: Treat failure to idle as an errorEino-Ville Talvala2014-09-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16899526 Change-Id: Ia995aac6360c9c41ed654af5a7052480f23903d8
* | | | | | | | Merge "audioflinger: send mic mute command to all audio HALs" into lmp-devEric Laurent2014-09-151-2/+7
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | audioflinger: send mic mute command to all audio HALsEric Laurent2014-09-151-2/+7
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mic mute should be sent to all audio HALs, not only the primary HAL as telephony can use capture devices on other HALs (e.g USB) Bug: 17321604. Change-Id: I658f6084d5b5cdc5a70784661d5cea0b6f81c3a9
* | | | | | | Merge "Camera1: Validate scene mode override AF mode" into lmp-devEino-Ville Talvala2014-09-141-0/+14
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Camera1: Validate scene mode override AF modeEino-Ville Talvala2014-09-131-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't allow uncalibrated cameras to list a fixed focus mode for variable-focus cameras, since uncalibrated cameras cannot do INFINITY focus. Bug: 17492043 Change-Id: I5835efd6f21be0ebb74a9b7ea3ef5b2e7cf63e7a
* | | | | | | Camera3: Update ZSL post-processing tagsZhijun He2014-09-144-0/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update ZSL processing tags according the still capture template Also cache the request template to avoid extra cost of querying into HAL every time. Bug: 17463102 Change-Id: I2eeffefb0a4131c99a85dd3e4484cc6f0f025efa
* | | | | | | Merge "audio policy: fix relative priorities of PHONE and ENFORCED_AUDIBLE" ↵Eric Laurent2014-09-141-7/+15
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | into lmp-dev
| * | | | | | audio policy: fix relative priorities of PHONE and ENFORCED_AUDIBLEJon Eklund2014-09-121-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ENFORCED_AUDIBLE should only be highest priority if system tones are being forced. Otherwise it should behave like SONIFICATION. Bug: 17474485. Change-Id: Ia651779870d51100cc3179c96fa09694bc691ba7
* | | | | | | Merge "Camera: Allow larger preview resolutions in API1 for >= HALv2 ↵Eino-Ville Talvala2014-09-132-4/+29
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | devices" into lmp-dev
| * | | | | | Camera: Allow larger preview resolutions in API1 for >= HALv2 devicesEino-Ville Talvala2014-09-132-4/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit preview resolutions to a max of 1920x1920 instead of 1920x1080p, so that any aspect ratio with a 1920 as the larger dimension can be used. Also improve the initial preview/video size selection logic, to ensure that the selected size is both a valid preview and video size, and not too large. Bug: 17458832 Change-Id: Iea006fadb5fbf0f03d23c3c5babb5b3611469688
* | | | | | | Merge "Camera2: fix 4K recording" into lmp-devZhijun He2014-09-134-18/+111
|\ \ \ \ \ \ \
| * | | | | | | Camera2: fix 4K recordingYin-Chia Yeh2014-09-134-18/+111
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17484683 Change-Id: I09bb12698057555329286c777102b9b310452fb3
* | | | | | | Merge "LiveSession: reliable switch" into lmp-devRobert Shih2014-09-132-10/+57
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | LiveSession: reliable switchRobert Shih2014-09-122-10/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17142706 Change-Id: I9cd6c068178d62c294496e8ab0b0a3763354964f
* | | | | | | Merge "Fix AAC timestamps for multiple aac frames per input buffer" into lmp-devMarco Nelissen2014-09-132-128/+200
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix AAC timestamps for multiple aac frames per input bufferMarco Nelissen2014-09-102-128/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support multiple aac frames per input buffer also for non-ADTS streams, now also works with 5.1 audio. Bug: 16715379
* | | | | | | Merge "LiveSession: re-buffer on under run to avoid stutter" into lmp-devRobert Shih2014-09-132-1/+37
|\ \ \ \ \ \ \
| * | | | | | | LiveSession: re-buffer on under run to avoid stutterRobert Shih2014-09-122-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13742725 Change-Id: I7dad8876e18084c3c060d08190fa8a72fc2f5bad
* | | | | | | | Merge "audio policy: fix check in creaateAudioPatch()" into lmp-devEric Laurent2014-09-131-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | audio policy: fix check in creaateAudioPatch()Eric Laurent2014-09-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17488759. Change-Id: I9dd2c3ca7f83de4b3573f4fb0e9934e1bc37c3bc
* | | | | | | | | Merge "camera: add latest parameters to dumpsys for api1 cameras" into lmp-devIgor Murashkin2014-09-122-0/+14
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | camera: add latest parameters to dumpsys for api1 camerasIgor Murashkin2014-09-112-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17290106 Change-Id: I08ac1659d0367613c37669d5bf6e6bf7b2b63bc2
* | | | | | | | | Merge "stagefright: add adaptive playback support to SoftMPEG decoder." into ↵Ronghua Wu2014-09-126-29/+47
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | lmp-dev
| * | | | | | | | stagefright: add adaptive playback support to SoftMPEG decoder.Ronghua Wu2014-09-116-29/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This covers both MPEG4 and H263 adaptive playback. Bug: 17326758 Change-Id: I80a67b7f3ceab05e792f0a459439a8274bd78e20
* | | | | | | | | Merge "GenericSource: move track packet init from start to prepare" into lmp-devRobert Shih2014-09-121-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | GenericSource: move track packet init from start to prepareRobert Shih2014-09-111-4/+4
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17244704 Change-Id: I15eba0e4d2a178cc0ba46bbc17be0e6d95e76935
* | | | | | | | | Merge "LiveSession: added onSwitchDown" into lmp-devRobert Shih2014-09-124-4/+128
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | LiveSession: added onSwitchDownRobert Shih2014-09-114-4/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | additionally in this change - AnotherPacketSource: added getEstimatedDurationUs that avoids looping through buffered access units in most cases; this method is called by LiveSession before triggering onSwitchDown. Also fix the original getBufferedDurationUs to accumulate durations across discontinuities. Bug: 13742612 Change-Id: I135932ea0c74671b7019a3c7054844926c18bc14
* | | | | | | | | Merge "Camera2: improve ZSL candidate selection logic" into lmp-devYin-Chia Yeh2014-09-123-2/+38
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Camera2: improve ZSL candidate selection logicYin-Chia Yeh2014-09-113-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Clear ZSL queue when focus mode is changed and autoFocus is cancelled. 2. Do not check focus state is focus mode is fixed. Bug: 17185356 Change-Id: I2cb10fb457b080f0db950c894e56995f638e147b
* | | | | | | | | | Merge "camera2: skip capture result after clearZslQueue" into lmp-devYin-Chia Yeh2014-09-126-9/+41
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | camera2: skip capture result after clearZslQueueYin-Chia Yeh2014-09-116-9/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After ZSL queue is cleared, don't add capture result to ZSL queue if its corresponding buffer has been cleared. Bug: 17185356 Change-Id: Iddac39ab09b2560e2ce9390895927217c1736d5a