2688 Commits

Author SHA1 Message Date
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
James Dong
c18c02d78c am 2432248b: am 4709c7fa: Merge "Fixed a copy and paste error" into gingerbread
Merge commit '2432248b03c675812dbb2154e2535bf3ada54b0a'

* commit '2432248b03c675812dbb2154e2535bf3ada54b0a':
  Fixed a copy and paste error
2010-09-10 11:34:15 -07:00
Eric Laurent
dd88d7e3ff am ea4680f0: am 2814ad25: Merge "LVM release 1.09 delivery" into gingerbread
Merge commit 'ea4680f007c9fbc1ff73a6b161e6e83ebaeff981'

* commit 'ea4680f007c9fbc1ff73a6b161e6e83ebaeff981':
  LVM release 1.09 delivery
2010-09-10 11:30:16 -07:00
James Dong
2432248b03 am 4709c7fa: Merge "Fixed a copy and paste error" into gingerbread
Merge commit '4709c7faaa7d14b136dd3b1d8126f972ee11a1aa' into gingerbread-plus-aosp

* commit '4709c7faaa7d14b136dd3b1d8126f972ee11a1aa':
  Fixed a copy and paste error
2010-09-10 11:25:24 -07:00
James Dong
4709c7faaa Merge "Fixed a copy and paste error" into gingerbread 2010-09-10 11:21:42 -07:00
Eric Laurent
ea4680f007 am 2814ad25: Merge "LVM release 1.09 delivery" into gingerbread
Merge commit '2814ad25578d1a52826464477da16217247c04e0' into gingerbread-plus-aosp

* commit '2814ad25578d1a52826464477da16217247c04e0':
  LVM release 1.09 delivery
2010-09-10 10:26:51 -07:00
Eric Laurent
2814ad2557 Merge "LVM release 1.09 delivery" into gingerbread 2010-09-10 10:24:02 -07:00
James Dong
8d3b9100a6 Fixed a copy and paste error
Change java/lang/IOException to java/lang/RuntimeException
since there is no java/lang/IOException while keeping
the signature of the MediaRecorder class
constructor unchanged.

Change-Id: Id9b9aa55db42bef528069ef1e2102038391bc15f
2010-09-10 08:49:14 -07:00
Andreas Huber
2004ebfde3 am 0d661b5e: am ff4c57ad: Merge "TimedEventQueue now explicitly sets its scheduling policy to foreground as it should." into gingerbread
Merge commit '0d661b5eb42aba49de8d4d6ddc5140a8b2348055'

* commit '0d661b5eb42aba49de8d4d6ddc5140a8b2348055':
  TimedEventQueue now explicitly sets its scheduling policy to foreground as it should.
2010-09-09 16:48:58 -07:00
Andreas Huber
0d661b5eb4 am ff4c57ad: Merge "TimedEventQueue now explicitly sets its scheduling policy to foreground as it should." into gingerbread
Merge commit 'ff4c57ade41c1c5c5f79088f6cef0fc1142c25f1' into gingerbread-plus-aosp

* commit 'ff4c57ade41c1c5c5f79088f6cef0fc1142c25f1':
  TimedEventQueue now explicitly sets its scheduling policy to foreground as it should.
2010-09-09 16:42:17 -07:00
Andreas Huber
4b3d32bb1b TimedEventQueue now explicitly sets its scheduling policy to foreground as it should.
Change-Id: I630c9fb51686d87a4075f01a6d7f6f9139ddcb4b
related-to-bug: 2944452
2010-09-09 16:14:02 -07:00
Mike Lockwood
e611ad410a Merge "Use separate Uris for MTP to the media provider files table" 2010-09-09 15:37:31 -07:00
Andreas Huber
f6b815409d am 8986f62b: am f3de053c: Merge "Instead of asserting return a runtime error if the maximum sample size cannot be determined." into gingerbread
Merge commit '8986f62b30e494b68476ff8ef81acd4b1dd22674'

* commit '8986f62b30e494b68476ff8ef81acd4b1dd22674':
  Instead of asserting return a runtime error if the maximum sample size cannot be determined.
2010-09-09 14:21:19 -07:00
James Dong
c4a43e2562 am e19df3dc: am 5c43a7af: Merge "When 32-bit offset is used, if the requested max file size is greater than the 32-bit offset limit, set the limit to the max 32-bit offset limit." into gingerbread
Merge commit 'e19df3dca1c8a1d9f783a6722c56f6ea82189412'

* commit 'e19df3dca1c8a1d9f783a6722c56f6ea82189412':
  When 32-bit offset is used,
