579 Commits

Author SHA1 Message Date
Nipun Kwatra
5195e615b0 Merge "Enabling time lapse in setProfile, added setCaptureRate" 2010-09-13 12:22:35 -07:00
Nipun Kwatra
4f6bf17407 Enabling time lapse in setProfile, added setCaptureRate
- Time lapse is automatically enabled in setProfile() if a time lapse
  profile is selected. Also audio setup is skipped for time lapse.
- Added setCaptureRate() to set the frame capture rate, which may be
  different from the video playback rate.
- Getting rid of enableTimeLapse() since setProfile() and
  setFrameCaptureDelay() do its job now.

Change-Id: Ifd9f89cea0d05ffbefc22eac4ea5d34147cc1fbe
2010-09-13 12:19:05 -07:00
Mike Lockwood
fde2ca180e MediaFile: Add support for some popular non-media file types.
Change-Id: I68379740b535b08e707158f357e4e58a9c4d74ec
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-12 23:21:54 -04:00
Mike Lockwood
c37255d5d0 Media scanner support for tracking files of arbitrary type.
The native media scanner no longer filters files based on file extension.
Audio, video, image and playlist files are handled as before, but non-media
files are now inserted into the "files" table, which was originally added
to support MTP.

Change-Id: I9053218fb6d2671a3bb181405c34442b94678afc
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-12 23:21:44 -04:00
Nipun Kwatra
522632cde5 Exposing specific profile levels + hasProfile().
- Exposing the specific resolution profile levels
  QUALITY_{QCIF,CIF,480P,720P,1080P} and the new time lapse profiles
  QUALITY_TIME_LAPSE_{LOW,HIGH,QCIF,CIF,480P,720P,1080P}
- Unhiding the hasProfile() function used to test if a given profile exists.

Change-Id: I5d8b9e1ba61718f304235e76d85244e428e68643
2010-09-10 18:01:46 -07:00
Nipun Kwatra
55d39f2066 Merge "Adding hasProfile." 2010-09-10 15:04:17 -07:00
Nipun Kwatra
35c8b532e5 Merge "Added specific resolution and time lapse profiles." 2010-09-10 14:26:45 -07:00
Nipun Kwatra
9d619542be Adding hasProfile.
- Added hasProfile to CamcorderProfile and JNI.
- Added hasCamcorderProfile to MediaProfiles.
- using android.hardware.Camera.CAMERA_ID_DEFAULT for default camera
  in get().

Change-Id: Ib57bb49ae79492d7cbc0ec6c7b6efcbf74f80013
2010-09-10 14:22:11 -07:00
Nipun Kwatra
4af0dfd6cb Added specific resolution and time lapse profiles.
- Added enums QUALITY_{QCIF,480P,720P,1080P}
  QUALITY_TIME_LAPSE_{LOW,HIGH,QCIF,480P,720P,1080P} in CamcorderProfile
  and corresponding ones in MediaProfiles.
- Added functions createDefaultCamcorderTimeLapseLowProfile,
  createDefaultCamcorderTimeLapseHighProfile to set default values.
- Moved javadoc for constants to the get() function.

Change-Id: Ib8b3f8d29395dff77a397d1e6b44cfaf8c481d4d
2010-09-10 14:22:08 -07:00
Mike Lockwood
8490e66f57 Use separate Uris for MTP to the media provider files table
Separating the Uris for local and MTP access to the database will
allow us to handle MTP originated queries differently in the provider.

Change-Id: I78d1c0a0e656eddee1e17212a79157f67ca46b38
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-09 16:00:22 -04:00
Mike Lockwood
792ec849e5 MTP: Fix support for transfering folders and playlists.
This broke when I added support for transfering arbitrary files.

Change-Id: I6f2c052f3bd69839befcf0783d7aff5bcfd29b3e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-09 15:59:56 -04:00
Mike Lockwood
f73738b78a Add framework resource to specify case sensitivity of the external storage filesystem
Change-Id: I8a433de9188c32214b1f8d6a4490dfe731d68c40
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-09 09:58:24 -04:00
Mike Lockwood
e521169ff5 MTP: Allow transfering arbitrary file types.
Change-Id: Ib18b93bff4f9993d95b26ca200fe6169b71453ac
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-08 13:50:45 -04:00
Mike Lockwood
3b2a62e5b3 Rename the media database's "objects" table to "files"
We will be using this table for more than just MTP,
so it deserves a more general name.

