2810 Commits

Author SHA1 Message Date
Eric Laurent
bb7684bafa resolved conflicts for merge of ac4a284a to master
Change-Id: Ia644f67b5d7d7e7137eef2284e9533b5819c12d8
2010-09-23 12:22:44 -07:00
Eric Laurent
ac4a284ab4 am 7864c72b: Merge "Fix issue 3022800." into gingerbread
Merge commit '7864c72b91a21eeb282e2e38d688fbbc3cd3ecb8' into gingerbread-plus-aosp

* commit '7864c72b91a21eeb282e2e38d688fbbc3cd3ecb8':
  Fix issue 3022800.
2010-09-23 11:34:40 -07:00
Eric Laurent
1a5149e5d7 Fix issue 3022800.
- Created sub-package android.media.audiofx for audio effects.
- Hid AudioEffect class contructor, methods and variables not needed by
applications
- Added more javadoc comments for AudioEffect Class

Change-Id: Ibbb40d4e714bb248aa32cf82d7763d74efae96d1
2010-09-23 11:04:03 -07:00
James Dong
3611a0ef06 am 693a430c: am 903fc221: Ignore errors from correction parameter query and config for M4v and H263 encoders
Merge commit '693a430cff3c9fac503b5005e9fd5419611eddde'

* commit '693a430cff3c9fac503b5005e9fd5419611eddde':
  Ignore errors from correction parameter query and config for M4v and H263 encoders
2010-09-23 10:28:21 -07:00
James Dong
a03f8fb7d0 am 30c7e132: am 697bd76e: Merge "Use the advertised profile and level from M4V and H263 video encoders" into gingerbread
Merge commit '30c7e132171edf41a787d6e29d169ac467f6f1ae'

* commit '30c7e132171edf41a787d6e29d169ac467f6f1ae':
  Use the advertised profile and level from M4V and H263 video encoders
2010-09-23 10:24:37 -07:00
James Dong
693a430cff am 903fc221: Ignore errors from correction parameter query and config for M4v and H263 encoders
Merge commit '903fc221068d02bdb53ba2a48f86339caf405259' into gingerbread-plus-aosp

* commit '903fc221068d02bdb53ba2a48f86339caf405259':
  Ignore errors from correction parameter query and config for M4v and H263 encoders
2010-09-23 10:21:26 -07:00
James Dong
30c7e13217 am 697bd76e: Merge "Use the advertised profile and level from M4V and H263 video encoders" into gingerbread
Merge commit '697bd76e427f00584a0e026ceca2f4d39215cd0d' into gingerbread-plus-aosp

* commit '697bd76e427f00584a0e026ceca2f4d39215cd0d':
  Use the advertised profile and level from M4V and H263 video encoders
2010-09-23 10:17:30 -07:00
James Dong
903fc22106 Ignore errors from correction parameter query and config for M4v and H263 encoders
This feature is not essential for camcorder application

Change-Id: Id560632207dcf24fe361280ebe8178ea7332f22d
2010-09-23 10:12:45 -07:00
Mike Lockwood
ff371cf0ed MediaScanner: disable album artist support until MediaProvider really supports it
Fixes a "no such column" exception in MediaProvider.update() that I somehow
missed when testing the MediaProvider refactoring.

Change-Id: Icc502a5c0e3bd150b353972d000b978a9e044abc
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-22 23:25:33 -04:00
Mike Lockwood
a9158425cc Merge "Changes to support MediaProvider refactoring" 2010-09-22 18:50:06 -07:00
James Dong
1e0e166ebe Use the advertised profile and level from M4V and H263 video encoders
This is already the case for AVC video encoder

Change-Id: I9cc97a03ab457b4bd0b21832c09f6d0aa7f5fc39
2010-09-22 17:42:09 -07:00
Eric Laurent
736da9cd1f am 4744774a: am 3efbc555: Merge "Fix more audio effects auto tests" into gingerbread
Merge commit '4744774a7a3644489ec1159f5554a41eb943a51b'

