Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code" | Narayan Kamath | 2014-02-11 | 1 | -2/+2 | |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | ||||||
| | * | | | | Fix in MediaMuxer's JNI code | Ashok Bhat | 2014-02-07 | 1 | -2/+2 | |
* | | | | | | Merge "Remove no longer needed http proxy handling code, it's obsolete now" | Andreas Huber | 2014-02-06 | 2 | -114/+0 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Remove no longer needed http proxy handling code, it's obsolete now | Andreas Huber | 2014-02-05 | 2 | -114/+0 | |
* | | | | | | | Merge "MediaRecorderTest: add tests for getSurface() and SURFACE source" | Chong Zhang | 2014-02-06 | 3 | -23/+250 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | MediaRecorderTest: add tests for getSurface() and SURFACE source | Chong Zhang | 2014-01-16 | 3 | -23/+250 | |
* | | | | | | | | Merge "android_media_MediaMuxer_setLocation: amended signature." | Robert Shih | 2014-02-05 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | android_media_MediaMuxer_setLocation: amended signature. | Robert Shih | 2014-02-05 | 1 | -1/+1 | |
* | | | | | | | | Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made avail... | Andreas Huber | 2014-02-05 | 15 | -21/+703 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to... | Andreas Huber | 2014-02-04 | 15 | -21/+703 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Cache media/nomedia paths | Marco Nelissen | 2014-02-04 | 1 | -16/+50 | |
|/ / / / / / / | ||||||
* | | | | | | | am 4f840dd1: am 5901ddeb: am 0a1b64fe: Merge "Release locked buffer when it f... | Zhijun He | 2014-01-31 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | am 5901ddeb: am 0a1b64fe: Merge "Release locked buffer when it fails to acqui... | Zhijun He | 2014-01-31 | 1 | -0/+1 | |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| / / / | | |_|/ / / | |/| | | | | ||||||
| | * | | | | Merge "Release locked buffer when it fails to acquire graphics buffer" | Zhijun He | 2014-01-30 | 1 | -0/+1 | |
| | |\ \ \ \ | ||||||
| | | * | | | | Release locked buffer when it fails to acquire graphics buffer | lina.x.pi | 2014-01-28 | 1 | -0/+1 | |
| * | | | | | | am aa9ba887: am 6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compat... | Narayan Kamath | 2014-01-28 | 1 | -2/+2 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | AArch64: Make graphics classes 64-bit compatible | Ashok Bhat | 2014-01-28 | 1 | -2/+2 | |
| | |/ / / / | ||||||
* | | | | | | Merge "Fix invocation of notification callback in case the callback is modified" | Andreas Huber | 2014-01-28 | 1 | -3/+4 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix invocation of notification callback in case the callback is modified | Andreas Huber | 2014-01-27 | 1 | -3/+4 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | AArch64: Make graphics classes 64-bit compatible | Ashok Bhat | 2014-01-28 | 1 | -2/+2 | |
|/ / / / / | ||||||
* | | | | | API that allows usage of MediaCodec APIs without polling. | Andreas Huber | 2014-01-27 | 3 | -13/+199 | |
* | | | | | Revert "AArch64: Make graphics classes 64-bit compatible" | Narayan Kamath | 2014-01-27 | 1 | -2/+2 | |
* | | | | | AArch64: Make graphics classes 64-bit compatible | Ashok Bhat | 2014-01-27 | 1 | -2/+2 | |
* | | | | | Merge "Check that the exif bits are actually there" | Marco Nelissen | 2014-01-22 | 1 | -2/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Check that the exif bits are actually there | Marco Nelissen | 2014-01-22 | 1 | -2/+2 | |
* | | | | | | Merge "Add "throws IOException" to MediaCodec factory methods" | Andy Hung | 2014-01-21 | 1 | -6/+27 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Add "throws IOException" to MediaCodec factory methods | Andy Hung | 2014-01-16 | 1 | -6/+27 | |
* | | | | | | Resolved conflicts for merge of 28c6ec02 to master | Narayan Kamath | 2014-01-16 | 24 | -153/+157 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| * | | | | | am bc0468e6: am 6f17adba: Merge "AArch64: Use long for pointers in media clas... | Narayan Kamath | 2014-01-16 | 24 | -153/+157 | |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | ||||||
| | * | | | | AArch64: Use long for pointers in media classes | Ashok Bhat | 2014-01-15 | 24 | -153/+157 | |
* | | | | | | Merge "Remove calls to deprecated SkBitmap::setIsOpaque()" | Leon Scroggins III | 2014-01-15 | 1 | -2/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Remove calls to deprecated SkBitmap::setIsOpaque() | Leon Scroggins III | 2014-01-15 | 1 | -2/+2 | |
* | | | | | | | Merge "Unhide android.media.AudioTrack.setVolume(float)" | Glenn Kasten | 2014-01-15 | 1 | -2/+6 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Unhide android.media.AudioTrack.setVolume(float) | Glenn Kasten | 2014-01-14 | 1 | -2/+6 | |
* | | | | | | | Merge "Use AUDIO_SESSION_ALLOCATE instead of hard-coded 0" | Glenn Kasten | 2014-01-15 | 3 | -4/+7 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | ||||||
| * | | | | | | Use AUDIO_SESSION_ALLOCATE instead of hard-coded 0 | Glenn Kasten | 2013-06-26 | 3 | -4/+7 | |
* | | | | | | | am 28f032e6: am e2c046fe: am 13249411: am a9045d24: am 337aa376: Merge "Add N... | Marco Nelissen | 2014-01-14 | 1 | -8/+11 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | | | ||||||
| * | | | | | am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig" | Marco Nelissen | 2014-01-14 | 1 | -8/+11 | |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | ||||||
| | * | | | | Merge "Add NULL check in updateProxyConfig" | Marco Nelissen | 2014-01-14 | 1 | -8/+11 | |
| | |\ \ \ \ | ||||||
| | | * | | | | Add NULL check in updateProxyConfig | Oscar Rydhé | 2013-12-19 | 1 | -8/+11 | |
* | | | | | | | Merge "Prepare for additional formats beyond 8-bit and 16-bit PCM" | Glenn Kasten | 2014-01-13 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Prepare for additional formats beyond 8-bit and 16-bit PCM | Glenn Kasten | 2014-01-10 | 1 | -1/+2 | |
* | | | | | | | | libjhead_jni is still needed | Marco Nelissen | 2014-01-13 | 1 | -0/+3 | |
| |_|_|_|_|/ / |/| | | | | | | ||||||
* | | | | | | | Merge "setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" | Zhihai Xu | 2014-01-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager | Zhihai Xu | 2014-01-10 | 1 | -1/+1 | |
* | | | | | | | | am bb0a4f20: am 1ae17633: am 411350dd: am 739ae9b3: am 868173a5: Merge "Fix a... | Jason Sams | 2014-01-11 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | ||||||
| * | | | | | | | am 739ae9b3: am 868173a5: Merge "Fix a JNI local reference leak in MediaDrm" | Jason Sams | 2014-01-10 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | ||||||
| | * | | | | | | Merge "Fix a JNI local reference leak in MediaDrm" | Jason Sams | 2014-01-11 | 1 | -0/+1 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | Fix a JNI local reference leak in MediaDrm | Patrik2 Carlsson | 2013-12-19 | 1 | -0/+1 | |
| | | | |_|/ / / | | | |/| | | | | ||||||
* | | | | | | | | Make MtpDatabase use libexif instead of libjhead | Marco Nelissen | 2014-01-10 | 2 | -37/+46 | |
| |_|_|_|/ / / |/| | | | | | |