Change-Id: I4c86d7e37ebe778e39699245b0e08af059e677ea
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-08 12:47:57 -04:00
Nipun Kwatra
f5e1faf1cc Merge changes I71f5b0fc,I92c7accb
* changes:
  Moving decision to use still camera to CameraSourceTimeLapse
  pass auxiliary video parameters.
2010-09-03 17:14:51 -07:00
Mike Lockwood
59e3f0db08 MTP: Implement support for getting/setting device properties
Added support for the "device friendly name" and "synchonization partner"
properties, which are required by Microsoft.

Change-Id: Ic0443333d75f7d98a2d902a790b9d505a56d4eef
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-02 14:59:26 -04:00
Nipun Kwatra
ab15bce98d pass auxiliary video parameters.
- Added setAuxVideoParameters to pass the auxiliary video paramters.
- Also added enableTimeLapse(). The plan is for this function to replace
setTimeLapseParameters() since we never call setTimeLapseParameters() to
disable time lapse.
- removed calling setParameter for setting useStillCameraForTimeLapse from
setTimeLapseParameters as support has been removed from StagefrightRecorder.
This function needs to be removed when we change the API.

Change-Id: I92c7accbe9ba0b753ce780461ee55208d04703a6
2010-09-02 11:48:22 -07:00
Mike Lockwood
f06a449951 Merge "MTP: Send an Intent after an MTP session that resulted in media database modifications" 2010-08-31 14:32:39 -07:00
Mike Lockwood
d20e802512 Merge "Add settings option for running MTP server in PTP mode." 2010-08-31 13:47:13 -07:00
Mike Lockwood
2837eefc54 MTP: Send an Intent after an MTP session that resulted in media database modifications
Change-Id: Ib2796e9155350c67769502935a73cf98d6ae9c08
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-31 16:25:12 -04:00
Mike Lockwood
eabe8bfaf8 Add settings option for running MTP server in PTP mode.
This can be used as a compatibility workaround for host operating systems
without MTP support.

Change-Id: If4f1856206056ca8e40c3ffbfa382f185c413598
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-31 14:35:23 -04:00
Nipun Kwatra
b33a5aea13 Added setAuxiliaryOutputFile to MediaRecorder and JNI
added setAuxiliaryOutputFile to allow setting of an auxiliary output file.
Also added the JNI support.

Change-Id: I8c3335192bd6f7fcbfdfc8552cfd0848f2ad2a5d
2010-08-31 10:38:49 -07:00
Mike Lockwood
5367ab6aab MTP: Move all MTP protocol constants for Java to a central location.
Change-Id: I770d8727f84d25f0781fc23eedd9e9ac9ded1992
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-30 13:35:03 -04:00
Mike Lockwood
daeeddc5ed MTP: Fix build break due to misuse of "git add -i" command
Change-Id: I85528a43a56942dde921603a353383e2c8f8d93d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-30 12:26:08 -04:00
Mike Lockwood
af2ba835f5 Merge "MTP: Add try/finally handling to finalize overrides" 2010-08-30 08:59:21 -07:00
Mike Lockwood
dbead321da MTP: Add try/finally handling to finalize overrides
Change-Id: I23c481d6214ed5f045f903845632c07c11bb42a3
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-30 09:27:55 -04:00
Eric Laurent
0a84244d92 am d0faf5a2: am c6d7a895: Merge "Changed type of reverb presets from int to short" into gingerbread
Merge commit 'd0faf5a2dd892228bbfbf1e43aba95f60c6bca05'

* commit 'd0faf5a2dd892228bbfbf1e43aba95f60c6bca05':
  Changed type of reverb presets from int to short
