drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
168,912 Commits 1 Branch 0 Tags
Commit Graph

728 Commits

Author SHA1 Message Date
Dan Albert
582bdf9a59 am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t." 
* commit 'd8c169fedf883491e46b354484909694fd52cfaf':
  Add appropriate casts for char16_t.
 2014-11-20 23:00:56 +00:00
Dan Albert
6698749dd4 Add appropriate casts for char16_t. 
C++11 defines a real char16_t, which is not implicitly convertible to
uint16_t (and by extension jchar). Add casts as needed.

Bug: 18300613
Change-Id: I00752002ef2e938bdb57f70947e8fd53ec103293
 2014-11-20 11:47:40 -08:00
Marco Nelissen
e726680652 am 52e2b6f7: Merge "Update calls to IInterface::asBinder()" 
* commit '52e2b6f79d44ff289c97653edea0548352c2f55b':
  Update calls to IInterface::asBinder()
 2014-11-17 18:24:54 +00:00
Marco Nelissen
97069dd4fd Update calls to IInterface::asBinder() 
to use the new static version.

Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a
 2014-11-17 10:05:31 -08:00
Mike Lockwood
b8cb45fddf am 01816640: am eb205b88: Merge "MTP: Update JNI for new packet getters" into lmp-mr1-dev 
* commit '0181664081db2149aa465332c33c5cb413a4348c':
  MTP: Update JNI for new packet getters
 2014-11-13 18:01:55 +00:00
Mike Lockwood
9c803fa526 MTP: Update JNI for new packet getters 
Bug:18113092
Change-Id: I5d7473af1b57235fbc078c297a309e4a301c9fbd
 2014-11-13 09:40:42 -08:00
Andreas Gampe
cba06c2272 resolved conflicts for merge of 6957369d to lmp-mr1-dev-plus-aosp 
Change-Id: Ie3bd0e24c69c0c7ae500b8eb4a1198650e993a19
 2014-11-10 19:41:52 -08:00
Andreas Gampe
5a15d0d31b Frameworks/base: Wall Werror in media/jni 
Turn on -Wall -Werror in media/jni. Fix warnings.

Change-Id: I9da54ad379d8172ee535b52ee2b0637a2533f4e3
 2014-11-10 18:19:40 -08:00
Dan Stoza
d17793ea2a Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev 2014-11-07 19:44:34 +00:00
Jeff Tinker
fc4e6f70f6 Merge "Add missing secure stop methods" into lmp-mr1-dev 2014-11-06 02:33:23 +00:00
Eric Laurent
b27a8a5bcc AudioEffect JNI: use new max preprocessing constant 
Bug: 18226810.
Change-Id: Ica5677da247268306b34dfce38f25394586817fd
 2014-11-05 12:20:49 -08:00
Dan Stoza
2c34b5e813 Add a BufferItem parameter to onFrameAvailable 
Passes the BufferItem for the queued buffer to the onFrameAvailable
callback so the consumer can track the BufferQueue's contents.

Bug: 18111837
Change-Id: If9d07229c9b586c668e5f99074e9b63b0468feb0
 2014-11-04 11:36:33 -08:00
Jeff Tinker
1b51c72e91 Add missing secure stop methods 
b/18053197
b/18076411

Change-Id: Ide9ecab2fd2021f3544491f23ae84c394c48ac14
 2014-11-03 16:22:04 -08:00
Hochi Huang
35658cc42e am 4a7873f1: [FM]Fix FM App record fail Buganizer ID: 17975676 
* commit '4a7873f19afecb01ef06b0f3dc4dde0a13a17ab3':
  [FM]Fix  FM App record fail Buganizer ID: 17975676
 2014-10-24 03:17:24 +00:00
Hochi Huang
4a7873f19a [FM]Fix FM App record fail Buganizer ID: 17975676 
Signed-off-by: Hochi Huang <hochi.huang@mediatek.com>
    Review: https://partner-android-review.git.corp.google.com/#/c/185235

Change-Id: I024db429b8ff56851c814857691b06ea5e69198a
 2014-10-24 00:47:54 +00:00
Mike Lockwood
63ffd78aaa MtpDatabase: Increase size of string buffer in JNI code 
Fixes problems handling files that have full path length > 255 characters

Bug: 17383223
Change-Id: I2a1ebedee8dd86b3060f14c2d1af636fc9bc95cb
 2014-10-03 17:54:18 +00:00
Ruben Brunk
0c79884076 camera2: Use valid dimensions for RGBA8888 gralloc buffers. 
Bug: 17675571

- All of the mistakes were made.  Unmake them.

Change-Id: I23ff7a553347d4d9588c728219f4bf0604ba2e38
 2014-09-30 13:54:20 -07:00
