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

699 Commits

Author SHA1 Message Date
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
Elliott Hughes
ef00c16d62 am de1f0023: am 2a1ed46d: Merge "Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt." 
* commit 'de1f00231f23937de41e671be987475fbdf9afc9':
  Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.
 2014-06-09 16:33:39 +00:00
Elliott Hughes
e0f2fa33d7 Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt. 
Change-Id: I1acb4d5df71daa47ea87813db3941fd3c676cfb5
 2014-06-09 09:22:58 -07:00
Elliott Hughes
2432912b35 resolved conflicts for merge of f8272896 to master 
Change-Id: I34a156bceb5dacd90c399c56c6f07d2a8e5c0c85
 2014-06-05 11:35:53 -07:00
Elliott Hughes
f827289668 am bd1949a4: am b2842e72: Merge "[LP64] Fix access to MediaAlbumArt." 
* commit 'bd1949a4fbd6eb61e7a0a0f81d654a8df50999bf':
  [LP64] Fix access to MediaAlbumArt.
 2014-06-05 18:29:24 +00:00
Elliott Hughes
9fa803be10 [LP64] Fix access to MediaAlbumArt. 
The mSize field is a uint32_t, not a long.

Change-Id: Id3b9e6049e8998840d33fa886b676db2a8022064
 2014-06-05 10:38:30 -07:00
Mike Lockwood
9dc96cf0fc am a0183b02: am 8868d129: am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE." 
* commit 'a0183b02e4c6f53587519b445a546192b4a20146':
  MtpDatabase JNI: Fixed incorrect method name in ALOGE.
 2014-06-02 18:32:26 +00:00
Mike Lockwood
307a37c2af am 1ac54ec6: am 750e78bb: am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()." 
* commit '1ac54ec69bfcda2638b05c7daa4300ec5749e7b8':
  MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().
 2014-06-02 18:32:20 +00:00
Mike Lockwood
a0183b02e4 am 8868d129: am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE." 
* commit '8868d1290afd96997fef671f4a7a4c7bbf94fa1a':
  MtpDatabase JNI: Fixed incorrect method name in ALOGE.
 2014-06-02 18:28:51 +00:00
Mike Lockwood
1ac54ec69b am 750e78bb: am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()." 
* commit '750e78bb7626e2e0d5c8feed4a6e4fbe7fe9b5da':
  MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().
 2014-06-02 18:28:42 +00:00
Mike Lockwood
8868d1290a am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE." 
* commit '1c725866da02c3e1f62fb416ea3450caed406f2a':
  MtpDatabase JNI: Fixed incorrect method name in ALOGE.
 2014-06-02 18:25:35 +00:00
Mike Lockwood
750e78bb76 am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()." 
* commit '27eb205e21e7715764084085f382d690e0406c63':
  MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().
 2014-06-02 18:25:28 +00:00
Martin Blumenstingl
986b46d179 MtpDatabase JNI: Fixed incorrect method name in ALOGE. 
Change-Id: I46688cf79f1e7554b28162df2347c4dcb571b8a9
 2014-05-31 16:17:11 +02:00
Martin Blumenstingl
17a24c58bb MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue(). 
The jstring "stringValue" was not never freed.
In the case where "str" was NULL the whole cleanup part (see "goto out")
was even skipped.
This patch makes getObjectPropertyValue() behave like
getObjectPropertyList().

Change-Id: I5a7ec3611036f5253a054b00064999bcd1d1c29e
 2014-05-31 16:17:11 +02:00
Robert Shih
a037bcebfa am a034dac7: android_media_MediaMuxer_setLocation: amended signature. 
* commit 'a034dac7be0658e59c73a880e958cab3c723323b':
  android_media_MediaMuxer_setLocation: amended signature.
 2014-05-30 18:05:35 +00:00
Robert Shih
a034dac7be android_media_MediaMuxer_setLocation: amended signature. 
Change parameter `nativeObject` from type `jint` to `jlong` to match its JNI
signature.

