2990 Commits

Author SHA1 Message Date
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
Glenn Kasten
7dd77a875c Merge "Improve error reporting in AudioTrack JNI" 2014-01-09 20:08:25 +00:00
Leon Scroggins III
b311b3424b Merge "Merge AssetStream with AssetStreamAdaptor." 2014-01-09 19:58:33 +00:00
Glenn Kasten
659a9712f2 Improve error reporting in AudioTrack JNI
for android_media_AudioTrack_get_min_buff_size when it
calls AudioTrack::getMinFrameCount.  That AudioTrack API
has been changed recently to guarantee that it will always
return a valid frameCount if the return value == NO_ERROR.

Change-Id: I8f7f850f1c30229ce77a02bdc963634cdbaf3aac
2014-01-09 09:55:54 -08:00
Martin Kosiba
4580d9cf1d Fix the build.
Change I6f1ebb2b20b7436c86fe849b35d582fd9c8a8967 broke the build
with a typo.

Change-Id: If8876078c0e1a20ca1034cc5926080e02fead205
2014-01-09 12:33:22 +00:00
Alan Viverette
c619b6e58b Merge "Add DisplayList bit for projecting onto a contained volume" 2014-01-09 01:35:03 +00:00
Alan Viverette
58f09b3524 Add DisplayList bit for projecting onto a contained volume
Does not handle reordering/translating the projected DisplayList.

Change-Id: I6f1ebb2b20b7436c86fe849b35d582fd9c8a8967
2014-01-08 17:18:19 -08:00
Vinit Deshpande
80a3a364fd Merge "Revert "Revert "Move Wifi services to a new git project""" 2014-01-08 23:47:44 +00:00
Narayan Kamath
0203d58ecf am db47efd3: am 651807fc: am 3f589e5d: am 2842bd02: am de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup"
* commit 'db47efd3f8581c2c0d72a1b8617aeae9830f7ea4':
  AArch64: Use long for pointers in App/Backup
2014-01-08 12:38:37 +00:00
Narayan Kamath
ee864c0a04 am 55a12adc: am 72a8fe6d: am 74661ff1: am b5558817: am 002ae75b: Merge "AArch64: Use long for pointers"
* commit '55a12adc19b15df4068b90439dccb868534002c7':
  AArch64: Use long for pointers
2014-01-08 12:38:30 +00:00
Narayan Kamath
6bbda22e1c am 29eadb32: am 9a743575: am 71cdc73d: am 53acc7ae: am f5598210: Merge "AArch64: Use long for pointers in hardware classes"
* commit '29eadb328a71f912b0d479860286cd606ed3dc87':
  AArch64: Use long for pointers in hardware classes
2014-01-08 12:38:24 +00:00
Narayan Kamath
651807fcd0 am 3f589e5d: am 2842bd02: am de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup"
* commit '3f589e5d1e09e17a2aaa0a52fc15e16520d1bd5a':
  AArch64: Use long for pointers in App/Backup
2014-01-08 12:05:13 +00:00
Narayan Kamath
72a8fe6d03 am 74661ff1: am b5558817: am 002ae75b: Merge "AArch64: Use long for pointers"
* commit '74661ff119b274e58d1b2f15cff97cfa6a1e64fa':
  AArch64: Use long for pointers
2014-01-08 12:01:13 +00:00
Narayan Kamath
9a74357525 am 71cdc73d: am 53acc7ae: am f5598210: Merge "AArch64: Use long for pointers in hardware classes"
* commit '71cdc73d2808944fca0a9e200696253d1f4a5bf4':
  AArch64: Use long for pointers in hardware classes
2014-01-08 12:01:09 +00:00
Ashok Bhat
58b8b24256 AArch64: Use long for pointers in App/Backup
For storing pointers, long is used, 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: I7aee49dc26cf6c86af8f1d882e9cd1cc145a1977
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-08 11:54:01 +00:00
Ashok Bhat
738702d28a AArch64: Use long for pointers
For storing pointers, long is used in CursorWindow
and SQLiteConnection classes as native pointers can
be 64-bit.

