2268 Commits

Author SHA1 Message Date
James Dong
085d0f55e6 am 10f8baa4: am 42ef0c71: Initial check-in for software m4v_h263 encoder
Merge commit '10f8baa46cc32f0024b3c65b1e6d0c01bf4ceefd'

* commit '10f8baa46cc32f0024b3c65b1e6d0c01bf4ceefd':
  Initial check-in for software m4v_h263 encoder
2010-07-15 23:04:48 -07:00
James Dong
10f8baa46c am 42ef0c71: Initial check-in for software m4v_h263 encoder
Merge commit '42ef0c715da879a9878b7bf4eb9c90b21e4ab8ae' into gingerbread-plus-aosp

* commit '42ef0c715da879a9878b7bf4eb9c90b21e4ab8ae':
  Initial check-in for software m4v_h263 encoder
2010-07-15 14:37:33 -07:00
James Dong
42ef0c715d Initial check-in for software m4v_h263 encoder
Change-Id: I4b49fa5c3a5e6e21cfd2419441d98dd784046367
2010-07-15 13:28:21 -07:00
Dave Sparks
aaa7a0ce47 Merge "Add some javadoc to AudioRecord, plus updates based on code review comments." 2010-07-15 12:35:52 -07:00
Mike Lockwood
3864d243a9 Merge changes I93364c74,I5ca831b8
* changes:
  Exclude MTP implementation from simulator build
  Fixes for simulator build on lucid
2010-07-15 12:31:08 -07:00
Mike Lockwood
ff164a7d6f Exclude MTP implementation from simulator build
Change-Id: I93364c74c26ba6e2bf6b08f1bd82802b966c8dfb
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-15 15:27:38 -04:00
Mike Lockwood
5a23f8c41e Fixes for simulator build on lucid
strchr and strrchr now return const char* instead of char*

Change-Id: I5ca831b8951af7e6306eb9d9d6f78ed2ec13d649
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-15 15:02:52 -04:00
James Dong
892681e56e am b068b47c: am d6a85a21: Merge "Support user-supplied timescales for authoring" into gingerbread
Merge commit 'b068b47c6d0214256116a0c661740bddf7acc18c'

* commit 'b068b47c6d0214256116a0c661740bddf7acc18c':
  Support user-supplied timescales for authoring
2010-07-15 11:54:10 -07:00
James Dong
b068b47c6d am d6a85a21: Merge "Support user-supplied timescales for authoring" into gingerbread
Merge commit 'd6a85a21418338a7797bff731fa7a551f62a9e86' into gingerbread-plus-aosp

* commit 'd6a85a21418338a7797bff731fa7a551f62a9e86':
  Support user-supplied timescales for authoring
2010-07-15 11:18:53 -07:00
James Dong
d6a85a2141 Merge "Support user-supplied timescales for authoring" into gingerbread 2010-07-15 11:16:08 -07:00
Mike Lockwood
9c7fdf521b Remove our copy of the f_mtp.h kernel header, now that it is in bionic.
Change-Id: I2b5e72bf25b3525ace4b919c6e8b6bd6750f6dfa
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-15 13:37:43 -04:00
Mathias Agopian
0779682a49 am 78983a91: am 4055b780: Merge "move native services under services/" into gingerbread
Merge commit '78983a9133d3dd3f08b1ec462a7e2f9e7bfa9e2f'

* commit '78983a9133d3dd3f08b1ec462a7e2f9e7bfa9e2f':
  move native services under services/
2010-07-14 18:48:58 -07:00
Mathias Agopian
78983a9133 am 4055b780: Merge "move native services under services/" into gingerbread
Merge commit '4055b780bb7e85abcf4754b84e50bf407c45bec8' into gingerbread-plus-aosp

* commit '4055b780bb7e85abcf4754b84e50bf407c45bec8':
  move native services under services/
2010-07-14 18:45:56 -07:00
Mathias Agopian
08e83bb3b7 move native services under services/
moved surfaceflinger, audioflinger, cameraservice

all native services should now reside in this location.

Change-Id: Iee42b83dd2a94c3bf5107ab0895fe2dfcd5337a8
2010-07-14 17:59:35 -07:00
James Dong
52d13f01a6 Support user-supplied timescales for authoring
- also, change all the real time unit to microseconds in MPEG4Writer

