summaryrefslogtreecommitdiffstats
path: root/media/jni
Commit message (Collapse)AuthorAgeFilesLines
* Merge "media: add CodecCapabilities.getMaxSupportedInstances."Ronghua Wu2015-04-141-0/+25
|\
| * media: add CodecCapabilities.getMaxSupportedInstances.Ronghua Wu2015-04-131-0/+25
| | | | | | | | | | Bug: 19620911 Change-Id: I11a55121490eba5027498a27c7719133acd1a39a
* | 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
| | | | | | | | | | | | | | | | | | | | Stop assuming that a Java Bitmap has a SkBitmap* that has some externally managed lifecycle, and instead switch a bunch of users to accessing the bitmap by providing their own SkBitmap* on which to set the (ref counted!) SkPixelRef* instead Change-Id: I0fd9e193968b41e5597784140d56b4885906864a
* | MediaSync: fix a typo.Wei Jia2015-04-101-1/+1
| | | | | | | | | | Bug: 19666434 Change-Id: I31e959f49d2539e11a9f23f9f9d7eb785ec08512
* | Merge "MediaSync: add getTimestamp in MediaSync."Wei Jia2015-04-102-0/+58
|\ \
| * | MediaSync: add getTimestamp in MediaSync.Wei Jia2015-04-102-0/+58
| | | | | | | | | | | | | | | Bug: 19666434 Change-Id: Ieae70b13864e3eb5abae3577f209f4b926418731
* | | Add a method to associate MediaDrm session with MediaCryptoJeff Tinker2015-04-101-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, to associate a MediaDrm session with MediaCrypto, the MediaDrm sessionId was passed as initData to the MediaCrypto constructor. This is not ideal for two reasons: it's pretty obscure and you can't change the association without tearing down the MediaCodec/MediaCrypto and starting all over. Use cases like key rotation require being able to update the MediaDrm session post-construction. This CL addresses both of these issues. bug: 19570317 Change-Id: Ie3d3eda16651b598cdd41f2180074a43cb6c0884
* | | Add expiration update and keys change eventsJeff Tinker2015-04-091-4/+29
| | | | | | | | | | | | | | | | | | | | | | | | In support of unprefixed EME bug: 19771612 bug: 19771431 Change-Id: Iddef695cfa1a56363a4c173249597e415cb93f50
* | | media: add new MediaCodec Callback onCodecReleased.Ronghua Wu2015-04-091-0/+8
|/ / | | | | | | | | Bug: 19620911 Change-Id: I2912c570678861daf1516757dda2160ffddcfa8d
* | ImageReader/Writer: implement opaque format operationsZhijun He2015-04-082-104/+409
|/ | | | | | | Implement attach/detach for image reader and writer. Bug: 19872821 Change-Id: Ib45a054c6be0b56b370fa8d709b47b0298ba5ea7
* MediaSync: add MediaSync JAVA APIWei Jia2015-04-034-1/+346
| | | | | Bug: 19666434 Change-Id: Iab6941f6d81cb95a3b86be14b239287acb0d0eee
* 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
| | | | | | | | | | Bug: 19970735 Change-Id: I075d04a688383139484f24ba4be2829c5220c57e
* | Merge "Add RAW12 image format"Yin-Chia Yeh2015-03-311-4/+21
|\ \ | |/ |/|
| * Add RAW12 image formatYin-Chia Yeh2015-03-201-4/+21
| | | | | | | | Change-Id: I1c528ecf62746aa96d6e132eaa874015d9d7c446
* | Remove the ability to disable audio service.John Spurlock2015-03-242-46/+46
| | | | | | | | | | | | | | | | | | Running in a configuration without audio service is not fully tested. Remove the configuration option for now. Also remove unused delegation layer in SoundPool. Bug: 19891112 Change-Id: I47be0e32d54b8ef8fa25cf47b85eacf8a4969500
* | Report key request message type for unprefixed EMEJeff Tinker2015-03-231-3/+38
| | | | | | | | | | bug: 19771299 Change-Id: If76fa2988ca45632d0afff601c12f8f5f9908ed1
* | media: fix build breakZhijun He2015-03-231-1/+1
| | | | | | | | | | | | clang/llvm complains the timestamp print formating. Change-Id: Ie4bff9cbec90994709097d087d1c1f2a7d1465cf
* | ImageReader/Writer: Add ImageWriter and Opaque ImageReaderZhijun He2015-03-204-1/+1041
|/ | | | | | | | | | | ImageWriter/Reader API change, including below changes * Interface for Opaque ImageReader * ImageWriter Interface and implementation * Image class minor update to support ImageWriter opaque ImageReader detach/attach interface are defined but yet to be implemented. Change-Id: Ic7c0d2df73c80b1a81a7316d8c4556bf7703c309
* 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
| | | | | | | | | | | | This reverts commit b801f73343194cd081f675a5dc2b3e90959cf6d1. Change-Id: I0f6ee7fc981d65040f32e7852a5f66fd391b329d
* | 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
| | | | | | | | | | | | | | | | | | This reverts commit 18c225d05480e7b80b312ef90d15789b34ce6bbc. Change-Id: If91b4b0fb94df1d910cbaa0a7944001b2baa7be3
* | | am 0d22633e: am 62632e25: Merge "Handle NULL keys and NULL values in ↵Jeff Tinker2015-03-131-4/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | MediaDrm JNI HashMap" * commit '0d22633e07a6911403383a22bb3164f53b4f4409': Handle NULL keys and NULL values in MediaDrm JNI HashMap
| * \ \ 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If getKeyRequest() of MediaDrm was called with a HashMap containing NULL keys or NULL values then the mediaserver crashed. This modification adds NULL checks and throw IllegalArgumentException as expected. Change-Id: Ide82efe0f6bd28c8ac3f9aa048d9794f2ccc8fac
* | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19265536 Change-Id: Ifa15a4c7d3a7c20cb00bd4aefb57d239c0efaafa
* | | | | | 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
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 570576b51b8123ab05b36707ec752cf966292ca5. Bug: 19635137 Change-Id: I8385ac4c151a375c19c3606698081c947b6216e3
* | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a7d57a6f0068b1e2a0f07ca427cfba198b12a9b9. Bug: 19635137 Change-Id: I1f53a432936dd3d51459e7d8cd86421bde399150
* | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17188507 Change-Id: Ia4e43c7f8889181b998673b75b1f3bbf8c43f429
* | | | | | Add DEPTH image formats, support in ImageReaderEino-Ville Talvala2015-03-091-34/+32
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add an explicit mapping between public ImageFormat/ PixelFormat enums and internal HAL format/dataspace. - Add DEPTH16 and DEPTH_POINT_CLOUD formats - Wire up mapping layer to ImageReader to support depth formats Change-Id: I8197eccef900cc91baddcfcb934ccd4d8c972eff
* | | | | Merge "media: update AMessage to use handler instead of handler-id"Lajos Molnar2015-03-061-1/+1
|\ \ \ \ \
| * | | | | media: update AMessage to use handler instead of handler-idLajos Molnar2015-03-041-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 19607784 Change-Id: Ia18746830816bcade510e5137bf8ce6258181ac0
* | | | | Cleanup Bitmap JNI attempt #2John Reck2015-03-051-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original version missed a spot This reverts commit c02977e3bbfaaedcb1b1d67e1692becc7dddd59b. Change-Id: I56244ce10d709fcdef42a001fe4c6ba7b6bbb04d
* | | | | Merge "Revert "Cleanup Bitmap JNI""Chad Jones2015-03-051-1/+7
|\ \ \ \ \
| * | | | | Revert "Cleanup Bitmap JNI"Chad Jones2015-03-051-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b2915245b74b3b5541b123e38403f8e26426b4b7. Change-Id: Idd7d7f33eec4ea5024c83de6b10d3d1a6ab2b17a
* | | | | | Merge "Cleanup Bitmap JNI"John Reck2015-03-051-7/+1
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | |
| * | | | Cleanup Bitmap JNIJohn Reck2015-03-051-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a bunch of places where mNativeBitmap was being poked at directly, switch them either to the NDK API or to GraphicsJNI where it made sense Change-Id: I6b3df3712d6497cba828c2d3012e725cb4ebb64d
* | | | | soundpool: update sample rate when reusing audiotrackDhananjay Kumar2015-03-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | User might update playback rate while calling Play on a sample. Update sample rate if reusing existing audio track. Change-Id: I7007c335fa405baf663a322408b92b9df53efdb0 Signed-off-by: Glenn Kasten <gkasten@google.com>
* | | | | soundpool: reuse channel for same sample if availableHaynes Mathew George2015-03-042-34/+53
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reuse channel for same sample if the channel completed current playback and is not reallocated to another sample, i.e. not stolen by other sample. authored-by: Ashish Jain <ashishj@codeaurora.org> Change-Id: Ibe7ee318c7dc11f3c4fd3a2f57d861318b10973b Signed-off-by: Glenn Kasten <gkasten@google.com>
* | | | MediaPlayer: add setPlaybackRate JAVA API.Wei Jia2015-03-031-0/+13
| | | | | | | | | | | | | | | | | | | | Bug: 19196501 Change-Id: I43daced7d9b53bcaca4e6a8d81ca729b32efc79f
* | | | ImageReader: Switch to RAW16 from RAW_SENSOREino-Ville Talvala2015-02-191-3/+3
|/ / / | | | | | | | | | Change-Id: I6362a997b0895686f988896de0463d834354f238
* | | am 6da3cc59: am 396f131d: Merge "Fix memory leak"Marco Nelissen2015-02-111-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: fb14e77 * commit 'fb14e77f45fbad139a0b0c9278bd003964b8f987': Fix memory leak
| * | am 6da3cc59: am 396f131d: Merge "Fix memory leak"Marco Nelissen2015-02-111-0/+1
| |\ \ | | | | | | | | | | | | | | | | * commit '6da3cc59a0e77e723a8413d2443b0f1bc5821b03': Fix memory leak
| | * | Fix memory leakMarco Nelissen2015-02-101-0/+1
| | | | | | | | | | | | | | | | Change-Id: Id691f9b32f9daeb23a01b17c5418b4d74a294cda
generated by cgit v1.1 at 2025-02-13 23:08:06 +0000