summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
Commit message (Expand)AuthorAgeFilesLines
* am d009aa2b: am 81e0bd44: Add signature|system permission to MediaDrm signer ...Jeff Tinker2014-04-031-0/+16
|\
| * am 81e0bd44: Add signature|system permission to MediaDrm signer APIsJeff Tinker2014-04-031-0/+16
| |\
| | * Add signature|system permission to MediaDrm signer APIsJeff Tinker2014-04-021-0/+16
* | | am f356a123: am 68d9d71a: Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-012-6/+38
|\ \ \ | |/ /
| * | am 68d9d71a: Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-012-6/+38
| |\ \ | | |/
| | * Support CAST V2 Authentication in MediaDrmJeff Tinker2014-03-292-6/+38
* | | mediaplayer: add temporary developer settings to use NuPlayer as defaultLajos Molnar2014-03-281-0/+6
* | | Use LOG_ALWAYS_FATAL instead of LOG_FATALGlenn Kasten2014-03-261-1/+1
* | | resolved conflicts for merge of 3c780188 to masterGlenn Kasten2014-03-141-0/+2
|\ \ \ | |/ /
| * | am 089affb6: Merge "mediaserver and associated services are 32-bit only"Glenn Kasten2014-03-141-0/+2
| |\ \
| | * | mediaserver and associated services are 32-bit onlyGlenn Kasten2014-03-121-0/+2
| * | | resolved conflicts for merge of 8d1caa02 to klp-modular-dev-plus-aospNarayan Kamath2014-03-073-1/+74
| |\ \ \ | | |/ / | |/| / | | |/
| | * am 49ea1337: Merge changes I787e1c05,I72d3a5e1,I0a5cc65f,I75fc2a25,I2c2be08d,...Lajos Molnar2014-03-073-1/+74
| | |\
| | | * NuPlayer side support for seamless format switch.Robert Shih2014-03-063-1/+74
| | | * update offloaded audio track sampling rateEric Laurent2014-03-052-0/+16
* | | | NuPlayer: use MediaCodec instead of ACodecLajos Molnar2014-03-104-108/+446
* | | | Revert "NuPlayer: Use a software renderer when using software codecs"Lajos Molnar2014-03-104-42/+2
* | | | Fix type of AudioTrack/AudioRecord parameter frameCountGlenn Kasten2014-02-281-1/+1
* | | | Fix includes to no longer pull in Skia includes directories.Derek Sollenberger2014-02-271-1/+0
* | | | initialize encoder at start() time for camera sourceChong Zhang2014-02-262-5/+18
* | | | 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
|\ \ \ \