Change-Id: I260f512f2eb670ade7b8858a56335a5d639de756
2010-07-14 17:29:17 -07:00
Dan Tasse
635fefec06 Add some javadoc to AudioRecord, plus updates based on code review comments.
Change-Id: I0087e7df7541b336f87c7af512c3e8f3897be72c
2010-07-14 15:30:55 -07:00
Mike Lockwood
e31135a05e Merge "MtpDatabase: Implement getObjectProperty" 2010-07-14 12:44:41 -07:00
Mike Lockwood
b2cada9034 MtpDatabase: Implement getObjectProperty
Change-Id: Iab5f2c0e0b2b3effa3eaa3cb18415d28db5c790a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-14 15:44:06 -04:00
Jean-Michel Trivi
0224a00421 am 5473434f: am 97eb728a: Use the OpenSL ES definition of SL_IID_EQUALIZER for the EQ effect UUID instead of defining it locally.
Merge commit '5473434f060d8c036a30a1992b036a2f70da265d'

* commit '5473434f060d8c036a30a1992b036a2f70da265d':
  Use the OpenSL ES definition of SL_IID_EQUALIZER for the EQ
2010-07-14 11:15:31 -07:00
Jean-Michel Trivi
5473434f06 am 97eb728a: Use the OpenSL ES definition of SL_IID_EQUALIZER for the EQ effect UUID instead of defining it locally.
Merge commit '97eb728aef51646b86925557a36732598e3fbaa1' into gingerbread-plus-aosp

* commit '97eb728aef51646b86925557a36732598e3fbaa1':
  Use the OpenSL ES definition of SL_IID_EQUALIZER for the EQ
2010-07-14 11:12:14 -07:00
Jean-Michel Trivi
97eb728aef Use the OpenSL ES definition of SL_IID_EQUALIZER for the EQ
effect UUID instead of defining it locally.

Change-Id: Id6018fef20d286899cf7503fec3521dcd56db7e0
2010-07-14 10:09:31 -07:00
Mike Lockwood
e2ce261674 Merge "MTP: Add support for sending events to the host when objects are added and removed" 2010-07-13 17:14:45 -07:00
Mike Lockwood
be125a50b4 MTP: Add support for sending events to the host when objects are added and removed
Change-Id: Ia1d5232b919c644c670ff9ca651eca92b3f9ad42
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-13 20:04:22 -04:00
James Dong
c9cf223dd0 am 7a72f848: am 70c6c9a1: Fix simulator build - missing header file <string.h> - need to define -D__arm__
Merge commit '7a72f84801c3ad74f00f5d3d0da7e2212d07a911'

* commit '7a72f84801c3ad74f00f5d3d0da7e2212d07a911':
  Fix simulator build
2010-07-13 13:46:07 -07:00
James Dong
7a72f84801 am 70c6c9a1: Fix simulator build - missing header file <string.h> - need to define -D__arm__
Merge commit '70c6c9a1e2240e82d8eb442b34efa9629ef2bba4' into gingerbread-plus-aosp

* commit '70c6c9a1e2240e82d8eb442b34efa9629ef2bba4':
  Fix simulator build
2010-07-13 13:43:39 -07:00
James Dong
70c6c9a1e2 Fix simulator build
- missing header file <string.h>
- need to define -D__arm__

Change-Id: I18d2f1908684150784cf728234b5aedbc02447d1
2010-07-13 13:29:33 -07:00
Eric Laurent
405278954f am 66fa2b44: am 8e886be4: Merge "Modifications in audio effect engine state management." into gingerbread
Merge commit '66fa2b44cadf8694cc1b7e2aae1f8abaff4fc547'

* commit '66fa2b44cadf8694cc1b7e2aae1f8abaff4fc547':
  Modifications in audio effect engine state management.
2010-07-13 12:33:47 -07:00
Eric Laurent
66fa2b44ca am 8e886be4: Merge "Modifications in audio effect engine state management." into gingerbread
Merge commit '8e886be413570fab6c623930a5775dd36a6d11e1' into gingerbread-plus-aosp

* commit '8e886be413570fab6c623930a5775dd36a6d11e1':
  Modifications in audio effect engine state management.