Change-Id: Ia686006a7b8bdc7b95e5de0d0a294b155034a921
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-08 11:53:21 +00:00
Ashok Bhat
4838e33812 AArch64: Use long for pointers in hardware classes
For storing pointers, long is used in hardware 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: Icdeb67f9273fb2d8f6d88ca68d7f7d0950796fc1
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-08 10:17:21 +00:00
Vinit Deshpande
3ffa1a899a Revert "Revert "Move Wifi services to a new git project""
This reverts commit f1182c9c1abdb4e8f733632d0567410ab9fc1d3c.

Change-Id: Ic440cfa6502b651b2cc67faf73c7c9c49df42190
2014-01-08 02:55:29 +00:00
Vinit Deshpande
d9feaf4971 Merge "Revert "Move Wifi services to a new git project"" 2014-01-08 02:41:16 +00:00
Vinit Deshpande
f1182c9c1a Revert "Move Wifi services to a new git project"
This reverts commit 4a3f9cf099bbbe52dc0edb2a7e1d1c976bc335a3.

Change-Id: I6269a683e842a5d1cfdafea892be86972ae11c40
2014-01-08 02:38:31 +00:00
Vinit Deshapnde
ed8ed0bc81 Merge "Move Wifi services to a new git project" 2014-01-08 02:27:25 +00:00
Glenn Kasten
9d1ed347d3 Merge "Remove I/O handle from get/setParameters parameter list" 2014-01-08 00:36:46 +00:00
John Reck
ed20ebbde5 Merge "EGL migration to native" 2014-01-07 23:39:40 +00:00
John Reck
23b797ab51 EGL migration to native
Move EGL state management to native side for RemoteGLRenderer

Change-Id: I12b0fed70246564d4caebf87374e8bbca655c572
2014-01-07 14:53:55 -08:00
Vinit Deshapnde
4a3f9cf099 Move Wifi services to a new git project
Bug: 12175455
Change-Id: I1fa07e29c6a9aae38d9e334d519a9f2445d15613
2014-01-07 11:00:05 -08:00
Narayan Kamath
2e09e57e3d am 0d8c3c46: am 5f83ff6f: am e7d7908c: am 02baba25: am 67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver"
* commit '0d8c3c469e4a5e74b702b58307c1e24fa15da3d8':
  AArch64: Use long for pointers in DisplayEventReceiver
2014-01-07 13:10:08 +00:00
Narayan Kamath
5f83ff6ffa am e7d7908c: am 02baba25: am 67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver"
* commit 'e7d7908c28adf77de2cefba4f2a554b770d49def':
  AArch64: Use long for pointers in DisplayEventReceiver
2014-01-07 13:04:10 +00:00
Ashok Bhat
27285821b7 AArch64: Use long for pointers in DisplayEventReceiver
For storing pointers, long is used 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: I3c0855373c0e4bedc172adb82b103586de9219dc
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-01-07 12:48:43 +00:00
Mark Salyzyn
e11cbd441d jni: Incorporate liblog reading API
Change-Id: I8b78e4db67b6daabb975ce740fb40478df4ffcef
2014-01-06 13:51:48 -08:00
Todd Poynor
91ecb36df5 ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGE
Change-Id: Ie2f8af1e411c28d7f03be56c356ec39e1d71558e
2014-01-03 16:30:25 -08:00
Chris Craik
539394ec3a Merge "Create abstract base class for OpenGLRenderer" 2013-12-30 21:55:47 +00:00
Chris Craik
91fcb7d7e3 Merge "Avoid implicit parameter/return value casting of pointers." 2013-12-28 00:51:19 +00:00
Chris Craik
9f66ea06ac Avoid implicit parameter/return value casting of pointers.
Change-Id: I88123a75c87bf9a88de9ef9fc3e9af70d6a18d7d
2013-12-27 16:45:05 -08:00
Chris Craik
7a02ea3eaa Avoid implicit parameter casting of pointers.
Change-Id: I568c4b38ce05f948e2456c54ae69921d328f3010
2013-12-27 16:43:22 -08:00
Chris Craik
b458942bb6 Create abstract base class for OpenGLRenderer
This will eventually serve as a base class to allow
DisplayListRenderer to split off from OpenGLRenderer, and could
eventually support other rendering approaches, such as an
SkCanvas/SkPicture.

This will also be the main source of (implementation-independent)
documentation of the canvas/renderer methods.

