2403 Commits

Author SHA1 Message Date
Eric Laurent
a4c72acfbc Audio effects: modified command() parameter types.
The type of the cmd, cmdSize and *pReplySize parameters of the effect control interface command()
function have been modified from int to uint32_t. This is more consistent with their role.

Change-Id: I84d289fc262d6753747910f06f485597dfee6591
2010-07-28 05:49:21 -07:00
Mike Lockwood
725552a0df CameraBrowser: Launch itself when a camera is attached to USB.
Change-Id: I00d6980a1f8e6607c1368cbf78d8e824514c666b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-27 19:20:31 -04:00
Mike Lockwood
bb2b2a996b MTP host: Reduce buffer size for readObject so we don't clog our pipe.
Change-Id: I24d2b1551af5843e48c0a63b84925b3a6451e36a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-27 12:38:33 -04:00
Mike Lockwood
456d8e6e67 MTP: Turn off excessive logging
Change-Id: Ib0dd8cb99efa324d0b4e742bffeb913d6122ace2
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-27 12:38:29 -04:00
Mike Lockwood
1a987b8e45 Try to fix the sim build.
Change-Id: I6e94c938263b2fd1931ed60c26af1134ff035455
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-27 10:55:26 -04:00
Eric Laurent
b008e9b128 resolved conflicts for merge of d306cc81 to master
Change-Id: Ib593b7719a837de12605e8c75904634843298ba1
2010-07-27 02:41:41 -07:00
Eric Laurent
d306cc8192 am ca57d1cc: Audio Effects: added methods to effects java classes to store and load current effect settings in a single call.
Merge commit 'ca57d1cc89d65dfbd59c749c5736574cd08c7bd3' into gingerbread-plus-aosp

* commit 'ca57d1cc89d65dfbd59c749c5736574cd08c7bd3':
  Audio Effects: added methods to effects java classes to store and load current effect settings in
2010-07-27 01:54:30 -07:00
Eric Laurent
ca57d1cc89 Audio Effects: added methods to effects java classes to store and load current effect settings in
a single call.

Addional changes:
- Fixed simulator build
- Use effect interface UUIDs from OpenSL ES includes when available
- Added cleanspec rules to remove now obsolete test effect libraries
- Fixed bug in AudioEffect JNI setParameter function.

Change-Id: Ic25ddb135e2cec5a68c181d727321f5ac7a1ab6b
2010-07-27 00:41:31 -07:00
Mike Lockwood
133dfe7e98 Merge "Simple command line test tool for MTP host." 2010-07-26 17:51:16 -07:00
Mike Lockwood
1979628e1e Merge "CameraBrowser: Add support for copying files from camera to internal storage." 2010-07-26 17:51:02 -07:00
Mike Lockwood
2f493f0ff1 Merge "MTP host: Add support for reading files from an MTP device via ParcelFileDescriptor" 2010-07-26 17:50:13 -07:00
Mike Lockwood
f7785521bf Merge "MTP: Don't request thumbnails for folder objects in MtpCursor" 2010-07-26 17:49:28 -07:00
Mike Lockwood
bc55034ef9 Merge "MTP: Add hard coded support to recognize a couple MTP music players for testing purposes." 2010-07-26 17:49:04 -07:00
Mike Lockwood
5fd1ff0aa3 Simple command line test tool for MTP host.
Change-Id: Ifd13e1ca5d49a5477a9850d94d443a50bbc32ff1
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-26 20:47:35 -04:00
Mike Lockwood
ad0643a330 CameraBrowser: Add support for copying files from camera to internal storage.
Change-Id: I00b765afec0558dfe27961bd0b2e01473c29fc22
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-26 20:43:26 -04:00
Mike Lockwood
bc4cb0bc79 MTP host: Add support for reading files from an MTP device via ParcelFileDescriptor
Also added some support for sending files to the device that hasn't been debugged yet.
Add locking to MtpDevice to prevent it from attempting multiple transactions simultaneously.