2010-07-13 12:31:35 -07:00
Eric Laurent
8e886be413 Merge "Modifications in audio effect engine state management." into gingerbread 2010-07-13 12:29:17 -07:00
Eric Laurent
7d850f23c8 Modifications in audio effect engine state management.
- Separate the updating of effect engine state from the process call in EffectModule so that the state
of all effects in the same effect chain is updated simultaneusly before all process functions are called.
- Added a mechanism for the effect engine to continue being called for processing after receiving the disable
commands untils it considers that the framework can stop calling the process function without causing
a glitch or loosing some effect tail.
- Updated test reverb and equalizer to support this new feature

Change-Id: Icb56ae2c84c076d4dbad6cf733b1a62f823febe7
2010-07-13 12:27:18 -07:00
James Dong
fc0d81c642 am f6bdc764: am 9d8bea11: Merge "Initial checkin for software AVC encoder" into gingerbread
Merge commit 'f6bdc764b7a21f8037504e1dc4f81227ea2bedea'

* commit 'f6bdc764b7a21f8037504e1dc4f81227ea2bedea':
  Initial checkin for software AVC encoder
2010-07-13 11:04:27 -07:00
James Dong
f6bdc764b7 am 9d8bea11: Merge "Initial checkin for software AVC encoder" into gingerbread
Merge commit '9d8bea11892a43eeab2a1119d68740845a8894e5' into gingerbread-plus-aosp

* commit '9d8bea11892a43eeab2a1119d68740845a8894e5':
  Initial checkin for software AVC encoder
2010-07-13 11:01:37 -07:00
James Dong
1cc31e629e Initial checkin for software AVC encoder
- Since the software encoder assumes the input is YUV420 planar,
  color conversion needs to be added when the input color format
  does not meet the requirement. With this patch, I only added
  a single color conversion from YUV420 semi planar to YUV420
  planar. We can add more as we go.

Change-Id: If8640c9e5a4f73d385ae9bb2022e57f7f62b91b9
2010-07-13 10:58:20 -07:00
Mike Lockwood
d815f79766 Integrate host to device file transfer with the media provider.
MTP file transfers happen in two stages.  The SendObjectInfo command sends
some information about the file and reserves an ObjectHandle for the new file.
The file transfer is then performed using the SendObject command.

To support this in the media provider, MtpDatabase.beginSendObject receives
the information from SendObjectInfo and creates an row for it in the MTP objects
table for the new file.  After the file transfer has completed, then
MtpDatabase.endSendObject is called.  In endSendObject, we run the media scanner
on the new file, which will add a row to the images, audio, video
or audio playlist table.

To avoid the media scanner creating a second row for the file in the MTP objects
table, we pass the ObjectHandle created in beginSendObject to the media scanner,
which then passes it to the media provider via the content values when it
performs its insert.

Change-Id: I1ebcc63d6bd4404b0d3a93c703a9d3c097381d3a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-12 14:01:22 -04:00
Jean-Michel Trivi
90787e053a am bd3f8b71: am e7b790f1: Merge "Fix swap of sessionId and output in audio effect API." into gingerbread
Merge commit 'bd3f8b711643a172703537e34a0fa7c21c5b953f'

* commit 'bd3f8b711643a172703537e34a0fa7c21c5b953f':
  Fix swap of sessionId and output in audio effect API.
2010-07-09 12:34:03 -07:00
Jean-Michel Trivi
bd3f8b7116 am e7b790f1: Merge "Fix swap of sessionId and output in audio effect API." into gingerbread
Merge commit 'e7b790f1f77a0950c163fc82d8833072ccf6f3c5' into gingerbread-plus-aosp

* commit 'e7b790f1f77a0950c163fc82d8833072ccf6f3c5':
  Fix swap of sessionId and output in audio effect API.
2010-07-09 12:32:21 -07:00
Jean-Michel Trivi
e7b790f1f7 Merge "Fix swap of sessionId and output in audio effect API." into gingerbread 2010-07-09 12:30:28 -07:00
Jean-Michel Trivi
4cb15cf15d Fix swap of sessionId and output in audio effect API.
Change-Id: Idc93415efef92087507401e50cfb235a6f1f7ed7
2010-07-09 12:11:49 -07:00
James Dong
020057bd53 am a60337ce: am 6bb14e08: Merge "Enable the support for decoding audio with AAC+ and eAAC+ features" into gingerbread
Merge commit 'a60337ce578f91926a5e8ea30cb47740b994fc96'

* commit 'a60337ce578f91926a5e8ea30cb47740b994fc96':
  Enable the support for decoding audio with AAC+ and eAAC+ features