Ruben Brunk
31798f3318 camera2: Fix native ImageReader test segfaults. 
Bug: 17675571

- Check for JPEG footer in correct location from ImageReader
  when using the RGBA override.
- Add additional error checks in produceFrame method.
- Avoid allocating extra space for jpeg buffers due to
  incorrect width calculations.

Change-Id: I926f37e8b3e5c4bad24c16dcee48d52adb1706dd
 2014-09-26 18:00:21 -07:00
Ruben Brunk
0fd198ad89 camera2: Hide JPEGs in RGBA gralloc buffers. 
Bug: 17379185

- WAR for SW Write usage flags being unavailable on
  certain devices for JPEG (blob) format buffers.

Change-Id: Ic7299785b743f35dd47264b9d1cea01a88b71d91
 2014-09-24 10:43:12 -07:00
Eric Laurent
4fc28d78cb AudioEffect JNI: fix queryEffects() 
Some effects supported by the platform may not be
returned to JAVA layer because not visible by applications.
The size of the array of effect descriptors
returned must be adjusted so that no entry in the array is null.

Bug: 17453177.
Change-Id: I3baaacf24bcb0fa45ce50461a1ac3d6eaa67f4b9
 2014-09-10 15:05:03 -07:00
Jeff Tinker
b00ab012bf Merge "Add support for max-res decode" into lmp-dev 2014-09-09 23:56:11 +00:00
Jeff Tinker
336d3eabc0 Add support for max-res decode 
bug: 16034599
Change-Id: I12124aef03518600a27de45bae24eef9c9735be5
 2014-08-29 01:42:48 +00:00
Jeff Tinker
2979986b57 Fix exception message string formatting in MediaDrm 
bug: 17281760
Change-Id: If527234d2efb1507eca8703027e3cbdd53961b9e
 2014-08-27 11:05:13 -07:00
Lajos Molnar
018b70f5de media: release allocated strings on error 
Bug: 11990470
Change-Id: I74ffbfed8eb322d1b994fff99ed2470358bccf83
 2014-08-12 11:38:23 -07:00
Andy Hung
5f9aa0bcea Update exception handling for MediaCodec 
Throw MediaCodec.CodecException (versus IllegalStateException).
Print out status error codes as found (See MediaError.h for details).
Update error code mapping to CryptoException.

Bug: 12034929
Bug: 13976475
Change-Id: I23b951cb06807413f087c238a1d3526659f06e7b
 2014-08-08 16:15:07 +00:00
Lajos Molnar
cd5e3f95bf media: update to reworked media codec list/info 
Bug: 11990470
Change-Id: I884d656f6a325f7074a89d09601ad19363daa8a0
 2014-08-07 17:27:20 -07:00
Jeff Tinker
6bf5b600d6 Allow device to be unprovisioned 
bug: 12247651
Change-Id: Ie2e77566d2c65925091296da5bcbec327985c946
 2014-08-01 17:16:01 +00:00
Robert Shih
05ad96e9a3 Merge "MediaPlayer: scanInternalSubtitleTracks in synchronous prepare" into lmp-dev 2014-07-28 22:45:16 +00:00
Robert Shih
c42a96dba4 MediaPlayer: scanInternalSubtitleTracks in synchronous prepare 
Bug: 16385674
Change-Id: I56d205ad2fe33bd64ea2251440c88fd4ecfa13ad
 2014-07-29 11:55:46 -07:00
Zhijun He
4c4064fa66 ImageFormat: update raw10 spec to allow row padding 
Change-Id: Id191b92037487f16538d111fc6171d3be9a02acf
 2014-07-28 18:42:10 +00:00
Lajos Molnar
7de28d34f1 Implement MediaCodec.getImage methods 
Bug: 10706245
Change-Id: Icbac5538a27ffdb53d974e2e1f8dc5afe02fb391
 2014-07-25 19:30:23 -07:00
Zhijun He
f7badff8bb CamcorderProfiles: add high speed profile constants 
Change-Id: I8f783466f8c2560820db14488acc1a309d27ab0f
 2014-07-25 23:59:06 +00:00
Jean-Michel Trivi
55a30c41b6 AudioAttributes for SoundPool 
Add support for building a SoundPool instance and specify
 the AudioAttributes.
Remove SRC quality which was never implemented, while leaving
 room for supporting it later through the Builder pattern.
Remove stream types.
Update AudioService's use of SoundPool to the new scheme.

Change-Id: Ie51e4008684e5ba25f9b7368098e4f20266a15c7
 2014-07-20 18:12:00 -07:00