* commit '4744774a7a3644489ec1159f5554a41eb943a51b':
  Fix more audio effects auto tests
2010-09-22 17:03:41 -07:00
Eric Laurent
4744774a7a am 3efbc555: Merge "Fix more audio effects auto tests" into gingerbread
Merge commit '3efbc55545673f3988cb1b2934b903d78f8873cd' into gingerbread-plus-aosp

* commit '3efbc55545673f3988cb1b2934b903d78f8873cd':
  Fix more audio effects auto tests
2010-09-22 15:59:28 -07:00
Eric Laurent
3efbc55545 Merge "Fix more audio effects auto tests" into gingerbread 2010-09-22 15:53:49 -07:00
Andreas Huber
2de0a50a9a am a72bb404: Merge "Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs." into gingerbread
Merge commit 'a72bb404ceb11ac551825226eb75d2a280deb1b2' into gingerbread-plus-aosp

* commit 'a72bb404ceb11ac551825226eb75d2a280deb1b2':
  Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs.
2010-09-22 15:38:43 -07:00
Andreas Huber
9c37da7721 Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs.
Change-Id: I73974a336852974e2fb95a9626c1a96f296449eb
2010-09-22 15:27:20 -07:00
Eric Laurent
ec1e9c7a44 Fix more audio effects auto tests
commit 672c0dc3a04cb149691603342c319994e21235cb broke the energy probe
used by auto tests to verify that an effect is actually enabled.
The probe is based on the Visualizer which now scales the capture to maximise
the signal level: this prevents from detecting level changes between subsequent captures.
Playing sound at a lower volume moves the signal level out of the range where
scalling occurs and makes comparison possible again.

Change-Id: Ib56dec6e619c6d778dcc3ca6453091bf6136f290
2010-09-22 13:49:52 -07:00
Mike Lockwood
5a08b50e80 Merge "MTP host: Use Java longs for storage and object IDs" 2010-09-22 12:33:35 -07:00
Andreas Huber
cc6b941cf0 am 4374b23d: Merge "Make sure we drain the avc software decoder\'s output queue once we run out of input data." into gingerbread
Merge commit '4374b23d6be406710b91be746229e6c548613410' into gingerbread-plus-aosp

* commit '4374b23d6be406710b91be746229e6c548613410':
  Make sure we drain the avc software decoder's output queue once we run out of input data.
2010-09-22 12:25:13 -07:00
Andreas Huber
55f8aee55c Make sure we drain the avc software decoder's output queue once we run out of input data.
Change-Id: I3d92ebae4951b618a6dfcf42936cc4c63d4de539
2010-09-22 11:47:00 -07:00
Andreas Huber
f5a8f2f463 Merge "Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs." into gingerbread 2010-09-22 10:15:57 -07:00
Andreas Huber
583df4ff73 Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs.
Change-Id: I0650af10acb3097e9f03c6079992305540b6bc86
2010-09-22 10:13:21 -07:00
Andreas Huber
31e323e6c8 Merge "Make sure we drain the avc software decoder's output queue once we run out of input data." into gingerbread 2010-09-22 10:11:51 -07:00
Andreas Huber
3172ab4798 Make sure we drain the avc software decoder's output queue once we run out of input data.
Change-Id: I5de540675a64ac0b170eee10691d77a647950397
2010-09-22 10:06:56 -07:00
Eric Laurent
48ff0daae3 am b35f36f0: am 4f294558: Merge "Fix broken insert reverb auto tests." into gingerbread
Merge commit 'b35f36f08ddc59fb0e264aff9de4d465321b26ca'

* commit 'b35f36f08ddc59fb0e264aff9de4d465321b26ca':
  Fix broken insert reverb auto tests.