2010-09-09 14:21:07 -07:00
Andreas Huber
1560473ec1 am f0eab98c: am a063cd64: Merge "Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content." into gingerbread
Merge commit 'f0eab98c4ef7449eb5a5ef659cd794e0003216b3'

* commit 'f0eab98c4ef7449eb5a5ef659cd794e0003216b3':
  Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content.
2010-09-09 13:48:53 -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
Eric Laurent
305443c989 LVM release 1.09 delivery
- Reverb:
	- 1 channel mixed has gain zero
	- core componenet now only outputs STEREO samples
	- wrapper now handles only STEREO from the Reverb Core
- Bass Boost:
	- increase scratch memory

Change-Id: I00ae31051cc40a7006fc993420facfeb4d30dc52
2010-09-09 12:02:58 -07:00
Andreas Huber
8986f62b30 am f3de053c: Merge "Instead of asserting return a runtime error if the maximum sample size cannot be determined." into gingerbread
Merge commit 'f3de053c0a525f85f763ab9b8781ae95ef3e930e' into gingerbread-plus-aosp

* commit 'f3de053c0a525f85f763ab9b8781ae95ef3e930e':
  Instead of asserting return a runtime error if the maximum sample size cannot be determined.
2010-09-09 10:15:33 -07:00
James Dong
e19df3dca1 am 5c43a7af: Merge "When 32-bit offset is used, if the requested max file size is greater than the 32-bit offset limit, set the limit to the max 32-bit offset limit." into gingerbread
Merge commit '5c43a7af7b9530016b922ddec0401ab9199cd595' into gingerbread-plus-aosp

* commit '5c43a7af7b9530016b922ddec0401ab9199cd595':
  When 32-bit offset is used,
2010-09-09 10:15:29 -07:00
Andreas Huber
f3de053c0a Merge "Instead of asserting return a runtime error if the maximum sample size cannot be determined." into gingerbread 2010-09-09 10:13:26 -07:00
James Dong
5c43a7af7b Merge "When 32-bit offset is used, if the requested max file size is greater than the 32-bit offset limit, set the limit to the max 32-bit offset limit." into gingerbread 2010-09-09 10:13:08 -07:00
Andreas Huber
d7f2225e74 Instead of asserting return a runtime error if the maximum sample size cannot be determined.
Change-Id: Icf17ed04323f5415e0f9f1e4fd9f19ca60ce15ac
related-to-bug: 2602446
2010-09-09 10:10:15 -07:00
Andreas Huber
f0eab98c4e am a063cd64: Merge "Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content." into gingerbread
Merge commit 'a063cd6478254bba3290576ae5556abf469d6535' into gingerbread-plus-aosp

* commit 'a063cd6478254bba3290576ae5556abf469d6535':
  Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content.
2010-09-09 10:01:05 -07:00
Andreas Huber
3e0f2be7d6 Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content.
Change-Id: I26db4524c5306bf2346438d2bd359c5cfb95cead
related-to-bug: 2900419
2010-09-09 09:48:41 -07:00
Mike Lockwood
8624e6399d Merge "Add framework resource to specify case sensitivity of the external storage filesystem" 2010-09-09 08:28:53 -07: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
James Dong
e3aa6aa770 am 306cd58d: am d353c840: Merge "HW audio encoder expects timestamp via kKeyTime from each input buffer" into gingerbread
Merge commit '306cd58ddcc0cb8487bc6e015f8c692eea47a334'

* commit '306cd58ddcc0cb8487bc6e015f8c692eea47a334':
  HW audio encoder expects timestamp via kKeyTime from each input buffer
2010-09-08 17:57:56 -07:00
James Dong
a4fb816bd5 When 32-bit offset is used,
if the requested max file size is greater than the 32-bit offset limit,
set the limit to the max 32-bit offset limit.

Change-Id: Ie74cbed98469721d4280a0b87491e888948f0046
2010-09-08 17:56:11 -07:00
James Dong
306cd58ddc am d353c840: Merge "HW audio encoder expects timestamp via kKeyTime from each input buffer" into gingerbread
Merge commit 'd353c840ad5bf1b4e6bfba0e10bcdc79223bcdf7' into gingerbread-plus-aosp

* commit 'd353c840ad5bf1b4e6bfba0e10bcdc79223bcdf7':
  HW audio encoder expects timestamp via kKeyTime from each input buffer