Change-Id: I2b995ba0af086cc6920bd6b8c869f540ad78560a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-26 20:40:45 -04:00
Mike Lockwood
f78b26a572 MTP: Don't request thumbnails for folder objects in MtpCursor
Change-Id: I75a0a834ab746bed0a35883539c8dbc104789157
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-26 20:36:32 -04:00
Mike Lockwood
86187098ce MTP: Add hard coded support to recognize a couple MTP music players for testing purposes.
Change-Id: I2d09d78e83d13cfb3edff02372a6fc34b1e4d8b1
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-26 20:33:02 -04:00
Eric Laurent
037644fbe4 am e80c30c6: am 00de7218: Merge "Fixed bug in vlm effect bunde wrapper effect init function." into gingerbread
Merge commit 'e80c30c6b557fab2f5fc7a87c51018f5a8074338'

* commit 'e80c30c6b557fab2f5fc7a87c51018f5a8074338':
  Fixed bug in vlm effect bunde wrapper effect init function.
2010-07-26 12:30:49 -07:00
Eric Laurent
f4d9a21a4c am df5c3b50: am 739bf285: Merge "LVM release 1.04." into gingerbread
Merge commit 'df5c3b5024276af8b44d00bb28ce620ab31e2365'

* commit 'df5c3b5024276af8b44d00bb28ce620ab31e2365':
  LVM release 1.04.
2010-07-26 12:30:23 -07:00
Eric Laurent
e80c30c6b5 am 00de7218: Merge "Fixed bug in vlm effect bunde wrapper effect init function." into gingerbread
Merge commit '00de721859ca291d0e212a6970f0bd8b3a2f8428' into gingerbread-plus-aosp

* commit '00de721859ca291d0e212a6970f0bd8b3a2f8428':
  Fixed bug in vlm effect bunde wrapper effect init function.
2010-07-26 12:25:37 -07:00
Eric Laurent
df5c3b5024 am 739bf285: Merge "LVM release 1.04." into gingerbread
Merge commit '739bf285be7a154b92e74b069dff7dc8f7ffc2f3' into gingerbread-plus-aosp

* commit '739bf285be7a154b92e74b069dff7dc8f7ffc2f3':
  LVM release 1.04.
2010-07-26 12:25:24 -07:00
Eric Laurent
00de721859 Merge "Fixed bug in vlm effect bunde wrapper effect init function." into gingerbread 2010-07-26 10:09:54 -07:00
Eric Laurent
3374105cc0 LVM release 1.04.
Remaining warnings in the code have been removed
Core components support seamless insertion in the audio stream at playtime (Enabling / Disabling the effect).

Change-Id: Icae7085305fad663faeb5a94cb673b41cec5a9f1
2010-07-26 01:57:36 -07:00
Eric Laurent
1c454cc4c7 Fixed bug in vlm effect bunde wrapper effect init function.
The status in the command reply field was not initialized by Effect_command() for
EFFECT_CMD_INIT causing unpredictable failures when initializing an effect.

Change-Id: I7dccb094c9244fad4ed9aea3062a395db295e082
2010-07-26 01:07:38 -07:00
Eric Laurent
d9f7200e21 am 08f2b10c: am 021697ad: Audio effects: lvm bundle wrapper update after first integration tests.
Merge commit '08f2b10c4b2e7fc1c666cc1d896e227289206b24'

* commit '08f2b10c4b2e7fc1c666cc1d896e227289206b24':
  Audio effects: lvm bundle wrapper update after first integration tests.
2010-07-23 01:06:12 -07:00
Eric Laurent
08f2b10c4b am 021697ad: Audio effects: lvm bundle wrapper update after first integration tests.
Merge commit '021697ad3d4ef981d0deae1fa223ed06f30df738' into gingerbread-plus-aosp

