summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | 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
| | | |_|_|_|/ | | |/| | | |
* | | | | | | am 999b888f: Merge "Fix null pointer dereference" into lmp-devMarco Nelissen2014-09-171-2/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Fix null pointer dereference" into lmp-devMarco Nelissen2014-09-171-2/+4
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Fix null pointer dereferenceMarco Nelissen2014-09-171-2/+4
| | |/ / / /
* | | | | | am 3a6a0f9d: Merge "mediaplayer: reset flags when pre-reading multiple buffer...Lajos Molnar2014-09-171-0/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | mediaplayer: reset flags when pre-reading multiple buffersMarco Nelissen2014-09-161-0/+2
| | |/ / / | |/| | |
* | | | | am 90869c2b: Merge "HLS: fix freezes when toggling between a/v streams" into ...Robert Shih2014-09-173-5/+63
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | am 919b9347: Merge "NuPlayerDriver: restart after eos pause" into lmp-devRobert Shih2014-09-171-2/+9
|\ \ \ \ \ | |/ / / /
| * | | | Merge "NuPlayerDriver: restart after eos pause" into lmp-devRobert Shih2014-09-171-2/+9
| |\ \ \ \
| | * | | | NuPlayerDriver: restart after eos pauseRobert Shih2014-09-161-2/+9
| | | |/ / | | |/| |
* | | | | am fbbeeeb8: Merge "Disconnect HTTP-based data source upon reset" into lmp-devChong Zhang2014-09-176-8/+53
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | | am da23ab9b: GenericSource: fix selectTrack parameterRobert Shih2014-09-171-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | GenericSource: fix selectTrack parameterRobert Shih2014-09-161-1/+1
| | |/ / / | |/| | |
* | | | | am 086c1e3f: Merge "ASessionDescription: allow open-ended NTP range." into lm...Wei Jia2014-09-171-0/+5
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | am 9299a687: Merge "ESQueue: do not merge aac packets" into lmp-devRobert Shih2014-09-172-1/+46
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | am db8556ba: Merge "Optimize the YUV buffer copy a little bit to skip unneces...hkuang2014-09-171-18/+15
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | | am 60a89850: Merge "PlaylistFetcher: find the correct sequence number to star...Robert Shih2014-09-172-51/+107
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
* | | | | | | am 73721170: Merge "mediaplayer: handle surface dis/connection errors" into l...Lajos Molnar2014-09-171-5/+8
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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
| | | |_|_|/ | | |/| | |
* | | | | | am c7b29572: Merge "mediaplayer: optimize buffer queue management" into lmp-devPhil Burk2014-09-165-65/+93
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "mediaplayer: optimize buffer queue management" into lmp-devPhil Burk2014-09-155-65/+93
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | mediaplayer: optimize buffer queue managementPhil Burk2014-09-125-65/+93
| | | |/ / | | |/| |
* | | | | am 4d22f208: Merge "LiveSession: reliable switch" into lmp-devRobert Shih2014-09-132-10/+57
|\ \ \ \ \ | |/ / / /
| * | | | Merge "LiveSession: reliable switch" into lmp-devRobert Shih2014-09-132-10/+57
| |\ \ \ \
| | * | | | LiveSession: reliable switchRobert Shih2014-09-122-10/+57
* | | | | | am de7e2ae6: Merge "Fix AAC timestamps for multiple aac frames per input buff...Marco Nelissen2014-09-132-128/+200
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
* | | | | | am f6454e6d: Merge "LiveSession: re-buffer on under run to avoid stutter" int...Robert Shih2014-09-132-1/+37
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
* | | | | | | am 98d59462: Merge "stagefright: add adaptive playback support to SoftMPEG de...Ronghua Wu2014-09-126-29/+47
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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
* | | | | | | am ae6fe431: Merge "GenericSource: move track packet init from start to prepa...Robert Shih2014-09-121-4/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "GenericSource: move track packet init from start to prepare" into lmp-devRobert Shih2014-09-121-4/+4
| |\ \ \ \ \ \