summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-devLajos Molnar2014-03-142-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge changes Ic46e3069,Idc92716b into klp-devLajos Molnar2014-03-122-1/+2
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | LiveSession: fix incorrect stream key (subtitle"s")Robert Shih2014-03-111-1/+1
| | * | | | | | | | | | | M3UParser: trim spaces when parsing comma separated codecs.Robert Shih2014-03-111-0/+1
* | | | | | | | | | | | | am 67a10c52: Merge "httplive: clear access units before returning from seekTo...Lajos Molnar2014-03-144-15/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "httplive: clear access units before returning from seekTo." into klp-devLajos Molnar2014-03-124-15/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | httplive: clear access units before returning from seekTo.Robert Shih2014-03-114-15/+42
* | | | | | | | | | | | | am cf49a51f: fix codec buffer leak in error handling when timestamp goes back...Chong Zhang2014-03-131-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | fix codec buffer leak in error handling when timestamp goes backwardChong Zhang2014-03-111-7/+7
* | | | | | | | | | | | | am c69bc40a: Merge "Cap pts gap between adjacent frames to specified value" i...Chong Zhang2014-03-136-6/+169
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "Cap pts gap between adjacent frames to specified value" into klp-devChong Zhang2014-03-116-6/+169
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Cap pts gap between adjacent frames to specified valueChong Zhang2014-03-116-6/+169
| | |/ / / / / / / / / / /
* | | | | | | | | | | | | am 1c608ab3: save mGraphicBuffer pointer even when we\'re suspendedChong Zhang2014-03-131-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | save mGraphicBuffer pointer even when we're suspendedChong Zhang2014-03-111-0/+6
| |/ / / / / / / / / / /
* | | | | | | | | | | | am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when preview size ...Zhijun He2014-03-111-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | DO NOT MERGE: Camera: delete preview callback when preview size is changedZhijun He2014-03-101-0/+16
| |/ / / / / / / / / /
* | | | | | | | | | | am 6db20dcb: Merge "AudioTrack: When paused, return cached playback position"...Eric Laurent2014-03-082-3/+23
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "AudioTrack: When paused, return cached playback position" into klp-devEric Laurent2014-03-082-3/+23
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | AudioTrack: When paused, return cached playback positionHaynes Mathew George2014-03-062-3/+23
* | | | | | | | | | | | am 2f55c2c0: Merge "Simplify AudioTrack stream end and fix race" into klp-devGlenn Kasten2014-03-071-17/+15
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "Simplify AudioTrack stream end and fix race" into klp-devGlenn Kasten2014-03-071-17/+15
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Simplify AudioTrack stream end and fix raceGlenn Kasten2014-03-071-17/+15
* | | | | | | | | | | | | am 5874615f: Allow for larger codec private dataMarco Nelissen2014-03-071-30/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Allow for larger codec private dataMarco Nelissen2014-03-071-30/+50
| |/ / / / / / / / / / /
* | | | | | | | | | | | am 5bc83fc3: Merge "Fix SIGABRT when playing mp4 file" into klp-devMarco Nelissen2014-03-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "Fix SIGABRT when playing mp4 file" into klp-devMarco Nelissen2014-03-071-0/+6
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix SIGABRT when playing mp4 fileMarco Nelissen2014-03-061-0/+6
* | | | | | | | | | | | | am 49ea1337: Merge changes I787e1c05,I72d3a5e1,I0a5cc65f,I75fc2a25,I2c2be08d,...Lajos Molnar2014-03-0712-266/+893
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge changes I787e1c05,I72d3a5e1,I0a5cc65f,I75fc2a25,I2c2be08d, ... into klp...Lajos Molnar2014-03-0712-266/+893
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | LiveSession: Use the actual, possibly redirected url as base in the M3UMartin Storsjo2014-03-062-4/+13
| | * | | | | | | | | | | | M3UParser: Skip query strings when looking for the last slash in a URLMartin Storsjo2014-03-061-12/+22
| | * | | | | | | | | | | | ChromiumHTTPDataSource: Keep track of the redirected URLMartin Storsjo2014-03-063-0/+7
| | * | | | | | | | | | | | Initial HLS seamless switch implementation.Robert Shih2014-03-064-48/+541
| | * | | | | | | | | | | | NuPlayer side support for seamless format switch.Robert Shih2014-03-063-1/+74
| | * | | | | | | | | | | | LiveSession refactorRobert Shih2014-03-064-140/+92
| | * | | | | | | | | | | | PlaylistFetcher: Add support for block-by-block decryption.Robert Shih2014-03-062-37/+75
| | * | | | | | | | | | | | LiveSession: Add support for block-by-block fetchFile.Robert Shih2014-03-062-35/+80
* | | | | | | | | | | | | | am e0c3058a: Merge "AnotherPacketSource support to get latest buffered MetaDa...Lajos Molnar2014-03-072-2/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge "AnotherPacketSource support to get latest buffered MetaData." into klp...Lajos Molnar2014-03-072-2/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | AnotherPacketSource support to get latest buffered MetaData.Robert Shih2014-03-062-2/+25
* | | | | | | | | | | | | | am 2613347d: Merge "Added support to query ACodec whether adaptive playback i...Lajos Molnar2014-03-072-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge "Added support to query ACodec whether adaptive playback is enabled." i...Lajos Molnar2014-03-072-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Added support to query ACodec whether adaptive playback is enabled.Robert Shih2014-03-062-0/+8
* | | | | | | | | | | | | | am 909498b7: Merge "stagefright: use CODECS field in EXT-X_STREAM-INF as fall...Lajos Molnar2014-03-072-7/+157
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge "stagefright: use CODECS field in EXT-X_STREAM-INF as fallback" into kl...Lajos Molnar2014-03-072-7/+157
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | stagefright: use CODECS field in EXT-X_STREAM-INF as fallbackRobert Shih2014-03-062-7/+157
* | | | | | | | | | | | | | am 2338782d: Merge "Fixed misplaced bracket for switch-case block." into klp-devLajos Molnar2014-03-071-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge "Fixed misplaced bracket for switch-case block." into klp-devLajos Molnar2014-03-071-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Fixed misplaced bracket for switch-case block.Robert Shih2014-03-061-4/+4
* | | | | | | | | | | | | | am ad21a81a: Merge "stagefright: Fix issue with tracking media format in pack...Lajos Molnar2014-03-072-13/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /