summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
Commit message (Expand)AuthorAgeFilesLines
* Merge "NuPlayer side support for seamless format switch."Robert Shih2014-02-243-1/+74
|\
| * NuPlayer side support for seamless format switch.Robert Shih2014-02-243-1/+74
* | Merge "support for time lapse/slow motion when using SURFACE source"Chong Zhang2014-02-221-3/+14
|\ \ | |/ |/|
| * support for time lapse/slow motion when using SURFACE sourceChong Zhang2014-02-141-3/+14
* | Merge "Track pid for each session"Marco Nelissen2014-02-132-5/+10
|\ \
| * | Track pid for each sessionMarco Nelissen2014-02-112-5/+10
| |/
* | Remove unused FragmentedMP4Parser and friends. The functionality has beenAndreas Huber2014-02-134-208/+1
* | fix the build by fixing more warnings.Andreas Huber2014-02-111-1/+1
* | warnings be gone.Andreas Huber2014-02-115-13/+15
|/
* resolved conflicts for merge of 566be7c3 to masterNarayan Kamath2014-02-113-5/+7
|\
| * Make frameworks/av 64-bit compatibleKévin PETIT2014-02-113-5/+7
* | am 429f2bf7: am e2307ccb: Merge "frameworks/av: fix errors inside ALOGV"Colin Cross2014-02-101-1/+1
|\ \ | |/
| * frameworks/av: fix errors inside ALOGVColin Cross2014-02-061-1/+1
* | Fix warnings about unused parametersGlenn Kasten2014-02-071-3/+3
* | Merge "Change StagefrightRecorder to use MediaCodec"Chong Zhang2014-02-062-176/+180
|\ \
| * | Change StagefrightRecorder to use MediaCodecChong Zhang2014-02-052-176/+180
* | | Remove no longer needed http proxy handling code, it's obsolete nowAndreas Huber2014-02-058-32/+8
|/ /
* | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to...Andreas Huber2014-02-0422-33/+98
* | am fea77cb3: am fd0daeb3: am 4cc47940: Merge "Fix compile error in NuPlayerRe...Marco Nelissen2014-01-171-1/+3
|\ \ | |/
| * Fix compile error in NuPlayerRenderer debug printOscar Rydhé2014-01-031-1/+3
| * update offloaded audio track sampling rateEric Laurent2013-12-172-0/+16
| * Merge commit '2381f06f374ee0cb8bca0edf5388394432b00e6d' into HEADThe Android Open Source Project2013-12-055-17/+58
| |\
* | \ am 7ecfe4ec: am 92630351: Merge "NuPlayer: Use a software renderer when using...Marco Nelissen2013-12-024-2/+42
|\ \ \
| * \ \ am 92630351: Merge "NuPlayer: Use a software renderer when using software cod...Marco Nelissen2013-11-284-2/+42
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Merge "NuPlayer: Use a software renderer when using software codecs"Marco Nelissen2013-11-284-2/+42
| | |\
| | | * NuPlayer: Use a software renderer when using software codecsMartin Storsjo2013-09-254-2/+42
* | | | update offloaded audio track sampling rateEric Laurent2013-11-222-0/+16
* | | | am 576e89b5: am 7dae71d6: Merge "AwesomePlayer: correct stream type for offlo...Eric Laurent2013-11-151-1/+7
|\ \ \ \ | |/ / /
| * | | AwesomePlayer: correct stream type for offloadEric Laurent2013-11-141-1/+7
* | | | Merge "Fixed StagefrightRecorder::setupVideoEncoder to use the clipped bitrat...Robert Shih2013-11-152-28/+12
|\ \ \ \
| * | | | Fixed StagefrightRecorder::setupVideoEncoder to use the clipped bitrate valueRobert Shih2013-11-112-28/+12
* | | | | am cc5aeced: am e100b813: Merge "StageFrightRecorder: do not use meta-data mo...Lajos Molnar2013-11-112-7/+27
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge "StageFrightRecorder: do not use meta-data mode for software encoders" ...Lajos Molnar2013-11-112-7/+27
| |\ \ \
| | * | | StageFrightRecorder: do not use meta-data mode for software encodersLajos Molnar2013-10-302-7/+27
* | | | | am 92168885: am f8a1169d: Merge "Notify current video size if available" into...Marco Nelissen2013-11-041-1/+10
|\ \ \ \ \ | |/ / / /
| * | | | Notify current video size if availableMarco Nelissen2013-11-011-1/+10
| |/ / /
| * | | Assign blame for playback wakelocks.Marco Nelissen2013-10-252-8/+14
| |/ /
* | | Assign blame for playback wakelocks.Marco Nelissen2013-10-252-8/+14
* | | am 8ee02943: am 1c7f35d1: Merge "soundpool: allocate shared memory heap by cl...Eric Laurent2013-09-242-26/+36
|\ \ \ | |/ /
| * | soundpool: allocate shared memory heap by clientEric Laurent2013-09-242-26/+36
* | | am 83774965: am bc910e5c: Merge "Fix hang" into klp-devMarco Nelissen2013-09-161-1/+1
|\ \ \ | |/ /
| * | Merge "Fix hang" into klp-devMarco Nelissen2013-09-161-1/+1
| |\ \
| | * | Fix hangMarco Nelissen2013-09-161-1/+1
* | | | am fcb7a247: am a5652e9c: Merge "Add FLAG_CAN_SEEK_BACKWARD and FLAG_CAN_SEEK...Chong Zhang2013-09-162-5/+9
|\ \ \ \ | |/ / /
| * | | Add FLAG_CAN_SEEK_BACKWARD and FLAG_CAN_SEEK_FORWARD see flagsChong Zhang2013-09-112-5/+9
| |/ /
* | | HDCP: use getCaps() to query HDCP capsChong Zhang2013-09-071-5/+1
|/ /
* | wifi-display: do not use HDCP's encryptNative method if its unsupportedChong Zhang2013-09-032-0/+15
* | fix MediaDrm.isCryptoSchemeSupported(uuid)Jeff Tinker2013-08-281-1/+5
* | Merge "MediaPlayer: add listener for raw track data" into klp-devChong Zhang2013-08-237-7/+181
|\ \
| * | MediaPlayer: add listener for raw track dataChong Zhang2013-08-197-7/+181