Bug: 15337287
Bug: 12890910
Change-Id: I7feb7fa5c3eccc07f2d1bc733b7d4b3a3b52e292
(cherry picked from commit 3cb78498d3f664f541ba7d28f4543cf8c12733f1)
 2014-05-30 14:56:55 +00:00
Ruben Brunk
b6079005ed camera2: Move DngCreator to hardware/camera2. 
Bug: 15091253
Change-Id: Ibe2ee376436e5c796e33c0b782ea68278589f2e6
 2014-05-22 22:57:11 +00:00
Ruben Brunk
feb50af361 camera2: Add HAL1 compatibility shim skeleton. 
This adds basic support for running the Camera2 API on a device running
a camera HAL version lower than CAMERA_MODULE_API_VERSION_2_0.

This CL includes support for:
- N-way preview output streams
- N-way jpeg output streams
- CameraDevice emulation at the binder interface
- Basic camera metadata querying in the CameraManager

Bug: 15117269
Bug: 15116722

Change-Id: I8322955034c91f34bb348d4b28c2b774dbef38f6
 2014-05-21 16:37:59 -07:00
Andy Hung
b5eb843e4b Merge "Fix 64 bit long pointer size for media scanning" 2014-05-20 17:36:11 +00:00
Andy Hung
989540264a Fix 64 bit long pointer size for media scanning 
Bug: 14993718
Change-Id: I98989caddcca67c2b3257cead948382fddb066da
 2014-05-19 21:18:18 -07:00
Ruben Brunk
f967a5486a camera2: Plumb DngCreator to native library. 
Change-Id: Ic58bf6cf5086808b503460ef8e451fc0d6f1f850
 2014-05-16 23:25:51 -07:00
Lajos Molnar
7c513b6bef Added MediaCodec.releaseOutputBuffer() method with render timestamp 
Bug: 11784827
Change-Id: I67097c8e69b40ef3baa436f0e7731d28c696735c
 2014-05-09 20:43:30 +00:00
Ying Wang
29894c6176 am db55bb06: am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS." 
* commit 'db55bb0622e9fbe4b858d59409f516de01c1f1fd':
  Remove unused LOCAL_LDLIBS.
 2014-05-08 18:31:18 +00:00
Ying Wang
db55bb0622 am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS." 
* commit '4463cbc61d0947eccb67a52f60661a92d0cad508':
  Remove unused LOCAL_LDLIBS.
 2014-05-08 00:27:09 +00:00
Ying Wang
4463cbc61d am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS." 
* commit '3b9600b673ad6a83481dcf88db6c9b2dc5bc9ba3':
  Remove unused LOCAL_LDLIBS.
 2014-05-08 00:21:38 +00:00
Ying Wang
b38e3fdf5a Remove unused LOCAL_LDLIBS. 
Change-Id: I01346e76f4ac6402af0ef33e3b2eef4a69e704a2
 2014-05-07 15:23:37 -07:00
Selim Gurun
5ba69bef8c Fix build 
Fix the java reflection to have the devices boot again.

Change-Id: Ibd24b1e43e5c8385aa9372f8e22133b6eb85cd2b
 2014-05-07 15:04:40 -07:00
Marco Nelissen
ae84e20b2a am 4375e848: am ab962b54: am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash." 
* commit '4375e84882a9a84b0012cf9504a30ede6ef72c1f':
  MetadataRetriever: Check null pointer to avoid tombstone crash.
 2014-05-01 15:35:31 +00:00
Marco Nelissen
4375e84882 am ab962b54: am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash." 
* commit 'ab962b54e3eac4ffadb5ea4e4948df10e6201468':
  MetadataRetriever: Check null pointer to avoid tombstone crash.
 2014-05-01 15:32:17 +00:00
Marco Nelissen
ab962b54e3 am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash." 
* commit 'ab3977d21161815c130bdedf21e2571382d208da':
  MetadataRetriever: Check null pointer to avoid tombstone crash.
 2014-05-01 15:28:14 +00:00