7686 Commits

Author SHA1 Message Date
Marco Nelissen
13249411b1 am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig"
* commit 'a9045d24a73faa6aa1e8ad204a1e14a53711a824':
  Add NULL check in updateProxyConfig
2014-01-14 08:15:13 -08:00
Marco Nelissen
337aa376c0 Merge "Add NULL check in updateProxyConfig" 2014-01-14 16:08:18 +00:00
Glenn Kasten
f634bc0ff5 Merge "Prepare for additional formats beyond 8-bit and 16-bit PCM" 2014-01-13 19:25:58 +00:00
Marco Nelissen
92351c5886 libjhead_jni is still needed
protip: do not remove things from makefiles just because it builds without them
b/12528751

Change-Id: I3ef8dcdf638e8b59d309922bb972c893fc75a712
2014-01-13 10:19:17 -08:00
Zhihai Xu
93899a5972 Merge "setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" 2014-01-11 01:11:45 +00:00
Jason Sams
08af2ca38a am bb0a4f20: am 1ae17633: am 411350dd: am 739ae9b3: am 868173a5: Merge "Fix a JNI local reference leak in MediaDrm"
* commit 'bb0a4f20502c27a920b7d874c9a17c178afee5f9':
  Fix a JNI local reference leak in MediaDrm
2014-01-11 01:00:57 +00:00
Jason Sams
411350dd23 am 739ae9b3: am 868173a5: Merge "Fix a JNI local reference leak in MediaDrm"
* commit '739ae9b3b77458b4c77f799cba56dc68d65ab424':
  Fix a JNI local reference leak in MediaDrm
2014-01-10 16:50:54 -08:00
Zhihai Xu
2f4a2b139b setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager
setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager.
It cause maximize volume in Bluetooth speaker/device.
The volume expected by Bluetooth Avrcp should be from 0 to 15.
But the current volume parameter passed to Bluetooth Avrcp is from 0 to 150.
It is scaled by 10 times than the correct volume.
index = rescaleIndex(index * 10, streamType, streamTypeAlias);
Should divide the volume by 10 before pass to Bluetooth Avrcp.

bug:12495379
Change-Id: I0432f83ca4a0c134244d96b2eea14d7168e9a9ff
2014-01-10 16:44:39 -08:00
Jason Sams
868173a53f Merge "Fix a JNI local reference leak in MediaDrm" 2014-01-11 00:42:20 +00:00
Glenn Kasten
fe834d30f4 Prepare for additional formats beyond 8-bit and 16-bit PCM
This CL does the same thing for AudioTrack,
that an earlier CL did for AudioRecord:
  > Change-Id: Ic3525f049e939bdf125d9f87ed39abd2690dcf9f

Pull out the common parts of that earlier CL and move them to new header
file android_media_AudioFormat.h.

Use the new function audioFormatToNative() to convert from Java
ENCODING_PCM_* to native AUDIO_FORMAT_*.

Use audio_bytes_per_sample() instead of hard-coding the size of various formats.

Use size_t for memory sizes.

Change-Id: I7992dd6a2c9500126a6d7ae5fc1ed9f3312962d6
2014-01-10 10:50:22 -08:00
Marco Nelissen
3cd393c505 Make MtpDatabase use libexif instead of libjhead
b/12203995

Change-Id: I0e0e6209be7a9d3e493abdcee8619cae6d4b9501
2014-01-10 10:39:27 -08:00
Narayan Kamath
c975437ef3 am 1e3395c7: am 105b545e: am 0dce19ca: am 79ceb53a: am c58abeea: Merge "AArch64: Use long for pointers in MTP classes"
* commit '1e3395c7378a7dd293a2e8a8ac8fbf239adbad0c':
  AArch64: Use long for pointers in MTP classes
2014-01-07 13:10:19 +00:00
Narayan Kamath
819f2e1234 am 510616d2: am bec733af: am 23ebc24e: am 08467c57: am 9bc6acf2: Merge "AArch64: Use long for pointers in VideoEditor classes"
* commit '510616d215372e59e5e8c39b8de1125fc5b54c60':
  AArch64: Use long for pointers in VideoEditor classes
2014-01-07 13:10:14 +00:00
Narayan Kamath
e434ddd042 am 113e83e6: am 58cb0f0c: am bfbe585e: am c0c92f20: am 357ea905: Merge "AArch64: Use long for pointers in audio effect classes"
* commit '113e83e6f538ea217c167c6d8e11b28042ff2c53':
  AArch64: Use long for pointers in audio effect classes
2014-01-07 13:10:03 +00:00
Narayan Kamath
ac8bd534dd am 99aec6b5: am 40b0aaa9: am 568cde55: am 80cff944: am 74675f29: Merge "AArch64: Use long for pointers in AmrInputStream"
* commit '99aec6b5d1cb73a3f5b57badc53e6f56b2a53c4d':
  AArch64: Use long for pointers in AmrInputStream