Lajos Molnar
b58dc31322 Extend MediaCodecInfo to describe usable codec limits and features 
Bug: 11990470
Bug: 12065651
Bug: 16131974
Change-Id: I841b8507e823f1ddf14754e34029a9bed4f402d8
 2014-07-19 02:14:00 -07:00
Lajos Molnar
1e6e8018a4 MediaCodec: add reset() + documentation fixes 
Bug: 12034929
Change-Id: I38f89a2e4c41e0ceb3fdae4522b9c04f6c43a4f1
 2014-07-15 18:14:04 -07:00
Lajos Molnar
7be24522ce MediaExtractor: set buffer offset/limit in readSampleData 
also fix setting offset/limit in MediaCodec's getBuffer.

Bug: 13008204
Change-Id: Iadf0f006cfccc2546971cc5384058e1a2721780b
 2014-07-15 02:30:32 +00:00
Eino-Ville Talvala
6a5b1db177 MediaRecorder: Fix crash when given a released Camera object 
Bug: 15617637
Change-Id: I420ecc3f7b946dcf705cf210a7d493290f838f09
 2014-07-14 12:02:21 -07:00
Chong Zhang
94686d13ca MediaCodec: change onError cb to send CodecException 
Bug: 11990118
Change-Id: I8b6112f126c2f473f64e2aad6ffcfbc3f1d6e64a
 2014-07-11 19:42:55 -07:00
Lajos Molnar
d4023114e8 MediaCodec: add new buffer and format APIs 
Bug: 14562236
Bug: 14297827
Bug: 13008204
Bug: 10706245
Bug: 10672559
Bug: 9175531

Change-Id: Ia94d34f625e532619a9ed344eb27e0d26647982f
 2014-07-12 01:43:56 +00:00
Chong Zhang
8d5e556b2b MediaCodec async callbacks 
Bug: 11990118

Change-Id: I210d4302e1fd7e1a48d2228fd3f4f20c16b18a75
 2014-07-11 11:53:03 -07:00
Zhijun He
d1988a98ed Add RAW10 image format 
- Add RAW10 format in ImageFormat
- Add ImageReader support for this format

Bug: 15989722
Change-Id: Ic38ae596d5a472e990389d1fa221a82bea97b715
 2014-07-07 08:01:06 -07:00
Jean-Michel Trivi
8df982dfa5 Java MediaPlayer: add support for setting audio attributes 
Change-Id: Ia638107a5e67c20c46c2f5f1800db9da57d6f698
 2014-07-01 16:45:29 +00:00
Igor Murashkin
5096defdaa camera2: (legacy) Write the JPEG size as part of the blob transport 
This fixes StillCaptureTest#testStillPreviewCombination

Change-Id: Ifbaae7828b2efcc1a768c77ce50718abd7f691d0
 2014-06-24 18:29:18 +00:00
Ruben Brunk
5e6421bd8f Merge "camera2: Switch to using YV12 for ImageReader." 2014-06-20 20:43:34 +00:00
Ruben Brunk
91b9aabc9f camera2: Switch to using YV12 for ImageReader. 
Bug: 15116722

- Also fixes incorrect frame number for single captures.

Change-Id: I8552124d18ad176e6724f089a1e3a3f49a5eeec4
 2014-06-20 15:59:00 -07:00
Jeff Tinker
d712e1a387 Add diagnostic error code to MediaDrm IllegalStateExceptions 
bug: 13976775
Change-Id: I682dd66a79252a9ee030b3cab5deb350e653e933
 2014-06-20 13:41:30 -07:00
Elliott Hughes
f4c6a154e9 am b9525871: am 8525fe8d: am 1a3908e9: Merge "Switch to a type-safe album art interface." 
* commit 'b952587184572070805243e6f8380ceb769f441c':
  Switch to a type-safe album art interface.
 2014-06-12 00:15:38 +00:00
Elliott Hughes
b952587184 am 8525fe8d: am 1a3908e9: Merge "Switch to a type-safe album art interface." 
* commit '8525fe8d0a5a886704307055ef211fc911997783':
  Switch to a type-safe album art interface.
 2014-06-12 00:06:20 +00:00
Elliott Hughes
95d3f86fed Switch to a type-safe album art interface. 
(Requires a matching change in frameworks/av.)

Bug: 15514223
Change-Id: I4e494cc5d7a2eb82cd2b7ae3b829fc663136267a
 2014-06-11 14:43:57 -07:00
Elliott Hughes
f928103269 am ef00c16d: am de1f0023: am 2a1ed46d: Merge "Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt." 
* commit 'ef00c16d62cf2217c44658ad9894810322551d28':
  Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.
 2014-06-09 16:37:31 +00:00