* commit '021697ad3d4ef981d0deae1fa223ed06f30df738':
  Audio effects: lvm bundle wrapper update after first integration tests.
2010-07-23 01:03:06 -07:00
Eric Laurent
021697ad3d Audio effects: lvm bundle wrapper update after first integration tests.
Change-Id: I20cb55282833bd6e3a160e0dae1cc1fcb6b1ca30
2010-07-23 00:54:58 -07:00
Nipun Kwatra
e7c51f5144 Don't change the public API (adding @hide)
Change-Id: I3f3330472c42932fddb1de2c60e2380e59980995
2010-07-22 17:30:10 -07:00
Nipun Kwatra
d01371bf69 Allowing setting of time lapse parameters through MediaRecorder.java
added setTimeLapseParameters() to MediaRecorder.java and SetParameter support
in StagefrightRecorder to allow enabling time lapse and setting the corresponding
parameters.

Change-Id: I509040aa71f8d3fc37337b0894a81d9c0fd7a40a
2010-07-22 17:02:12 -07:00
James Dong
9c9d0684a0 am 9bc4dc11: am 53d4e0d5: Allows the authoring engine to skip frame.
Merge commit '9bc4dc114fce58606a81d65d4cb31348cc7c1bae'

* commit '9bc4dc114fce58606a81d65d4cb31348cc7c1bae':
  Allows the authoring engine to skip frame.
2010-07-22 16:28:26 -07:00
James Dong
9bc4dc114f am 53d4e0d5: Allows the authoring engine to skip frame.
Merge commit '53d4e0d58e2d5c18f6e026c705af833b9bdd7aba' into gingerbread-plus-aosp

* commit '53d4e0d58e2d5c18f6e026c705af833b9bdd7aba':
  Allows the authoring engine to skip frame.
2010-07-22 16:25:17 -07:00
Mathias Agopian
6d6b749b24 move native services under services/
moved surfaceflinger, audioflinger, cameraservice

all native services should now reside in this location.

Change-Id: Icd7336f7289db35df9c8c1857a5122bb8a6f1c86
2010-07-22 15:28:19 -07:00
James Dong
53d4e0d58e Allows the authoring engine to skip frame.
This is 1st part of the work to allow audio and video resync if
we found out that audio and video are out of sync during authoring

- also fixed a problem in AACEncoder::read() where the buffer acquired
  from the buffer group does not release when error out at
  reading from source.

Change-Id: I8a2740097fcfdf85e6178869afeb9f3687a99118
2010-07-22 14:51:53 -07:00
Andreas Huber
8dac3bf922 am b72d3180: am 81046c8c: Merge "Various changes to improve rtsp networking, reduce packet loss and adapt to ALooper API changes." into gingerbread
Merge commit 'b72d3180dc8d41d6269664bea808b04410bbe40f'

* commit 'b72d3180dc8d41d6269664bea808b04410bbe40f':
  Various changes to improve rtsp networking, reduce packet loss and adapt to ALooper API changes.
2010-07-22 13:57:39 -07:00
Andreas Huber
b72d3180dc am 81046c8c: Merge "Various changes to improve rtsp networking, reduce packet loss and adapt to ALooper API changes." into gingerbread
Merge commit '81046c8c42ff3b630c6496deafd44f2a07a25463' into gingerbread-plus-aosp

* commit '81046c8c42ff3b630c6496deafd44f2a07a25463':
  Various changes to improve rtsp networking, reduce packet loss and adapt to ALooper API changes.
2010-07-22 13:54:47 -07:00
Andreas Huber
4e4173b0af Various changes to improve rtsp networking, reduce packet loss and adapt to ALooper API changes.
Change-Id: I110e19d5ce33e597add3ffbd3e3ff3815862396d
2010-07-22 09:21:05 -07:00
Andreas Huber
9511ab83d6 am 8a9a931f: am 8138e841: Merge "Support finer seek control on MediaSources." into gingerbread
Merge commit '8a9a931fff2d184f7cf77fdd8a425f682f006cfd'

