summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | MyHandler: set ip address to an invalid one when getsockname() returns error.Wei Jia2014-09-221-1/+3
| | | | | | | | | | | | | | | | | | | | Bug: 17556472 Change-Id: I0387c78727d9a18abddcfdb4b480f4b1412bbc9f
* | | | Merge "fix crash when makeHTTPConnection fails with null pointer" into lmp-devChong Zhang2014-09-221-1/+12
|\ \ \ \
| * | | | fix crash when makeHTTPConnection fails with null pointerChong Zhang2014-09-221-1/+12
| | |/ / | |/| | | | | | | | | | | | | | Bug: 17608108 Change-Id: I4bdf6d09ae565418be3d6677b5ccac9072fb9b2c
* | | | Merge "MediaCodec: Fix deallocated pointer reference when calling reset()" ↵Andy Hung2014-09-221-3/+3
|\ \ \ \ | |_|/ / |/| | | | | | | into lmp-dev
| * | | MediaCodec: Fix deallocated pointer reference when calling reset()Andy Hung2014-09-221-3/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | The name pointer argument in MediaCodec::init() was being implicitly deallocated. Bug: 17499622 Change-Id: If9409f95674e52d1478f969f77693c4d27ff1ff2
* | | Merge "MediaBuffer: ABuffer will release MediaBuffer when it's destructed." ↵Wei Jia2014-09-226-77/+44
|\ \ \ | | | | | | | | | | | | into lmp-dev
| * | | MediaBuffer: ABuffer will release MediaBuffer when it's destructed.Wei Jia2014-09-196-77/+44
| | | | | | | | | | | | | | | | | | | | Bug: 17454455 Change-Id: Ia423bcc2e1fa39137f114eac44912ed15357bb99
* | | | Merge "NuPlayer HLS: better subtitle toggling" into lmp-devRobert Shih2014-09-224-3/+43
|\ \ \ \
| * | | | NuPlayer HLS: better subtitle togglingRobert Shih2014-09-194-3/+43
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17310061 Change-Id: Iacee1816285425aaad08c32b28591bb0162d5a85
* | | | | Fix ringbuffer handlingMarco Nelissen2014-09-192-24/+19
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly keep track of the number of samples in the ring buffer, rather than inferring it from the difference between the read and write pointer, since the latter cannot distinguish between a completely full and a completely empty buffer. Bug: 17582331 Change-Id: I24d16ce96710209b7457ffad7c4c60201451980f
* | | | Merge "Always consider first buffer to be config" into lmp-devMarco Nelissen2014-09-191-0/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | Always consider first buffer to be configMarco Nelissen2014-09-181-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for backwards compatibility. Also fix a problem where writing 0 bytes to an empty ringbuffer would treat it as overflowed. Bug: 17567501 Change-Id: I8019da76466576e1b2984e9eccf09bdec593038a
* | | | Merge "PlaylistFetcher:don't signal a/v eos on subttitle eos" into lmp-devRobert Shih2014-09-181-0/+17
|\ \ \ \
| * | | | PlaylistFetcher:don't signal a/v eos on subttitle eosRobert Shih2014-09-171-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17310061 Change-Id: Ifbca3c12f21171a6e429dca51a250a41051fdd34
* | | | | Merge "Fix null pointer dereference" into lmp-devMarco Nelissen2014-09-171-2/+4
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Fix null pointer dereferenceMarco Nelissen2014-09-171-2/+4
| |/ / | | | | | | | | | | | | Bug: 17544813 Change-Id: I6c94cd3056a99bb42fc71ee583938a2e3806fdc7
* | | Merge "HLS: fix freezes when toggling between a/v streams" into lmp-devRobert Shih2014-09-173-5/+63
|\ \ \
| * | | HLS: fix freezes when toggling between a/v streamsRobert Shih2014-09-163-5/+63
| | | | | | | | | | | | | | | | | | | | Bug: 17412740 Change-Id: Iacaf2fa1d20584056375803e1782ad6761c56fc5
* | | | Merge "Disconnect HTTP-based data source upon reset" into lmp-devChong Zhang2014-09-162-8/+29
|\ \ \ \ | |_|/ / |/| | |
| * | | Disconnect HTTP-based data source upon resetChong Zhang2014-09-162-8/+29
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 17425250 Change-Id: Ieb4c93fd9848489f9dbf35a36474376924fd8eb9
* | | | 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 "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 "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 "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 "LiveSession: raise upwards adaptation constraint" into lmp-devRobert Shih2014-09-122-16/+21
|\ \ \ \ \ \ \
| * | | | | | | LiveSession: raise upwards adaptation constraintRobert Shih2014-09-102-16/+21
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust bandwidth more conservatively when considering an upwards adaptation. Also fixed an issue with kWhatCheckBandwidth messages being accumulated across switch generations; this causes onCheckBandwidth to be fired at a high frequency and LiveSession to be too sensitive to network glitches. Bug: 13743153 Change-Id: I1dec99cb5d123c6675abe0847fd12aab5178eefd
* | | | | | | Merge "PlaylistFetcher: avoid repeated fetch when we run off the edge of ↵Robert Shih2014-09-111-6/+0
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | live playlists" into lmp-dev
| * | | | | | PlaylistFetcher: avoid repeated fetch when we run off the edge of live playlistsRobert Shih2014-09-071-6/+0
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Bug: 17416658 Change-Id: I1d07ce03a293206c48ff9ee11dc78b815ba367a4
* | | | | | Merge "stagefright: add adaptive playback support to SoftAVC decoder." into ↵Ronghua Wu2014-09-115-107/+130
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | lmp-dev
| * | | | | | stagefright: add adaptive playback support to SoftAVC decoder.Ronghua Wu2014-09-105-107/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also change SoftVPX decoder to use common handlePortSettingsChanged and copyYV12FrameToOutputBuffer method. Bug: 17326758 Change-Id: I6fb2ee8fb9291f69c70493b8558af341adc1f4b2
* | | | | | | Merge "stagefright: don't use AAtomizer in AMessage" into lmp-devLajos Molnar2014-09-111-30/+93
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | stagefright: don't use AAtomizer in AMessageLajos Molnar2014-09-101-30/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15094301 Change-Id: Ib82fb6d8fb6b48402d81f411123b3d924368eb93
* | | | | | | Merge "Revert "Fix AAC timestamps for multiple aac frames per input buffer"" ↵Marco Nelissen2014-09-102-194/+128
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev
| * | | | | | | Revert "Fix AAC timestamps for multiple aac frames per input buffer"Marco Nelissen2014-09-102-194/+128
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e086387c805311ac87904c3c4d6d4eb08d4b4ee2. (broke multichannel movie playback) Bug: 17454025 Change-Id: I95b82359f87f8beca66f35c34b7e125850a44747
* | | | | | | Merge "fix failure in MediaCodecTest#testException" into lmp-devChong Zhang2014-09-101-1/+14
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | fix failure in MediaCodecTest#testExceptionChong Zhang2014-09-101-1/+14
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reset codec after failed configure() Bug: 17418876 Change-Id: I21ff8a0751dae6a164678015142e11d481403bed