2014-01-07 13:09:57 +00:00
Narayan Kamath
0dce19caf8 am 79ceb53a: am c58abeea: Merge "AArch64: Use long for pointers in MTP classes"
* commit '79ceb53ae5b867a954476e3f6499f89664fbc669':
  AArch64: Use long for pointers in MTP classes
2014-01-07 05:01:13 -08:00
Narayan Kamath
23ebc24eee am 08467c57: am 9bc6acf2: Merge "AArch64: Use long for pointers in VideoEditor classes"
* commit '08467c5727c04c1fef40ff1e361628944275ef28':
  AArch64: Use long for pointers in VideoEditor classes
2014-01-07 05:01:08 -08:00
Narayan Kamath
bfbe585ed4 am c0c92f20: am 357ea905: Merge "AArch64: Use long for pointers in audio effect classes"
* commit 'c0c92f206eddb6fb319bd11929c1703daf17248f':
  AArch64: Use long for pointers in audio effect classes
2014-01-07 05:00:58 -08:00
Narayan Kamath
568cde557a am 80cff944: am 74675f29: Merge "AArch64: Use long for pointers in AmrInputStream"
* commit '80cff94478a39914012df816179ea57c53040903':
  AArch64: Use long for pointers in AmrInputStream
2014-01-07 05:00:53 -08:00
Ashok Bhat
e2e59326f1 AArch64: Use long for pointers in MTP classes
For storing pointers, long is used in MTP classes,
as native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: I67805547251722e7b77611d47d0bb632a64d3e6d
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-01-07 12:52:57 +00:00
Ashok Bhat
44ba5c1b4e AArch64: Use long for pointers in VideoEditor classes
For storing pointers, long is used in VideoEditor
classes, as native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: Ifff3a28f2ab6774ee89d31770ad63451c8726431
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-01-07 12:49:41 +00:00
Ashok Bhat
ea7861c918 AArch64: Use long for pointers in audio effect classes
For storing pointers, long is used in AudioEffect
and Visualizer classes, as native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: Ief49bbe5baef663e268c7f6d70ac33a4df45621c
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-01-07 12:47:51 +00:00
Ashok Bhat
b348c3fd87 AArch64: Use long for pointers in AmrInputStream
For storing pointers, long is used in AmrInputStream
class, as native pointers can be 64-bit.

Change-Id: I78fff3eb54fc7101746b0d693cbc4e923c2bad08
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-01-07 12:44:38 +00:00
Jean-Michel Trivi
a144b121b2 Merge "Fix RemoteController synchronization mode" 2014-01-06 22:46:43 +00:00
Chong Zhang
83cc994ba4 MediaRecorder: add getSurface() api and SURFACE video source
Bug: 12305192
Change-Id: If833c5ac8a738ffa284307e0435b5cbd1b7379b1
2014-01-06 10:42:51 -08:00
Jean-Michel Trivi
b3ae913115 Fix RemoteController synchronization mode
Fix erroneous argument check in RemoteController syncrhonization
  mode setter..

Bug 12189375

Change-Id: Ib446a21f36c6e0e97752336b22aff0feb651f215
2014-01-02 23:13:48 +00:00
Zhijun He
934349e8ad ExifInterface: fix class load failure
libexif_jni was renamed as libjhead_jni

Change-Id: I0ceff1ad288c7ce2255826d5d5ba9ca1f121a556
2013-12-20 13:28:00 -08:00
Marco Nelissen
e754e7880a Merge "libexif is now libjhead" 2013-12-19 23:36:10 +00:00
Marco Nelissen
7f6abf84ab libexif is now libjhead
Change-Id: I6b749e251a2e03738550ce911e59527f80d26212
2013-12-19 14:21:19 -08:00
Narayan Kamath
8907644bb6 am ad1ff472: am 7bbc79fd: am 91f6aaaf: am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int."
* commit 'ad1ff47213e1b3a34a2b9e5a189742e9a15ed486':
  MediaDrm#mNativeContext is a long, not int.
2013-12-19 13:14:17 +00:00
Narayan Kamath
91f6aaaf2c am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int."
* commit '2d2d594308693af79bf5c44f0dcc30f29d2dc31a':
  MediaDrm#mNativeContext is a long, not int.
2013-12-19 05:01:34 -08:00
Narayan Kamath
f3172c623e Merge "MediaDrm#mNativeContext is a long, not int." 2013-12-19 12:35:24 +00:00
Patrik2 Carlsson
265551a164 Fix a JNI local reference leak in MediaDrm
A reference leak was found in the subtitle usecase that also
applies to android_media_MediaDrm.cpp
(Code taken from the similar fix in android_media_MediaPlayer.cpp)