* commit '8a9a931fff2d184f7cf77fdd8a425f682f006cfd':
  Support finer seek control on MediaSources.
2010-07-21 10:41:45 -07:00
Andreas Huber
8a9a931fff am 8138e841: Merge "Support finer seek control on MediaSources." into gingerbread
Merge commit '8138e841a5adb3c5629e263f5a8cb2e936d234ce' into gingerbread-plus-aosp

* commit '8138e841a5adb3c5629e263f5a8cb2e936d234ce':
  Support finer seek control on MediaSources.
2010-07-21 10:39:00 -07:00
Andreas Huber
8138e841a5 Merge "Support finer seek control on MediaSources." into gingerbread 2010-07-21 10:36:08 -07:00
Eric Laurent
0119ba5bd3 am 34161132: am 7070b365: Added support for auxiliary audio effects to AudioTrack and MediaPlayer.
Merge commit '34161132030254bac7dd64c9713832e2f961a061'

* commit '34161132030254bac7dd64c9713832e2f961a061':
  Added support for auxiliary audio effects to AudioTrack and MediaPlayer.
2010-07-21 09:52:17 -07:00
Eric Laurent
3416113203 am 7070b365: Added support for auxiliary audio effects to AudioTrack and MediaPlayer.
Merge commit '7070b36549d511d6627538c73dfbab23fbae5b43' into gingerbread-plus-aosp

* commit '7070b36549d511d6627538c73dfbab23fbae5b43':
  Added support for auxiliary audio effects to AudioTrack and MediaPlayer.
2010-07-21 09:49:27 -07:00
Andreas Huber
6624c9fd0b Support finer seek control on MediaSources.
related-to-bug: 2858448

Change-Id: Ifb4b13b990fd5889113e47e2c62249ac43391fa1
2010-07-21 08:51:29 -07:00
Eric Laurent
7070b36549 Added support for auxiliary audio effects to AudioTrack and MediaPlayer.
Added methods to AudioTrack and MediaPlayer java classes to enable use of
auxiliary audio effects. The effect can be attached and detached by specifying its
ID and the send level controlled.

Change-Id: Ie74ff54a453096a742688476f612ce355543b6f3
2010-07-21 06:28:01 -07:00
James Dong
c5eeedc93d am 9049fe60: am d7514ec6: Merge "Progress status notification" into gingerbread
Merge commit '9049fe60c20640bd606741c8f45f3f781a1684f5'

* commit '9049fe60c20640bd606741c8f45f3f781a1684f5':
  Progress status notification
2010-07-20 16:55:12 -07:00
James Dong
9049fe60c2 am d7514ec6: Merge "Progress status notification" into gingerbread
Merge commit 'd7514ec6eb17d262d6f9605a2c2f245b7ad7c0b9' into gingerbread-plus-aosp

* commit 'd7514ec6eb17d262d6f9605a2c2f245b7ad7c0b9':
  Progress status notification
2010-07-20 14:32:39 -07:00
James Dong
d7514ec6eb Merge "Progress status notification" into gingerbread 2010-07-20 14:29:39 -07:00
Nipun Kwatra
87419a2b3d Merge "Restart preview after each takePicture is done." 2010-07-20 14:15:59 -07:00
Eric Laurent
240677ec68 resolved conflicts for merge of dd206093 to master
Change-Id: I21dd2321a4839d034d49092baccbf40986f17dae
2010-07-20 13:37:19 -07:00
Nipun Kwatra
4cd8672662 Restart preview after each takePicture is done.
Preview is called when CAMERA_MSG_COMPRESSED_IMAGE is recieved by
dataCallback(). It needs to be started as a new thread so that the
callback can return, and the camera can know that takePicture() is
done.

Change-Id: I4d0febbc993aac43b37f9f4a824e9c7b8785f19e
2010-07-20 12:42:29 -07:00