2010-07-09 11:43:59 -07:00
James Dong
a60337ce57 am 6bb14e08: Merge "Enable the support for decoding audio with AAC+ and eAAC+ features" into gingerbread
Merge commit '6bb14e08da82e72197f35548ff77a2f817c52a58' into gingerbread-plus-aosp

* commit '6bb14e08da82e72197f35548ff77a2f817c52a58':
  Enable the support for decoding audio with AAC+ and eAAC+ features
2010-07-09 11:41:08 -07:00
James Dong
5fe0ae8c20 am 4f440632: am 929642ee: Add runtime dumpsys support for media recorder client
Merge commit '4f4406322dafd6e128b437edbc541327f0b38d04'

* commit '4f4406322dafd6e128b437edbc541327f0b38d04':
  Add runtime dumpsys support for media recorder client
2010-07-09 09:20:03 -07:00
Mike Lockwood
c5c7853b63 Remove some scafolding and test code that is no longer worth maintaining.
Change-Id: I9ee62d2463d8df1246a84774e8ac7e674778279a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-09 11:07:55 -04:00
James Dong
a7c14078af Enable the support for decoding audio with AAC+ and eAAC+ features
bug - 282684

Change-Id: I73c8377af3cc4edd3ee7cea86dc3b1c369fbd78b
2010-07-08 21:37:46 -07:00
James Dong
4f4406322d am 929642ee: Add runtime dumpsys support for media recorder client
Merge commit '929642ee003895b6e4e85ad7e43c7c6f01b29020' into gingerbread-plus-aosp

* commit '929642ee003895b6e4e85ad7e43c7c6f01b29020':
  Add runtime dumpsys support for media recorder client
2010-07-08 21:37:43 -07:00
James Dong
929642ee00 Add runtime dumpsys support for media recorder client
Change-Id: I4c8a81720f3be2db54678a7e84fe12849255046b
2010-07-08 21:25:55 -07:00
Eric Laurent
0f399ec640 am b4b0f67a: am fd84f97a: Added JAVA classes to control bass boost, equalizer, reverberation and virtualizer Effects.
Merge commit 'b4b0f67a4743503a024b1dce758acf53d9fb86f7'

* commit 'b4b0f67a4743503a024b1dce758acf53d9fb86f7':
  Added JAVA classes to control bass boost, equalizer, reverberation and virtualizer Effects.
2010-07-08 19:10:46 -07:00
Eric Laurent
b4b0f67a47 am fd84f97a: Added JAVA classes to control bass boost, equalizer, reverberation and virtualizer Effects.
Merge commit 'fd84f97af4b44d54bba53bb85b31a6dbce07f6e2' into gingerbread-plus-aosp

* commit 'fd84f97af4b44d54bba53bb85b31a6dbce07f6e2':
  Added JAVA classes to control bass boost, equalizer, reverberation and virtualizer Effects.
2010-07-08 16:14:31 -07:00
Eric Laurent
fd84f97af4 Added JAVA classes to control bass boost, equalizer, reverberation and virtualizer Effects.
Defined the following JAVA classes on top of AudioEffect class to facilitate control
off built-in audio effects with APIs aligned with interfaces defined in OpenSL ES
specification:
- BastBoot.java
- Equalizer.java
- PresetReverb.java
- EnvironmentalReverb.java
- Virtualizer.java

Split reverb API header file in two, one for preset reverb and one for environmental reverb.
Some changes in test reverb to support preset reverb.

Change-Id: Ie0a5ba06002e63dfd6da22cace5568c1e0b76ea1
2010-07-08 15:32:51 -07:00
Mike Lockwood
d21eac9c70 MTP: Use media provider database to implement MTP device support.
Uses a new "MTP objects" table in the media provider to support basic
enumeration of the external storage file system.
Support for accessing audio, video and image metadata in the existing
media provider tables will be added in a later commit.

The C++ MtpDatabase class is now abstract, to support a proxy subclass that
calls through JNI to the Java MtpDatabase class in the media provider.

Change-Id: I90f0db5f3acc5d35ae78c27a8507edff16d14305
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-08 16:21:09 -04:00
Mike Lockwood
2d6c9e9c4e MTP: remove separate audio table from prototype MTP database
Change-Id: I5e4b49b741a0a3c6ddf5afcbb20a0d7c9515c8ce
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-08 16:02:16 -04:00