summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge "Fix ringbuffer handling" into lmp-devMarco Nelissen2014-09-192-24/+19
|\ \ \ \
| * | | | Fix ringbuffer handlingMarco Nelissen2014-09-192-24/+19
| |/ / /
* | | | Reduce log spam from getTimestamp errorsGlenn Kasten2014-09-191-1/+1
|/ / /
* | | 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
* | | | Merge "mediaplayer: fix buffer aggregation when video has offloaded audio" in...Phil Burk2014-09-181-5/+5
|\ \ \ \
| * | | | mediaplayer: fix buffer aggregation when video has offloaded audioPhil Burk2014-09-171-5/+5
* | | | | Merge "AudioEffect acquires session" into lmp-devJean-Michel Trivi2014-09-181-3/+10
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | AudioEffect acquires sessionJean-Michel Trivi2014-09-181-3/+10
* | | | | 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
* | | | | | Merge "NuPlayer: update timestamp handling" into lmp-devAndy Hung2014-09-173-33/+117
|\ \ \ \ \ \
| * | | | | | NuPlayer: update timestamp handlingAndy Hung2014-09-173-33/+117
* | | | | | | 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
* | | | | | | 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
| | |/ / / / | |/| | | |
* | | | | | 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
| | |_|_|_|/ | |/| | | |
* | | | | | Merge "Fix null pointer dereference" into lmp-devMarco Nelissen2014-09-171-2/+4
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Fix null pointer dereferenceMarco Nelissen2014-09-171-2/+4
| |/ / / /
* | | | | mediaplayer: reset flags when pre-reading multiple buffersMarco Nelissen2014-09-161-0/+2
| |/ / / |/| | |
* | | | 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
* | | | Merge "NuPlayerDriver: restart after eos pause" into lmp-devRobert Shih2014-09-171-2/+9
|\ \ \ \
| * | | | NuPlayerDriver: restart after eos pauseRobert Shih2014-09-161-2/+9
| | |/ / | |/| |
* | | | 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
* | | | | GenericSource: fix selectTrack parameterRobert Shih2014-09-161-1/+1
| |/ / / |/| | |
* | | | 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
* | | | 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
* | | | Merge "Optimize the YUV buffer copy a little bit to skip unnecessary operatio...hkuang2014-09-151-18/+15
|\ \ \ \
| * | | | Optimize the YUV buffer copy a little bit to skip unnecessary operation.hkuang2014-09-151-18/+15
* | | | | Merge "PlaylistFetcher: find the correct sequence number to start fetching" i...Robert Shih2014-09-152-51/+107
|\ \ \ \ \
| * | | | | PlaylistFetcher: find the correct sequence number to start fetchingRobert Shih2014-09-152-51/+107
* | | | | | 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
| | |_|_|/ | |/| | |
* | | | | Merge "mediaplayer: optimize buffer queue management" into lmp-devPhil Burk2014-09-155-65/+93
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | mediaplayer: optimize buffer queue managementPhil Burk2014-09-125-65/+93
| | |/ / | |/| |
* | | | Merge "LiveSession: reliable switch" into lmp-devRobert Shih2014-09-132-10/+57
|\ \ \ \
| * | | | LiveSession: reliable switchRobert Shih2014-09-122-10/+57
* | | | | 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
* | | | | 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
* | | | | | Merge "stagefright: add adaptive playback support to SoftMPEG decoder." into ...Ronghua Wu2014-09-126-29/+47
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | stagefright: add adaptive playback support to SoftMPEG decoder.Ronghua Wu2014-09-116-29/+47
* | | | | | Merge "GenericSource: move track packet init from start to prepare" into lmp-devRobert Shih2014-09-121-4/+4
|\ \ \ \ \ \