2010-09-22 09:42:59 -07:00
Eric Laurent
b35f36f08d am 4f294558: Merge "Fix broken insert reverb auto tests." into gingerbread
Merge commit '4f294558aa23bc155988838ef153dca731efe707' into gingerbread-plus-aosp

* commit '4f294558aa23bc155988838ef153dca731efe707':
  Fix broken insert reverb auto tests.
2010-09-22 09:38:46 -07:00
Eric Laurent
4f294558aa Merge "Fix broken insert reverb auto tests." into gingerbread 2010-09-22 09:34:00 -07:00
Eric Laurent
71fe631c78 Fix broken insert reverb auto tests.
commit 27a2fdfb8ad1606bdb686c35e30ae894dd037588 changed the
insert reverb behavior when it is attached to a track in that
the reverb tail is silenced immediately when the track is paused.
The tests have been modified to test the insert reverb on session 0.

Change-Id: I90c6fec40167966853acfeaa4dec2b96f9e7839f
2010-09-22 09:02:23 -07:00
Eric Laurent
dab59d1534 am 6943b94b: am a6dc4699: Merge "Fix issue 2913071." into gingerbread
Merge commit '6943b94b8f267c83060946bae0961efc30444dee'

* commit '6943b94b8f267c83060946bae0961efc30444dee':
  Fix issue 2913071.
2010-09-21 16:53:20 -07:00
Eric Laurent
6943b94b8f am a6dc4699: Merge "Fix issue 2913071." into gingerbread
Merge commit 'a6dc4699222a484222d1c54d5319f302a02e406b' into gingerbread-plus-aosp

* commit 'a6dc4699222a484222d1c54d5319f302a02e406b':
  Fix issue 2913071.
2010-09-21 15:59:23 -07:00
Eric Laurent
a6dc469922 Merge "Fix issue 2913071." into gingerbread 2010-09-21 15:55:17 -07:00
Andreas Huber
55e024a925 am 0b2affe8: am 87d208f7: Merge "This log message is codec specific." into gingerbread
Merge commit '0b2affe8f05f887fcb6ae6314e2a0e586dabe9e1'

* commit '0b2affe8f05f887fcb6ae6314e2a0e586dabe9e1':
  This log message is codec specific.
2010-09-21 15:25:42 -07:00
Andreas Huber
41fd0a0fa9 am af909581: am 67738486: Merge "Remove stagefright foundation\'s incompatible logging interface and update callsites." into gingerbread
Merge commit 'af90958184fc5cfa1a4190e28bcfc4fdd4a5bcd6'

* commit 'af90958184fc5cfa1a4190e28bcfc4fdd4a5bcd6':
  Remove stagefright foundation's incompatible logging interface and update callsites.
2010-09-21 15:22:00 -07:00
Andreas Huber
0b2affe8f0 am 87d208f7: Merge "This log message is codec specific." into gingerbread
Merge commit '87d208f7ea7d8fc518d1403aae6d1ba1833bff13' into gingerbread-plus-aosp

* commit '87d208f7ea7d8fc518d1403aae6d1ba1833bff13':
  This log message is codec specific.
2010-09-21 15:20:38 -07:00
Andreas Huber
af90958184 am 67738486: Merge "Remove stagefright foundation\'s incompatible logging interface and update callsites." into gingerbread
Merge commit '67738486d9d1bdc2e6fb0c04698fd74de689acbc' into gingerbread-plus-aosp

* commit '67738486d9d1bdc2e6fb0c04698fd74de689acbc':
  Remove stagefright foundation's incompatible logging interface and update callsites.
2010-09-21 15:17:42 -07:00
Andreas Huber
87d208f7ea Merge "This log message is codec specific." into gingerbread 2010-09-21 15:17:04 -07:00
Andreas Huber
67738486d9 Merge "Remove stagefright foundation's incompatible logging interface and update callsites." into gingerbread 2010-09-21 15:14:43 -07:00
Andreas Huber
6e3fa444c5 Remove stagefright foundation's incompatible logging interface and update callsites.
Change-Id: I45fba7d60530ea0f233ac3695a97306b6dc1795c
2010-09-21 15:12:19 -07:00
Eric Laurent
672c0dc3a0 Fix issue 2913071.
Scale audio signal during capture according to peak level so that
returned values on 8 bits contain enough information even for weak
signals.

Also do not reject requests to enable/disable the visualizer if we are
already in the requested state.

Change-Id: I07a705619764350834e61f82d161761eab688747
2010-09-21 15:11:50 -07:00
Andreas Huber
af0a1883b8 This log message is codec specific.
Change-Id: I603ae7bd13b186a6df0a26ea9abe073e89276caf
2010-09-21 15:08:52 -07:00
Gil Dobjanschi
c2087e3c7a Merge "Added the behavior paramter to transition constructors" 2010-09-21 13:09:49 -07:00
Gil Dobjanschi
590f87fe9a Added the behavior paramter to transition constructors
Change-Id: Ic8758fb81e9b9c30982f3ced2d9fffc3439b7c7e
2010-09-21 13:08:03 -07:00
Eric Laurent
8dc81c1014 am 96d5c17e: am 8d1513e1: Merge "Made audio effect control panel intents public." into gingerbread
Merge commit '96d5c17e7828f1a5cbeb3d87e0146d145870558f'

* commit '96d5c17e7828f1a5cbeb3d87e0146d145870558f':
  Made audio effect control panel intents public.
2010-09-21 10:56:30 -07:00
Eric Laurent
96d5c17e78 am 8d1513e1: Merge "Made audio effect control panel intents public." into gingerbread
Merge commit '8d1513e13c1e3d0142423570c0028e147bf0ea37' into gingerbread-plus-aosp

* commit '8d1513e13c1e3d0142423570c0028e147bf0ea37':
  Made audio effect control panel intents public.
2010-09-21 10:52:27 -07:00
Eric Laurent
8d1513e13c Merge "Made audio effect control panel intents public." into gingerbread 2010-09-21 10:47:17 -07:00
Eric Laurent
92cf2d6085 Made audio effect control panel intents public.
Change-Id: If927606a24966605eb3e02788b2477937349d518
2010-09-21 10:45:41 -07:00
James Dong
1d2f450680 am e436ef09: am e5206694: Merge "Another attempt for fixing AAC+/eAAC+ related issue" into gingerbread
Merge commit 'e436ef09d205eee473d5a4a4d0a1721b8dfbe193'

* commit 'e436ef09d205eee473d5a4a4d0a1721b8dfbe193':
  Another attempt for fixing AAC+/eAAC+ related issue
2010-09-21 10:45:13 -07:00
James Dong
e436ef09d2 am e5206694: Merge "Another attempt for fixing AAC+/eAAC+ related issue" into gingerbread
Merge commit 'e5206694174d2140e662832425665ec3890fcc73' into gingerbread-plus-aosp

* commit 'e5206694174d2140e662832425665ec3890fcc73':
  Another attempt for fixing AAC+/eAAC+ related issue
2010-09-21 10:24:10 -07:00
Mike Lockwood
f1f5361e32 MTP host: Use Java longs for storage and object IDs
This avoids problems with unsigned 32 bit numbers with cameras that use
storage and object IDs > 0x7FFFFFFF

Change-Id: I615f2d468851e9d6ff8882d22966d3687697d8eb
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-21 10:41:33 -04:00
James Dong
40da64f07b Another attempt for fixing AAC+/eAAC+ related issue
The decoder has to decode the very first two frames (decoder specific data + first data
frame) in order to be really sure whether a stream is AAC or AAC+/eAAC+.

bug - 2966336

Change-Id: Ib12a07285933df0d6c346370a12f70e99e811881
2010-09-20 16:05:01 -07:00