summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "support time lapse/slow motion on SURFACE source"Chong Zhang2014-02-242-6/+47
|\
| * support time lapse/slow motion on SURFACE sourceChong Zhang2014-02-142-6/+47
* | Add method to get redirected UriMarco Nelissen2014-02-212-7/+19
* | Another javadoc fixRoboErik2014-02-191-2/+2
* | Fix build (bad javadoc reference)RoboErik2014-02-191-1/+1
* | Merge "Initial round of MediaSession APIs"RoboErik2014-02-2012-35/+1002
|\ \
| * | Initial round of MediaSession APIsRoboErik2014-02-1912-35/+1002
| * | Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."Andreas Huber2014-02-132-2/+0
| * | Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.Andreas Huber2014-02-122-0/+2
| |/
* | Fix regressionMarco Nelissen2014-02-181-1/+1
* | Update createInputSurface() docAndy McFadden2014-02-141-0/+4
|/
* am 43c9516a: am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code"Narayan Kamath2014-02-111-2/+2
|\
| * am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code"Narayan Kamath2014-02-111-2/+2
| |\
| | * Fix in MediaMuxer's JNI codeAshok Bhat2014-02-071-2/+2
* | | Merge "Remove no longer needed http proxy handling code, it's obsolete now"Andreas Huber2014-02-062-114/+0
|\ \ \
| * | | Remove no longer needed http proxy handling code, it's obsolete nowAndreas Huber2014-02-052-114/+0
* | | | Merge "MediaRecorderTest: add tests for getSurface() and SURFACE source"Chong Zhang2014-02-063-23/+250
|\ \ \ \
| * | | | MediaRecorderTest: add tests for getSurface() and SURFACE sourceChong Zhang2014-01-163-23/+250
* | | | | Merge "android_media_MediaMuxer_setLocation: amended signature."Robert Shih2014-02-051-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | android_media_MediaMuxer_setLocation: amended signature.Robert Shih2014-02-051-1/+1
* | | | | Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made avail...Andreas Huber2014-02-0515-21/+703
|\ \ \ \ \
| * | | | | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to...Andreas Huber2014-02-0415-21/+703
| |/ / / /
* | | | | Cache media/nomedia pathsMarco Nelissen2014-02-041-16/+50
|/ / / /
* | | | am 4f840dd1: am 5901ddeb: am 0a1b64fe: Merge "Release locked buffer when it f...Zhijun He2014-01-311-0/+1
|\ \ \ \ | | |/ / | |/| |
| * | | am 5901ddeb: am 0a1b64fe: Merge "Release locked buffer when it fails to acqui...Zhijun He2014-01-311-0/+1
| |\ \ \ | | | |/ | | |/|
| | * | Merge "Release locked buffer when it fails to acquire graphics buffer"Zhijun He2014-01-301-0/+1
| | |\ \
| | | * | Release locked buffer when it fails to acquire graphics bufferlina.x.pi2014-01-281-0/+1
| * | | | am aa9ba887: am 6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compat...Narayan Kamath2014-01-281-2/+2
| |\ \ \ \ | | |/ / /
| | * | | AArch64: Make graphics classes 64-bit compatibleAshok Bhat2014-01-281-2/+2
| | |/ /
* | | | Merge "Fix invocation of notification callback in case the callback is modified"Andreas Huber2014-01-281-3/+4
|\ \ \ \
| * | | | Fix invocation of notification callback in case the callback is modifiedAndreas Huber2014-01-271-3/+4
* | | | | AArch64: Make graphics classes 64-bit compatibleAshok Bhat2014-01-281-2/+2
|/ / / /
* | | | API that allows usage of MediaCodec APIs without polling.Andreas Huber2014-01-273-13/+199
* | | | Revert "AArch64: Make graphics classes 64-bit compatible"Narayan Kamath2014-01-271-2/+2
* | | | AArch64: Make graphics classes 64-bit compatibleAshok Bhat2014-01-271-2/+2
* | | | Merge "Check that the exif bits are actually there"Marco Nelissen2014-01-221-2/+2
|\ \ \ \
| * | | | Check that the exif bits are actually thereMarco Nelissen2014-01-221-2/+2
* | | | | Merge "Add "throws IOException" to MediaCodec factory methods"Andy Hung2014-01-211-6/+27
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add "throws IOException" to MediaCodec factory methodsAndy Hung2014-01-161-6/+27
* | | | | Resolved conflicts for merge of 28c6ec02 to masterNarayan Kamath2014-01-1624-153/+157
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am bc0468e6: am 6f17adba: Merge "AArch64: Use long for pointers in media clas...Narayan Kamath2014-01-1624-153/+157
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | AArch64: Use long for pointers in media classesAshok Bhat2014-01-1524-153/+157
* | | | | Merge "Remove calls to deprecated SkBitmap::setIsOpaque()"Leon Scroggins III2014-01-151-2/+2
|\ \ \ \ \
| * | | | | Remove calls to deprecated SkBitmap::setIsOpaque()Leon Scroggins III2014-01-151-2/+2
* | | | | | Merge "Unhide android.media.AudioTrack.setVolume(float)"Glenn Kasten2014-01-151-2/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Unhide android.media.AudioTrack.setVolume(float)Glenn Kasten2014-01-141-2/+6
* | | | | | Merge "Use AUDIO_SESSION_ALLOCATE instead of hard-coded 0"Glenn Kasten2014-01-153-4/+7
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Use AUDIO_SESSION_ALLOCATE instead of hard-coded 0Glenn Kasten2013-06-263-4/+7
* | | | | | am 28f032e6: am e2c046fe: am 13249411: am a9045d24: am 337aa376: Merge "Add N...Marco Nelissen2014-01-141-8/+11
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | |
| * | | | am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig"Marco Nelissen2014-01-141-8/+11
| |\ \ \ \ | | | |/ / | | |/| |
generated by cgit v1.1 at 2025-01-07 20:30:22 +0000