2010-08-26 15:51:37 -07:00
Eric Laurent
d0faf5a2dd am c6d7a895: Merge "Changed type of reverb presets from int to short" into gingerbread
Merge commit 'c6d7a8953de9dd4e0af1dca69d83d810c05d809d' into gingerbread-plus-aosp

* commit 'c6d7a8953de9dd4e0af1dca69d83d810c05d809d':
  Changed type of reverb presets from int to short
2010-08-26 11:04:01 -07:00
Eric Laurent
71450f8139 Changed type of reverb presets from int to short
Changed the type of reverb preset constants exposed by the PresetReverb API to
match the type of the setPreset() method parameter.

Change-Id: I786764b5279c60f2368f5a0372f78da65ec54e4f
2010-08-26 10:42:38 -07:00
Mike Lockwood
828d19dd96 MTP: work in progress on expanded property support
GetObjectPropValue and SetObjectPropValue are disabled until I figure out
why Windows doesn't like what I have done.

Change-Id: I74e945ef3ea031f6d46f4ebaa8df815da0a5c3ed
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-25 18:42:22 -04:00
Neel Parekh
ed8188711a Have the band tag parsed into album artist.
Some vendors don't use the albumartist tag, but instead put the
album artist tag in the band tag.

Change-Id: Iea3144d55e4db3a28853bcd06bc72366de4421dc
2010-08-24 14:51:47 -07:00
Eric Laurent
08b352be43 am 5aff90a6: am 1aaba885: Merge "Audio Effects: fixed "strength supported" parameter size." into gingerbread
Merge commit '5aff90a638da53e66fba90c92d412812760fe8e5'

* commit '5aff90a638da53e66fba90c92d412812760fe8e5':
  Audio Effects: fixed "strength supported" parameter size.
2010-08-21 09:41:26 -07:00
Eric Laurent
5aff90a638 am 1aaba885: Merge "Audio Effects: fixed "strength supported" parameter size." into gingerbread
Merge commit '1aaba885def9a3b59edbfe2a0f8c3899948533ff' into gingerbread-plus-aosp

* commit '1aaba885def9a3b59edbfe2a0f8c3899948533ff':
  Audio Effects: fixed "strength supported" parameter size.
2010-08-19 10:47:01 -07:00
Eric Laurent
ba8da2e61b Audio Effects: fixed "strength supported" parameter size.
The "strength supported" parameter for bass boost and virtualizer effect was incorrectly using a
short value whereas it should be an int. This is to comply to the definition of boolean type in OpenSL ES
that is uint32.

Change-Id: I74ccb61dcc70fc9d390524a1ca5bbbd8b13ab1af
2010-08-18 14:31:25 -07:00
Mike Lockwood
4b322ce4fb MTP: Push queries for supported formats and properties up to Java.
Change-Id: I4f117090340e3916afda3d194521a6092a672ddc
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-10 09:00:30 -04:00
Jean-Michel Trivi
3357ccea7a am 2f5f154d: am 66edf558: Merge "Fix bug 2684341 Don\'t steal the media button event from the phone app is the phone is ringing, even in silent mode." into gingerbread
Merge commit '2f5f154d6a090b4ea2ee3645857f2fcae88daa54'

* commit '2f5f154d6a090b4ea2ee3645857f2fcae88daa54':
  Fix bug 2684341 Don't steal the media button event from the phone
2010-08-09 20:00:40 -07:00
Eric Laurent
dbe57fcb49 am 1ece7d68: am 2a6b80bc: Fixed several audio effects problems.
Merge commit '1ece7d6873027068a3e7b055597045e9387b217c'

* commit '1ece7d6873027068a3e7b055597045e9387b217c':
  Fixed several audio effects problems.
2010-08-09 20:00:11 -07:00
Jean-Michel Trivi
2f5f154d6a am 66edf558: Merge "Fix bug 2684341 Don\'t steal the media button event from the phone app is the phone is ringing, even in silent mode." into gingerbread
Merge commit '66edf558a9041eb0b1a7fc0459db1bdafcfca84b' into gingerbread-plus-aosp

* commit '66edf558a9041eb0b1a7fc0459db1bdafcfca84b':
  Fix bug 2684341 Don't steal the media button event from the phone
