summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | mediaplayer: smooth out videoplayback based on framerateLajos Molnar2014-09-195-3/+446
| | | | | | | | | | Bug: 14659809 Change-Id: I73f6c7224c51ac06487475f9ed395379111ad71f
* | Merge "Make prepare properly report failure again" into lmp-devMarco Nelissen2014-09-201-1/+6
|\ \
| * | Make prepare properly report failure againMarco Nelissen2014-09-191-1/+6
| | | | | | | | | | | | | | | | | | Bug: 17583084 Bug: 17548451 Change-Id: I759d28eaafb520c206d54740c2c0a857b534d23c
* | | mediaplayer: schedule video frames in VSYNC valleysLajos Molnar2014-09-197-14/+224
|/ / | | | | | | | | Bug: 14659809 Change-Id: Ic340ac61ad4778b493625c79c2cb4f747ff54ede
* | Merge "Fix ringbuffer handling" into lmp-devMarco Nelissen2014-09-192-24/+19
|\ \
| * | 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
* | Reduce log spam from getTimestamp errorsGlenn Kasten2014-09-191-1/+1
|/ | | | | Bug: 17576481 Change-Id: I07d99e7c42b7d4f0994b5a6d9c9fe8eb29fbbe40
* 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 "mediaplayer: fix buffer aggregation when video has offloaded audio" ↵Phil Burk2014-09-181-5/+5
|\ \ | | | | | | | | | into lmp-dev
| * | mediaplayer: fix buffer aggregation when video has offloaded audioPhil Burk2014-09-171-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Change conditional test so we don't accidentally do buffer aggregation on video buffers. Bug: 17553847 Change-Id: I746452b2e62db664315732a38f982ce7faf26212 Signed-off-by: Phil Burk <philburk@google.com>
* | | Merge "AudioEffect acquires session" into lmp-devJean-Michel Trivi2014-09-181-3/+10
|\ \ \
| * | | AudioEffect acquires sessionJean-Michel Trivi2014-09-181-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, users of audio sessions, AudioTrack and AudioRecord, are acquiring and releasing audio sessions according to their life-cycle. AudioEffect instances were not counting as users of an audio session. This caused an effect used on a session to be purged by AudioFlinger::purgeStaleEffects_l() whenever the last user of that session went away. This CL makes AudioEffect acquire and release a session when created and destroyed. Bug 15432115 Change-Id: I922532150009988d43872f9b5928044a830ae0b3
* | | | 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 "NuPlayer: update timestamp handling" into lmp-devAndy Hung2014-09-173-33/+117
|\ \ \ \ \
| * | | | | NuPlayer: update timestamp handlingAndy Hung2014-09-173-33/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use getTimestamp WOULD_BLOCK error return code to clean up initial playback/start timestamp handling. Account for pause time and seeks. Only send notification from driver when the media time changes. Bug: 14659809 Bug: 17428188 Change-Id: I051bb5e2dd4fd5990474f8fb635615ad8d18eb2c
* | | | | | Merge "NuPlayer: use getTimestamp instead of getPosition" into lmp-devLajos Molnar2014-09-174-23/+58
|\ \ \ \ \ \ | |/ / / / /
| * | | | | NuPlayer: use getTimestamp instead of getPositionLajos Molnar2014-09-174-23/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14659809 Bug: 16985287 Change-Id: I59ec72fbd40a9b8d28fe548ddad082c03000c045
* | | | | | Merge "Fix AudioTrack offloaded timestamp handling." into lmp-devLajos Molnar2014-09-171-5/+93
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix AudioTrack offloaded timestamp handling.Andy Hung2014-09-171-5/+93
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getTimestamp for offloaded tracks now returns WOULD_BLOCK for situations where the timestamp is unavailable due to the previous track still flushing or the timestamp is stale. It is fixed for normal playback conditions. Bug: 14659809 Bug: 17428188 Change-Id: Ic9ec07ccabc604236979769db5c4ea2dec252660
* | | | | Merge "Add support for ANDROID_LOOP to NuPlayer" into lmp-devMarco Nelissen2014-09-177-4/+30
|\ \ \ \ \
| * | | | | Add support for ANDROID_LOOP to NuPlayerMarco Nelissen2014-09-177-4/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17518139 Change-Id: I9355ddd4c998d967013dd8bd32d670a9a83dea31
* | | | | | 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
* | | | | mediaplayer: reset flags when pre-reading multiple buffersMarco Nelissen2014-09-161-0/+2
| |/ / / |/| | | | | | | | | | | | | | | Bug: 17521470 Change-Id: I15ee9b1d3dd4ad29f4961a642f7fadafd9fe5b24
* | | | 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 "NuPlayerDriver: restart after eos pause" into lmp-devRobert Shih2014-09-171-2/+9
|\ \ \ \
| * | | | NuPlayerDriver: restart after eos pauseRobert Shih2014-09-161-2/+9
| | |/ / | |/| | | | | | | | | | | | | | Bug: 17512187 Change-Id: I204ce83790bf98bc7ffebcb76d5df1e56a6a3f66
* | | | Merge "Disconnect HTTP-based data source upon reset" into lmp-devChong Zhang2014-09-166-8/+53
|\ \ \ \
| * | | | Disconnect HTTP-based data source upon resetChong Zhang2014-09-166-8/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17425250 Change-Id: Ieb4c93fd9848489f9dbf35a36474376924fd8eb9
* | | | | 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 "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 "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
|\ \ \ \ \ | |/ / / / |/| | | |
generated by cgit v1.1 at 2024-08-20 06:14:59 +0000