summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 6a025acb: am ec0472ba: Merge "Move AString\'s StringPrintf out of the way."Elliott Hughes2015-02-0412-52/+52
|\
| * am ec0472ba: Merge "Move AString\'s StringPrintf out of the way."Elliott Hughes2015-02-0412-52/+52
| |\
| | * Move AString's StringPrintf out of the way.Elliott Hughes2015-02-0412-52/+52
* | | am 3a7ed550: am efbb6195: NuPlayer: pause playback when buffering is lowChong Zhang2015-02-046-34/+251
|\ \ \
| * | | NuPlayer: pause playback when buffering is lowChong Zhang2015-02-036-34/+251
* | | | am 0d8e85f9: am 77f877f8: Merge "Acodec: reset sideband handle for all non tu...Rachad2015-02-021-0/+9
|\ \ \ \ | |/ / /
| * | | Merge "Acodec: reset sideband handle for all non tunneled mode video playback...Rachad2015-01-311-0/+9
| |\ \ \
| | * | | Acodec: reset sideband handle for all non tunneled mode video playbackRachad2015-01-311-0/+9
* | | | | am c9e11696: am 36dca156: Merge "Acodec: Send framerate information to OMX de...Rachad2015-02-021-2/+15
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Acodec: Send framerate information to OMX decoder if available" into l...Rachad2015-01-311-2/+15
| |\ \ \ \ | | |/ / /
| | * | | Acodec: Send framerate information to OMX decoder if availableRachad2015-01-291-2/+15
* | | | | am c37a6e6b: am 7a434265: Merge "Wrong format used in seamless check" into lm...Robert Shih2015-02-021-4/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Wrong format used in seamless check" into lmp-mr1-devRobert Shih2015-01-311-4/+4
| |\ \ \ \
| | * | | | Wrong format used in seamless checkjoakim johansson2015-01-301-4/+4
| | |/ / /
* | | | | am 9787254f: am 296a0d03: Merge "PlaylistFetcher: clear packet sources when a...Robert Shih2015-02-021-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge "PlaylistFetcher: clear packet sources when adjusting starting sequence...Robert Shih2015-01-311-0/+4
| |\ \ \ \
| | * | | | PlaylistFetcher: clear packet sources when adjusting starting sequence numberRobert Shih2015-01-301-0/+4
* | | | | | am e3ada5d5: am 678bcdc8: httplive: Defer switch down if a switch is in progressApurupa Pattapu2015-02-021-1/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | httplive: Defer switch down if a switch is in progressApurupa Pattapu2015-01-301-1/+6
| |/ / / /
* | | | | am 3e7e574b: am 434c80e5: Merge "Add missing includes."Elliott Hughes2015-01-301-0/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | am 434c80e5: Merge "Add missing includes."Elliott Hughes2015-01-301-0/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Add missing includes.Elliott Hughes2015-01-291-0/+1
* | | | | am 5bcdfac9: am 2a6e5cf4: Merge "Fix uninitialized variable."Marco Nelissen2015-01-291-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | am 2a6e5cf4: Merge "Fix uninitialized variable."Marco Nelissen2015-01-291-1/+3
| |\ \ \ \ | | |/ / /
| | * | | Merge "Fix uninitialized variable."Marco Nelissen2015-01-291-1/+3
| | |\ \ \
| | | * | | Fix uninitialized variable.Marco Nelissen2015-01-291-1/+3
* | | | | | am ce25d85a: am a93fd2be: stagefright: httplive: Decouple block size from ban...Leena Winterrowd2015-01-296-5/+26
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | stagefright: httplive: Decouple block size from bandwidth estimateLeena Winterrowd2015-01-286-5/+26
* | | | | | am 0512881b: am 9aff25fb: stagefright: httplive: Reduce memcpy calls for chun...Leena Winterrowd2015-01-291-1/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | stagefright: httplive: Reduce memcpy calls for chunked contentLeena Winterrowd2015-01-281-1/+5
* | | | | | resolved conflicts for merge of 59d1d010 to lmp-mr1-dev-plus-aospLajos Molnar2015-01-292-3/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | httplive: Dont resume if we have almost fetched till stop timeApurupa Pattapu2015-01-282-3/+10
* | | | | | am 3606efd1: am 9dee2e59: stagefright: httplive: Propagate target duration to...Leena Winterrowd2015-01-291-0/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | stagefright: httplive: Propagate target duration to LiveSessionLeena Winterrowd2015-01-281-0/+5
* | | | | | am b2f95a1f: am 2a66207f: httplive: Create a copy of last enqueued metadataApurupa Pattapu2015-01-291-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | httplive: Create a copy of last enqueued metadataApurupa Pattapu2015-01-281-2/+2
* | | | | | am 958a5432: am 17460976: stagefright: httplive: Fix deadlock for low duratio...Leena Winterrowd2015-01-292-2/+17
|\ \ \ \ \ \ | |/ / / / /
| * | | | | stagefright: httplive: Fix deadlock for low duration clipsLeena Winterrowd2015-01-282-2/+17
* | | | | | am 2899991e: am 5cf91c50: libstagefright: httplive: Add NULL check for empty ...Leena Winterrowd2015-01-291-1/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | libstagefright: httplive: Add NULL check for empty playlistLeena Winterrowd2015-01-281-1/+6
* | | | | | resolved conflicts for merge of 44a2390b to lmp-mr1-dev-plus-aospLajos Molnar2015-01-297-71/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Revert "HLS: QCom enhancements"Lajos Molnar2015-01-287-71/+14
* | | | | | am a3c9d5c3: am 166776fb: Merge "Add missing includes."Elliott Hughes2015-01-293-0/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 166776fb: Merge "Add missing includes."Elliott Hughes2015-01-293-0/+3
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "Add missing includes."Elliott Hughes2015-01-293-0/+3
| | |\ \ \ \
| | | * | | | Add missing includes.Elliott Hughes2015-01-283-0/+3
| | | | |/ / | | | |/| |
* | | | | | am 29e609a8: am 628d4ea1: Merge "stagefright: do not reject SPL5 files outrig...Ronghua Wu2015-01-281-2/+2
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge "stagefright: do not reject SPL5 files outright in SoftMpeg4 decoder" i...Ronghua Wu2015-01-281-2/+2
| |\ \ \ \ \
| | * | | | | stagefright: do not reject SPL5 files outright in SoftMpeg4 decoderRonghua Wu2015-01-281-2/+2
| | | |_|_|/ | | |/| | |
* | | | | | am ba553472: am aeccbffd: Merge "Avoid mixing declarations and statements in ...Andreas Gampe2015-01-281-2/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |