summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ | | | |/ | | |/|
| | * | Merge "Add NULL check in updateProxyConfig"Marco Nelissen2014-01-141-8/+11
| | |\ \
| | | * | Add NULL check in updateProxyConfigOscar Rydhé2013-12-191-8/+11
* | | | | Merge "Prepare for additional formats beyond 8-bit and 16-bit PCM"Glenn Kasten2014-01-131-1/+2
|\ \ \ \ \
| * | | | | Prepare for additional formats beyond 8-bit and 16-bit PCMGlenn Kasten2014-01-101-1/+2
* | | | | | libjhead_jni is still neededMarco Nelissen2014-01-131-0/+3
* | | | | | Merge "setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager"Zhihai Xu2014-01-111-1/+1
|\ \ \ \ \ \
| * | | | | | setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManagerZhihai Xu2014-01-101-1/+1
* | | | | | | am bb0a4f20: am 1ae17633: am 411350dd: am 739ae9b3: am 868173a5: Merge "Fix a...Jason Sams2014-01-111-0/+1
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | am 739ae9b3: am 868173a5: Merge "Fix a JNI local reference leak in MediaDrm"Jason Sams2014-01-101-0/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge "Fix a JNI local reference leak in MediaDrm"Jason Sams2014-01-111-0/+1
| | |\ \ \ \ \
| | | * | | | | Fix a JNI local reference leak in MediaDrmPatrik2 Carlsson2013-12-191-0/+1
| | | | |_|/ / | | | |/| | |
* | | | | | | Make MtpDatabase use libexif instead of libjheadMarco Nelissen2014-01-102-37/+46
| |_|_|_|/ / |/| | | | |
* | | | | | am 1e3395c7: am 105b545e: am 0dce19ca: am 79ceb53a: am c58abeea: Merge "AArch...Narayan Kamath2014-01-076-27/+28
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 79ceb53a: am c58abeea: Merge "AArch64: Use long for pointers in MTP classes"Narayan Kamath2014-01-076-27/+28
| |\ \ \ \ \ | | |/ / / /
| | * | | | AArch64: Use long for pointers in MTP classesAshok Bhat2014-01-076-27/+28
* | | | | | am 510616d2: am bec733af: am 23ebc24e: am 08467c57: am 9bc6acf2: Merge "AArch...Narayan Kamath2014-01-073-37/+37
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 08467c57: am 9bc6acf2: Merge "AArch64: Use long for pointers in VideoEdito...Narayan Kamath2014-01-073-37/+37
| |\ \ \ \ \ | | |/ / / /
| | * | | | AArch64: Use long for pointers in VideoEditor classesAshok Bhat2014-01-073-37/+37
* | | | | | am 113e83e6: am 58cb0f0c: am bfbe585e: am c0c92f20: am 357ea905: Merge "AArch...Narayan Kamath2014-01-074-57/+65
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am c0c92f20: am 357ea905: Merge "AArch64: Use long for pointers in audio effe...Narayan Kamath2014-01-074-57/+65
| |\ \ \ \ \ | | |/ / / /
| | * | | | AArch64: Use long for pointers in audio effect classesAshok Bhat2014-01-074-57/+65
* | | | | | am 99aec6b5: am 40b0aaa9: am 568cde55: am 80cff944: am 74675f29: Merge "AArch...Narayan Kamath2014-01-072-20/+20
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 80cff944: am 74675f29: Merge "AArch64: Use long for pointers in AmrInputSt...Narayan Kamath2014-01-072-20/+20
| |\ \ \ \ \ | | |/ / / /
| | * | | | AArch64: Use long for pointers in AmrInputStreamAshok Bhat2014-01-072-20/+20
* | | | | | Merge "Fix RemoteController synchronization mode"Jean-Michel Trivi2014-01-061-1/+1
|\ \ \ \ \ \
| * | | | | | Fix RemoteController synchronization modeJean-Michel Trivi2014-01-021-1/+1
* | | | | | | MediaRecorder: add getSurface() api and SURFACE video sourceChong Zhang2014-01-062-3/+49
|/ / / / / /
* | | | | | ExifInterface: fix class load failureZhijun He2013-12-201-1/+1
* | | | | | Merge "libexif is now libjhead"Marco Nelissen2013-12-191-2/+2
|\ \ \ \ \ \