2010-08-09 19:53:20 -07:00
Eric Laurent
1ece7d6873 am 2a6b80bc: Fixed several audio effects problems.
Merge commit '2a6b80bc65c4782b5a7168b300e1dc5ec9f617ee' into gingerbread-plus-aosp

* commit '2a6b80bc65c4782b5a7168b300e1dc5ec9f617ee':
  Fixed several audio effects problems.
2010-08-09 19:52:43 -07:00
Jean-Michel Trivi
66edf558a9 Merge "Fix bug 2684341 Don't steal the media button event from the phone app is the phone is ringing, even in silent mode." into gingerbread 2010-08-09 14:19:08 -07:00
Jean-Michel Trivi
e73131a684 Fix bug 2684341 Don't steal the media button event from the phone
app is the phone is ringing, even in silent mode.

Use the PhoneStateListener to know whether the phone is ringing,
as the mode is not MODE_RINGTONE when ringing in silent mode.

Change-Id: Iede350cecde0b663d50f9b4a57f9a9ef08066c0d
2010-08-09 11:48:20 -07:00
Eric Laurent
2a6b80bc65 Fixed several audio effects problems.
- Fixed constant inversions in AudioEffect.java
- Do not return error when enabling an already enabled effect
- Update cached effect state in native AudioEffect class when effect is enabled/disabled by command() method
- Remove click when restarting effect during disable sequence
- Fixed problem in master mute management when volume control is delegated to effect.

Change-Id: I6df4ce9fcc54fdc7345df858f639d20d802d6712
2010-08-09 05:48:20 -07:00
Scott Main
613d363c96 am ef9fd39d: am 769f9b89: am 5b86de94: fix doc bugs
Merge commit 'ef9fd39d73877162ba200ef8b2000216133dab2e'

* commit 'ef9fd39d73877162ba200ef8b2000216133dab2e':
  fix doc bugs
2010-08-05 12:07:55 -07:00
Andreas Huber
0a3858b0de am 1f513d88: am c17f35dd: Merge "Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation." into gingerbread
Merge commit '1f513d8821670a33d6361ea521b6756163a3f9bf'

* commit '1f513d8821670a33d6361ea521b6756163a3f9bf':
  Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation.
2010-08-05 11:46:04 -07:00
Eric Laurent
4e68d506b0 resolved conflicts for merge of acc4e683 to master
Change-Id: Iabfdbdd1f048bd1a3f5cf90bfba8a33f5a0d27f8
2010-08-05 02:53:22 -07:00
Scott Main
ef9fd39d73 am 769f9b89: am 5b86de94: fix doc bugs
Merge commit '769f9b8980a774e3493cbd9beac565c6b5d62161' into gingerbread-plus-aosp

* commit '769f9b8980a774e3493cbd9beac565c6b5d62161':
  fix doc bugs
2010-08-04 18:05:22 -07:00
Scott Main
769f9b8980 am 5b86de94: fix doc bugs
Merge commit '5b86de94a163ce4c52ab08a9820f9d78414e1767' into gingerbread

* commit '5b86de94a163ce4c52ab08a9820f9d78414e1767':
  fix doc bugs
2010-08-04 18:02:18 -07:00
Scott Main
5b86de94a1 fix doc bugs
Change-Id: Ic0cec3818fdc7692ea7aa3152ecb444203097157
2010-08-04 17:07:36 -07:00
Andreas Huber
1f513d8821 am c17f35dd: Merge "Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation." into gingerbread
Merge commit 'c17f35dd927570c5c8d0c00b25a5bfaa1d4f1444' into gingerbread-plus-aosp

* commit 'c17f35dd927570c5c8d0c00b25a5bfaa1d4f1444':
  Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation.
2010-08-04 14:15:23 -07:00
Mike Lockwood
c3cc7011c2 Merge changes I085cb3cf,Ied1cddc6
* changes:
  MTP: Add support for syncing MTP playlists
  MTP: Fix some thread safety issues in MTP server start/stop sequence.
2010-08-04 13:02:06 -07:00