Change-Id: I52047f338f5cf86a3b0b3002af7154bff5c3c227
2013-12-27 14:40:06 -08:00
Chris Craik
d863a10b28 Add initial APIs for 3d view manipulation.
Change-Id: I6de00bc577d5b3a1fbc9ca3a3b3668fcfa32b867
2013-12-20 15:15:01 -08:00
Chris Craik
3c8a529b3c Merge "Move GLES20DisplayList functionality into DisplayList" 2013-12-20 22:06:02 +00:00
Chris Craik
5438979e49 Move GLES20DisplayList functionality into DisplayList
Removes unneeded indirection layer

Change-Id: I75d3e369eda2788cbc52a3575c4e1c521e842f59
2013-12-20 13:53:50 -08:00
Glenn Kasten
44e26f2f5c Merge "Prepare for additional formats beyond 8-bit and 16-bit PCM" 2013-12-20 15:37:16 +00:00
Glenn Kasten
c94752a01a Remove I/O handle from get/setParameters parameter list
This is a step towards isolating application-level from
I/O handles as much as possible.

Change-Id: I355619c36fee2d5743080b57f146626fb849fc19
2013-12-19 17:02:06 -08:00
Glenn Kasten
a5a4238436 Prepare for additional formats beyond 8-bit and 16-bit PCM
Factor out code that converts from Java ENCODING_PCM_* to native
AUDIO_FORMAT_* into a new function audioFormatToNative().

Also use audio_bytes_per_sample() from <system/audio.h>
instead of hard-coding the size of various formats.

Use size_t for memory sizes.

Change-Id: Ic3525f049e939bdf125d9f87ed39abd2690dcf9f
2013-12-19 13:50:54 -08:00
Brian Carlstrom
0c2a8c7f27 am 67fa194e: am ee767548: am d9386812: am f64a30f8: am a11371f4: Merge "Track Looper decoupling from ALooper"
* commit '67fa194ecb9e1d28ae3c60110bef671a3312b13b':
  Track Looper decoupling from ALooper
2013-12-19 07:58:25 +00:00
Brian Carlstrom
82b007d757 Track Looper decoupling from ALooper
Change-Id: I54f4d36f105e60eaaa453ae60f591d634c681fd7
2013-12-18 17:56:35 -08:00
Leon Scroggins III
b9c58ab617 Merge AssetStream with AssetStreamAdaptor.
Add enums to the constructor for AssetStreamAdaptor to choose the
different behaviors used by the (former) two different classes.

The old clients of AssetStream now get the following features of
AssetStreamAdaptor
- Debugging statements on error.
- The stream is an SkStreamRewindable.
- getLength() returns the correct value, and the old way of getting
  the length (read(NULL, 0)) is no longer implemented, since it is
  no longer used.
- isAtEnd() returns the correct value. ToT Skia makes it pure virtual,
  so some implementation is necessary.

Change-Id: I2a5395914e4f53830aaefee396556459083a1c56
2013-12-17 15:51:33 -05:00
Greg Hackmann
6ab81e996d am 69ad42a3: am 1877f7dc: am 0b64fa7e: am c978799c: Merge "Add /dev/rtc backend to SystemClock"
* commit '69ad42a3cf12bf39fe2c47c4298f23567b3306ef':
  Add /dev/rtc backend to SystemClock
2013-12-17 20:13:00 +00:00
Greg Hackmann
c978799c4a Merge "Add /dev/rtc backend to SystemClock" 2013-12-17 18:11:06 +00:00
Greg Hackmann
b7bbca2d6a Add /dev/rtc backend to SystemClock
On devices without /dev/alarm, use the settimeofday() syscall and the
standard RTC_SET_TIME ioctl (which are collectively equivalent to the
ANDROID_ALARM_SET_RTC ioctl).

Change-Id: I3c1d741099e253186e43c9369b62603b214b9c9a
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2013-12-16 16:23:52 -08:00
Chris Craik
ba9b613437 Create private properties on GLCanvas for experimentation with 3d
Change-Id: I17772f61efce727cb4c1111f4d97f58c741786b8
2013-12-16 14:57:00 -08:00
Chris Craik
18809c063b Merge "3d view system!" 2013-12-13 21:55:50 +00:00
Kristian Monsen
85948593e3 resolved conflicts for merge of 800d4d72 to master
Change-Id: Ib1defc447745e5406d64c0d99c962832c79d15ef
2013-12-12 23:59:37 -08:00