summaryrefslogtreecommitdiffstats
path: root/media/jni
Commit message (Expand)AuthorAgeFilesLines
* GraphicsJNI Canvas cleanupJohn Reck2015-04-221-1/+2
* Merge "Revert "Change how Java Bitmaps are accessed in a few places""John Reck2015-04-201-5/+4
|\
| * Revert "Change how Java Bitmaps are accessed in a few places"John Reck2015-04-201-5/+4
* | Revert "A bunch more cleanups"John Reck2015-04-171-2/+1
* | Merge "Unhide the android.media.[Media]DataSource interface."Chris Watkins2015-04-167-72/+265
|\ \
| * | Unhide the android.media.[Media]DataSource interface.Chris Watkins2015-04-157-72/+265
* | | Merge "MediaSync: pass the error code of setPlaybackRate from native code to ...Wei Jia2015-04-162-6/+18
|\ \ \
| * | | MediaSync: pass the error code of setPlaybackRate from native code to JAVA.Wei Jia2015-04-152-6/+18
* | | | media: add reason to CodecException ctor.Ronghua Wu2015-04-151-2/+19
* | | | Merge "A bunch more cleanups"John Reck2015-04-151-1/+2
|\ \ \ \
| * | | | A bunch more cleanupsJohn Reck2015-04-141-1/+2
| | |/ / | |/| |
* | | | Merge "Revert "media: add new MediaCodec Callback onCodecReleased.""Ronghua Wu2015-04-151-8/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Revert "media: add new MediaCodec Callback onCodecReleased."Ronghua Wu2015-04-141-8/+0
* | | | Merge "media: add CodecCapabilities.getMaxSupportedInstances."Ronghua Wu2015-04-141-0/+25
|\ \ \ \
| * | | | media: add CodecCapabilities.getMaxSupportedInstances.Ronghua Wu2015-04-131-0/+25
| | |/ / | |/| |
* | | | Merge "Change how Java Bitmaps are accessed in a few places"John Reck2015-04-131-4/+5
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Change how Java Bitmaps are accessed in a few placesJohn Reck2015-04-131-4/+5
* | | MediaSync: fix a typo.Wei Jia2015-04-101-1/+1
* | | Merge "MediaSync: add getTimestamp in MediaSync."Wei Jia2015-04-102-0/+58
|\ \ \
| * | | MediaSync: add getTimestamp in MediaSync.Wei Jia2015-04-102-0/+58
* | | | Add a method to associate MediaDrm session with MediaCryptoJeff Tinker2015-04-101-0/+43
* | | | Add expiration update and keys change eventsJeff Tinker2015-04-091-4/+29
| |_|/ |/| |
* | | media: add new MediaCodec Callback onCodecReleased.Ronghua Wu2015-04-091-0/+8
|/ /
* | ImageReader/Writer: implement opaque format operationsZhijun He2015-04-082-104/+409
|/
* MediaSync: add MediaSync JAVA APIWei Jia2015-04-034-1/+346
* Merge "Fix SoundPool track recycling for fast tracks"Andy Hung2015-04-011-5/+9
|\
| * Fix SoundPool track recycling for fast tracksAndy Hung2015-03-301-5/+9
* | Merge "Add RAW12 image format"Yin-Chia Yeh2015-03-311-4/+21
|\ \ | |/ |/|
| * Add RAW12 image formatYin-Chia Yeh2015-03-201-4/+21
* | Remove the ability to disable audio service.John Spurlock2015-03-242-46/+46
* | Report key request message type for unprefixed EMEJeff Tinker2015-03-231-3/+38
* | media: fix build breakZhijun He2015-03-231-1/+1
* | ImageReader/Writer: Add ImageWriter and Opaque ImageReaderZhijun He2015-03-204-1/+1041
|/
* Merge "Revert "Revert "soundpool: update sample rate when reusing audiotrack"""Andy Hung2015-03-171-0/+2
|\
| * Revert "Revert "soundpool: update sample rate when reusing audiotrack""Andy Hung2015-03-171-0/+2
* | Merge "Revert "Revert "soundpool: reuse channel for same sample if available"""Andy Hung2015-03-172-34/+53
|\ \
| * | Revert "Revert "soundpool: reuse channel for same sample if available""Andy Hung2015-03-172-34/+53
* | | am 0d22633e: am 62632e25: Merge "Handle NULL keys and NULL values in MediaDrm...Jeff Tinker2015-03-131-4/+16
|\ \ \
| * \ \ Merge "Handle NULL keys and NULL values in MediaDrm JNI HashMap"Jeff Tinker2015-03-131-4/+16
| |\ \ \
| | * | | Handle NULL keys and NULL values in MediaDrm JNI HashMapDaniel Broms2014-11-241-4/+16
* | | | | Merge "drm: add EVENT_SESSION_RECLAIMED for resource manager."Ronghua Wu2015-03-121-0/+6
|\ \ \ \ \
| * | | | | drm: add EVENT_SESSION_RECLAIMED for resource manager.Ronghua Wu2015-03-041-0/+6
* | | | | | Merge "Revert "soundpool: reuse channel for same sample if available""Glenn Kasten2015-03-102-53/+34
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Revert "soundpool: reuse channel for same sample if available"Glenn Kasten2015-03-092-53/+34
| | |_|_|/ | |/| | |
* | | | | Merge "Revert "soundpool: update sample rate when reusing audiotrack""Glenn Kasten2015-03-101-2/+0
|\ \ \ \ \ | |/ / / /
| * | | | Revert "soundpool: update sample rate when reusing audiotrack"Glenn Kasten2015-03-091-2/+0
* | | | | Merge "Fix SoundPool playback of multichannel files."Andy Hung2015-03-102-5/+7
|\ \ \ \ \
| * | | | | Fix SoundPool playback of multichannel files.Andy Hung2015-03-062-5/+7
* | | | | | Add DEPTH image formats, support in ImageReaderEino-Ville Talvala2015-03-091-34/+32
| |/ / / / |/| | | |
* | | | | Merge "media: update AMessage to use handler instead of handler-id"Lajos Molnar2015-03-061-1/+1
|\ \ \ \ \