2010-09-08 17:54:28 -07:00
James Dong
d353c840ad Merge "HW audio encoder expects timestamp via kKeyTime from each input buffer" into gingerbread 2010-09-08 17:51:59 -07:00
James Dong
d015ccf62b HW audio encoder expects timestamp via kKeyTime from each input buffer
- This fixes media server crashes on droid

Change-Id: I7191cadc5275107425ec3ee3d437b2c5295858dc
2010-09-08 17:28:57 -07:00
Eric Laurent
15ff01cdb4 am e126119c: am 95d86480: Merge "Modify type of some environmental reverb parameters" into gingerbread
Merge commit 'e126119c3a406bc564f2549aeb1416aff112689d'

* commit 'e126119c3a406bc564f2549aeb1416aff112689d':
  Modify type of some environmental reverb parameters
2010-09-08 17:22:54 -07:00
Eric Laurent
e126119c3a am 95d86480: Merge "Modify type of some environmental reverb parameters" into gingerbread
Merge commit '95d8648054223a501fe5390edef7e5d9383a4be8' into gingerbread-plus-aosp

* commit '95d8648054223a501fe5390edef7e5d9383a4be8':
  Modify type of some environmental reverb parameters
2010-09-08 17:19:43 -07:00
Eric Laurent
95d5de0681 Modify type of some environmental reverb parameters
Changed type of decay time, reverb delay and reflections delay parameters
from signed to unsigned int to match OpenSL ES interface definition.

Also fixed some type casts in lvm reverb wrapper.

Change-Id: I5ca5e76a87c2590f01f031f3168355586ef22556
2010-09-08 16:06:18 -07: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
Andreas Huber
94e6b66237 Don't assert on unexpected surface flinger dequeue/enqueueBuffer errors, log a warning and ignore them instead.
Change-Id: Ia45887df82d66f393520e5a4308f430010402d5e
related-to-bug: 2976248
2010-09-07 14:11:47 -07: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
Nipun Kwatra
4a857e620f Moving decision to use still camera to CameraSourceTimeLapse
CameraSourceTimeLapse now decides whether to use still or video
camera automatically. It checks if the passed in size is a valid
preview size and if it is, then uses the video camera else uses
the still camera.

Removed from StagefrightRecorder the support to set parameter
useStillCameraForTimeLapse.

Change-Id: I71f5b0fc7080ca524792381efe918d22e41a7f36
2010-09-03 17:09:36 -07:00
Eric Laurent
bcb284c196 am ef9e508c: am 7e427934: Merge "LVM release 1.08 delivery." into gingerbread
Merge commit 'ef9e508c2cb3b52d31250ceca3dddace17cec950'

* commit 'ef9e508c2cb3b52d31250ceca3dddace17cec950':
  LVM release 1.08 delivery.
2010-09-03 16:52:31 -07:00
James Dong
c4e7be5be9 am d6fd133d: am 9077f8ec: Merge "Not all audio source has the drift time information" into gingerbread
Merge commit 'd6fd133d18c189ab112daef9dc649d0796df5d99'

* commit 'd6fd133d18c189ab112daef9dc649d0796df5d99':
  Not all audio source has the drift time information
2010-09-03 16:51:50 -07:00
Eric Laurent
ef9e508c2c am 7e427934: Merge "LVM release 1.08 delivery." into gingerbread
Merge commit '7e427934e69db804f3ee803e6ffeef4a339e9b8b' into gingerbread-plus-aosp

* commit '7e427934e69db804f3ee803e6ffeef4a339e9b8b':
  LVM release 1.08 delivery.
2010-09-03 16:39:59 -07:00
Eric Laurent
7e427934e6 Merge "LVM release 1.08 delivery." into gingerbread 2010-09-03 16:35:54 -07:00
James Dong
d6fd133d18 am 9077f8ec: Merge "Not all audio source has the drift time information" into gingerbread
Merge commit '9077f8ec931a4c080948a85ce2e0f793f65e9b62' into gingerbread-plus-aosp

* commit '9077f8ec931a4c080948a85ce2e0f793f65e9b62':
  Not all audio source has the drift time information
2010-09-03 15:45:01 -07:00
James Dong
9077f8ec93 Merge "Not all audio source has the drift time information" into gingerbread 2010-09-03 15:42:09 -07:00
Eric Laurent
5fa6df6ebf LVM release 1.08 delivery.
- Changed bundle SamplesToExit to 0.1 secs
- Added SamplesToExit to Revreb
- Removed mixer from Core reverb

Change-Id: I675ec22889f20ef35a0ac427600c2654111c397e
2010-09-03 15:22:18 -07:00