Change-Id: Icc4b25e4adc9a600ff4ac99a7a8478bb55a6e348
2013-12-19 10:59:42 +09:00
Oscar Rydhé
e795ec73eb Add NULL check in updateProxyConfig
If the exclusionList was null in updateProxyConfig the VM would
crash when converting it to a UTF8 string. Avoid this by adding a
null check.

Change-Id: I0d8106fd54385bd9ae9c652a6c67d459a119cf2b
2013-12-19 09:38:59 +09:00
Narayan Kamath
94ee2f502e am 52ba48a8: am f08b83be: am 4dd5c377: am be8fbb8f: Merge "Remove unused field from MediaMuxer"
* commit '52ba48a85049a2a782c3e4c23d64577253f888eb':
  Remove unused field from MediaMuxer
2013-12-18 18:25:33 +00:00
Narayan Kamath
4dd5c37711 am be8fbb8f: Merge "Remove unused field from MediaMuxer"
* commit 'be8fbb8fb63fddac2310dfbafa2594ed165b16b1':
  Remove unused field from MediaMuxer
2013-12-18 10:14:45 -08:00
Narayan Kamath
535daa191b Remove unused field from MediaMuxer
Change-Id: If1ebb2302654b64924084a52425366f1b69c7c30
2013-12-18 17:58:11 +00:00
Narayan Kamath
f11dd63e0c MediaDrm#mNativeContext is a long, not int.
Therefore, we must use SetLongField and not SetIntField.

Change-Id: I2a805dd6b7c8e4905e742d8632d941f381a05930
2013-12-18 16:58:36 +00:00
Elliott Hughes
36d10e7994 am 3bfc6e76: am c0d6028f: am a012fee3: am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"
* commit '3bfc6e76e627d4122a774488f36fb843bb3694fb':
  AArch64: Use long for pointers in MediaDrm and MediaMuxer
2013-12-16 23:27:39 +00:00
Elliott Hughes
a012fee3c3 am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"
* commit '5d6332e3744e37ced079e5360f1fa3e0e5681d57':
  AArch64: Use long for pointers in MediaDrm and MediaMuxer
2013-12-16 13:01:19 -08:00
Elliott Hughes
5d6332e374 Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer" 2013-12-16 20:58:02 +00:00
Kenny Root
6a0db59901 resolved conflicts for merge of e0b14ea7 to master
Change-Id: Ie018d3e2eba1eb2d655c153880e1951b68c2bd51
2013-12-13 15:59:51 -08:00
Kenny Root
62d509d24f am 37c69fdd: Merge "Use java.util.Objects instead on internal API"
* commit '37c69fdd826f3973966430adc1abfbefc19bc16e':
  Use java.util.Objects instead on internal API
2013-12-13 14:17:29 -08:00
Kenny Root
e6585b32ea Use java.util.Objects instead on internal API
Not needed since java.util.Objects implements all the needed
functionality.

Change-Id: Icd31d49a9801d1705427f028e9ac927d58e7d34c
2013-12-13 13:40:30 -08:00
Alan Viverette
55d70620d9 Add caption window color attribute
The WebVTT rendering implementation interprets window color as region
color, since there is no window for non-region captions.

BUG: 12020757
Change-Id: Ie891e1343d718783fc32c712860f886de22558ec
2013-12-11 15:22:14 -08:00
Ashok Bhat
656fd04026 AArch64: Use long for pointers in MediaDrm and MediaMuxer
For storing pointers, long is used in MediaDrm and
MediaMuxer classes, as native pointers can be 64-bit.

Change-Id: I77f26cde627baf0dce70b6aa3a4dbd974051d9a6
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2013-12-10 18:10:47 +00:00
Glenn Kasten
a16a979315 Update comments for AudioRecord IllegalArgumentException
Also explicitly list IllegalArgumentException in throws clause of the
constructor helper methods, as that is a critical side-effect of these methods.

Change-Id: I5cae5dfd807235fbdd827ef4ebc7cf05bfd11c02
2013-12-02 11:50:46 -08:00
Glenn Kasten
19294ca0e8 Document need to call AudioRecord.getState() after construction
Change-Id: Ia6ebb5b01ae60453b6fc7db79e2ec3d40d2b56f1
2013-12-02 11:50:45 -08:00
Glenn Kasten
a4b06fd111 Fix typo nbChannels -> channelMask
Formal parameter name in native_setup was wrong.

Change-Id: Ie76c6e0aca83c6a01f2581d988e32da730b7e427
2013-11-22 13:49:09 -08:00
Jeff Brown
2ab3ec21c0 am 2458681b: am 263c4310: am ce468a35: Stop wifi display discovery when no longer needed.
* commit '2458681b3ea4571d2f1254ef597475fe6a582907':
  Stop wifi display discovery when no longer needed.
2013-11-21 23:00:23 -08:00