1159 Commits

Author SHA1 Message Date
Gloria Wang
9cf962809d am 3a814141: Merge change Iee0486e2 into eclair
Merge commit '3a8141416a0b1d517d4729eba4bcf914c468e20b' into eclair-mr2

* commit '3a8141416a0b1d517d4729eba4bcf914c468e20b':
  Dump media recorder PID in dumpsys media.player, and fix minor bugs.
2009-10-29 19:35:16 -07:00
Gloria Wang
a242ecf4d2 am 3a814141: Merge change Iee0486e2 into eclair
Merge commit '3a8141416a0b1d517d4729eba4bcf914c468e20b' into eclair-plus-aosp

* commit '3a8141416a0b1d517d4729eba4bcf914c468e20b':
  Dump media recorder PID in dumpsys media.player, and fix minor bugs.
2009-10-29 18:10:57 -07:00
Gloria Wang
608a2630bb Dump media recorder PID in dumpsys media.player, and fix minor bugs. 2009-10-29 15:46:37 -07:00
Andreas Huber
8650575552 am 5647eebc: am 9dba1f92: Merge change Ib482ce88 into eclair-mr2
Merge commit '5647eebc3aeef6e644b8c7587a36206d8f0d6314'

* commit '5647eebc3aeef6e644b8c7587a36206d8f0d6314':
  Revive support for video encoding in OMXCodec.
2009-10-29 14:44:36 -07:00
Andreas Huber
5647eebc3a am 9dba1f92: Merge change Ib482ce88 into eclair-mr2
Merge commit '9dba1f928021450f101013e03deacc9a0506772e' into eclair-mr2-plus-aosp

* commit '9dba1f928021450f101013e03deacc9a0506772e':
  Revive support for video encoding in OMXCodec.
2009-10-29 14:00:16 -07:00
Android (Google) Code Review
9dba1f9280 Merge change Ib482ce88 into eclair-mr2
* changes:
  Revive support for video encoding in OMXCodec.
2009-10-29 16:20:43 -04:00
Andreas Huber
b482ce8837 Revive support for video encoding in OMXCodec. 2009-10-29 12:02:48 -07:00
Patrick Scott
590dfffe1a am 9ad42745: am 9d73409e: Merge change Ic5e3d73f into eclair-mr2
Merge commit '9ad4274588374df796f7fb9f35d44476fc50c8de'

* commit '9ad4274588374df796f7fb9f35d44476fc50c8de':
  LOG_ASSERT needs a message.
2009-10-29 08:40:25 -07:00
Patrick Scott
9ad4274588 am 9d73409e: Merge change Ic5e3d73f into eclair-mr2
Merge commit '9d73409e76000f06a7ee3395241154a029152483' into eclair-mr2-plus-aosp

* commit '9d73409e76000f06a7ee3395241154a029152483':
  LOG_ASSERT needs a message.
2009-10-29 08:16:44 -07:00
Android (Google) Code Review
9d73409e76 Merge change Ic5e3d73f into eclair-mr2
* changes:
  LOG_ASSERT needs a message.
2009-10-29 11:09:53 -04:00
Patrick Scott
c5e3d73f92 LOG_ASSERT needs a message.
This fails to build when asserts are turned on.
2009-10-29 08:31:36 -04:00
Jean-Michel Trivi
cd54683ef9 am 5fc26f60: am ee507eb5: am 89889733: Merge change I4e83a76a into eclair
Merge commit '5fc26f609aaf0a878bd821e9d8df96be025fe2f8'

* commit '5fc26f609aaf0a878bd821e9d8df96be025fe2f8':
  Fix bug 2201417. Whenever the System setting that indicates
2009-10-29 02:06:08 -07:00
Dave Sparks
e1513b14e7 am a628d54d: am 63733498: am 98de26e0: Merge change I8cc42c52 into eclair
Merge commit 'a628d54d108b365b66934e4b83aac739ee5ad9cc'

* commit 'a628d54d108b365b66934e4b83aac739ee5ad9cc':
  Add some logging to detect if AsyncPlayer is lagging. Bug 2201082.
2009-10-29 02:02:54 -07:00
Jean-Michel Trivi
5fc26f609a am ee507eb5: am 89889733: Merge change I4e83a76a into eclair
Merge commit 'ee507eb560319643946d73627bc7ad3e13591f2a' into eclair-mr2-plus-aosp

* commit 'ee507eb560319643946d73627bc7ad3e13591f2a':
  Fix bug 2201417. Whenever the System setting that indicates
2009-10-29 01:47:17 -07:00
Dave Sparks
a628d54d10 am 63733498: am 98de26e0: Merge change I8cc42c52 into eclair
Merge commit '6373349836237abffc3de8a3632234170bc1cfca' into eclair-mr2-plus-aosp

* commit '6373349836237abffc3de8a3632234170bc1cfca':
  Add some logging to detect if AsyncPlayer is lagging. Bug 2201082.
2009-10-29 01:44:11 -07:00
Jean-Michel Trivi
ee507eb560 am 89889733: Merge change I4e83a76a into eclair
Merge commit '898897338dfd62a268a89fb55ee900a9bd5a683f' into eclair-mr2

* commit '898897338dfd62a268a89fb55ee900a9bd5a683f':
  Fix bug 2201417. Whenever the System setting that indicates
2009-10-29 01:28:06 -07:00
Dave Sparks
6373349836 am 98de26e0: Merge change I8cc42c52 into eclair
Merge commit '98de26e06aeab9d3e6abd92080eec9ad54f537b6' into eclair-mr2

* commit '98de26e06aeab9d3e6abd92080eec9ad54f537b6':
  Add some logging to detect if AsyncPlayer is lagging. Bug 2201082.
2009-10-29 01:21:17 -07:00
Yu Shan Emily Lau
79e56a215e am f97dec83: am 42ea8dc7: am adf4b4f5: Merge change I96458368 into eclair
Merge commit 'f97dec837c1fa47250af023bbaea0566a0ec9695'

* commit 'f97dec837c1fa47250af023bbaea0566a0ec9695':
  Fixed the H263 video duation which caused the incorrect video validation.
2009-10-28 23:53:27 -07:00
Dave Sparks
52fc3989c5 am 687545fc: am 5a7691f0: am e8543418: Merge change I7c0d20a7 into eclair
Merge commit '687545fc9ee79124229152df1236c53ba7d71215'

* commit '687545fc9ee79124229152df1236c53ba7d71215':
  Run the metadataretriever at background priority. Bug 2187133.
2009-10-28 23:53:06 -07:00
Andreas Huber
d7100526c8 am 7373755a: am 013ecbfc: am 54620b1a: Merge change I6e50a8c6 into eclair
Merge commit '7373755ac391468c413f8ce4ba1f1bcc60bb1674'

* commit '7373755ac391468c413f8ce4ba1f1bcc60bb1674':
  Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."
2009-10-28 23:52:20 -07:00
Andreas Huber
d6d6db484d am e113d6af: am 76a54294: Merge change I155e2ad0 into eclair-mr2
Merge commit 'e113d6af6204dac03b13b324852fe7f741ebb3d3'

* commit 'e113d6af6204dac03b13b324852fe7f741ebb3d3':
  Re-enable CameraSource.
2009-10-28 23:45:38 -07:00
Andreas Huber
9e8ae3dfbe am b1a8f54b: am 27123468: Use a simple replacement for String8 that allocates its storage beforehand to avoid reentering the heap while we\'re examining it (leak checker).
Merge commit 'b1a8f54bf62c3974831bf3c866275425127cf7b6'

* commit 'b1a8f54bf62c3974831bf3c866275425127cf7b6':
  Use a simple replacement for String8 that allocates its storage beforehand to avoid reentering the heap while we're examining it (leak checker).
2009-10-28 23:42:25 -07:00
Yu Shan Emily Lau
f97dec837c am 42ea8dc7: am adf4b4f5: Merge change I96458368 into eclair
Merge commit '42ea8dc732b8231df497a7a21fb3b55e1346fd63' into eclair-mr2-plus-aosp

* commit '42ea8dc732b8231df497a7a21fb3b55e1346fd63':
  Fixed the H263 video duation which caused the incorrect video validation.
2009-10-28 12:44:28 -07:00
Dave Sparks
687545fc9e am 5a7691f0: am e8543418: Merge change I7c0d20a7 into eclair
Merge commit '5a7691f0e13620322103d61c9f2b1eeb908fd37b' into eclair-mr2-plus-aosp

* commit '5a7691f0e13620322103d61c9f2b1eeb908fd37b':
  Run the metadataretriever at background priority. Bug 2187133.
2009-10-28 12:44:10 -07:00
Andreas Huber
7373755ac3 am 013ecbfc: am 54620b1a: Merge change I6e50a8c6 into eclair
Merge commit '013ecbfca236f3b4c2fd0eedd89c70f116f641ed' into eclair-mr2-plus-aosp

* commit '013ecbfca236f3b4c2fd0eedd89c70f116f641ed':
  Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."
2009-10-28 12:43:31 -07:00
Yu Shan Emily Lau
42ea8dc732 am adf4b4f5: Merge change I96458368 into eclair
Merge commit 'adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd' into eclair-mr2

* commit 'adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd':
  Fixed the H263 video duation which caused the incorrect video validation.
2009-10-28 11:38:34 -07:00
Dave Sparks
5a7691f0e1 am e8543418: Merge change I7c0d20a7 into eclair
Merge commit 'e8543418783f8f8f9a6bafdaa1dd6289661eac85' into eclair-mr2

* commit 'e8543418783f8f8f9a6bafdaa1dd6289661eac85':
  Run the metadataretriever at background priority. Bug 2187133.
2009-10-28 11:38:08 -07:00
Andreas Huber
013ecbfca2 am 54620b1a: Merge change I6e50a8c6 into eclair
Merge commit '54620b1a77e51b3fa531dbd099bd69c39d7d0029' into eclair-mr2

* commit '54620b1a77e51b3fa531dbd099bd69c39d7d0029':
  Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."
2009-10-28 11:37:16 -07:00
Andreas Huber
e113d6af62 am 76a54294: Merge change I155e2ad0 into eclair-mr2
Merge commit '76a5429407e821c22508eca92e7475b6433cd668' into eclair-mr2-plus-aosp

* commit '76a5429407e821c22508eca92e7475b6433cd668':
  Re-enable CameraSource.
2009-10-28 10:36:57 -07:00
Android (Google) Code Review
76a5429407 Merge change I155e2ad0 into eclair-mr2
* changes:
  Re-enable CameraSource.
2009-10-28 13:25:09 -04:00
Andreas Huber
155e2ad04c Re-enable CameraSource. 2009-10-28 10:15:07 -07:00
Jean-Michel Trivi
b029bd69ce am 89889733: Merge change I4e83a76a into eclair
Merge commit '898897338dfd62a268a89fb55ee900a9bd5a683f' into eclair-plus-aosp

* commit '898897338dfd62a268a89fb55ee900a9bd5a683f':
  Fix bug 2201417. Whenever the System setting that indicates
2009-10-28 08:53:31 -07:00
Android (Google) Code Review
898897338d Merge change I4e83a76a into eclair
* changes:
  Fix bug 2201417. Whenever the System setting that indicates whether the notifcation stream uses the ring volume changes, the table of stream volume aliases in AudioService is updated. But the name of the alias stored in VolumeStreamState.mVolumeIndexSettingName was not updated whenever the NOTIFICATIONS_USE_RING_VOLUME setting was updated. This caused the wrong volume setting to be persisted. This change ensures the setting name is updated whenever the volume alias is, and persists the notification volume change right away (instead of after a delay), so that registered observers are notified right away. The notification seekbar in the sound settings is an example of such an observer.
2009-10-28 11:47:54 -04:00
Jean-Michel Trivi
11a74a7565 Fix bug 2201417. Whenever the System setting that indicates
whether the notifcation stream uses the ring volume changes, the
table of stream volume aliases in AudioService is updated. But the
name of the alias stored in VolumeStreamState.mVolumeIndexSettingName
was not updated whenever the NOTIFICATIONS_USE_RING_VOLUME setting
was updated. This caused the wrong volume setting to be persisted.
This change ensures the setting name is updated whenever the volume
alias is, and persists the notification volume change right away
(instead of after a delay), so that registered observers are notified
right away. The notification seekbar in the sound settings is an
example of such an observer.
2009-10-27 17:49:13 -07:00
Andreas Huber
b1a8f54bf6 am 27123468: Use a simple replacement for String8 that allocates its storage beforehand to avoid reentering the heap while we\'re examining it (leak checker).
Merge commit '27123468b33cb61a1600079d583302b1b078b2ee' into eclair-mr2-plus-aosp

* commit '27123468b33cb61a1600079d583302b1b078b2ee':
  Use a simple replacement for String8 that allocates its storage beforehand to avoid reentering the heap while we're examining it (leak checker).
2009-10-27 16:06:21 -07:00
Andreas Huber
27123468b3 Use a simple replacement for String8 that allocates its storage beforehand to avoid reentering the heap while we're examining it (leak checker). 2009-10-27 15:50:04 -07:00
Dave Sparks
97949b8f8b am 98de26e0: Merge change I8cc42c52 into eclair
Merge commit '98de26e06aeab9d3e6abd92080eec9ad54f537b6' into eclair-plus-aosp

* commit '98de26e06aeab9d3e6abd92080eec9ad54f537b6':
  Add some logging to detect if AsyncPlayer is lagging. Bug 2201082.
2009-10-27 13:50:11 -07:00
Dave Sparks
8cc42c5230 Add some logging to detect if AsyncPlayer is lagging. Bug 2201082. 2009-10-27 13:27:34 -07:00
Andreas Huber
dab3a50abc am fdde959c: am dfdf9453: Merge change I3085c83e into eclair-mr2
Merge commit 'fdde959c22b5758db15293bc442e01674727fa61'

* commit 'fdde959c22b5758db15293bc442e01674727fa61':
  When freeing an OMX node, attempt to transition it from its current state all the way to "Loaded" in order to properly free any allocated buffers.
2009-10-26 22:44:10 -07:00
Andreas Huber
fdde959c22 am dfdf9453: Merge change I3085c83e into eclair-mr2
Merge commit 'dfdf9453577de9e22df3ecf9bbe3a48c2e59ccf1' into eclair-mr2-plus-aosp

* commit 'dfdf9453577de9e22df3ecf9bbe3a48c2e59ccf1':
  When freeing an OMX node, attempt to transition it from its current state all the way to "Loaded" in order to properly free any allocated buffers.
2009-10-26 22:33:42 -07:00
Yu Shan Emily Lau
c1209b8ffa am adf4b4f5: Merge change I96458368 into eclair
Merge commit 'adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd' into eclair-plus-aosp

* commit 'adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd':
  Fixed the H263 video duation which caused the incorrect video validation.
2009-10-26 18:17:27 -07:00
Android (Google) Code Review
adf4b4f5cd Merge change I96458368 into eclair
* changes:
  Fixed the H263 video duation which caused the incorrect video validation.
2009-10-26 21:10:48 -04:00
Dave Sparks
d86cfa2e99 am e8543418: Merge change I7c0d20a7 into eclair
Merge commit 'e8543418783f8f8f9a6bafdaa1dd6289661eac85' into eclair-plus-aosp

* commit 'e8543418783f8f8f9a6bafdaa1dd6289661eac85':
  Run the metadataretriever at background priority. Bug 2187133.
2009-10-26 18:07:10 -07:00
Andreas Huber
49f909bf8d am 54620b1a: Merge change I6e50a8c6 into eclair
Merge commit '54620b1a77e51b3fa531dbd099bd69c39d7d0029' into eclair-plus-aosp

* commit '54620b1a77e51b3fa531dbd099bd69c39d7d0029':
  Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."
2009-10-26 18:06:29 -07:00
Yu Shan Emily Lau
13b93713f3 Fixed the H263 video duation which caused the incorrect video validation. 2009-10-26 18:04:11 -07:00
Android (Google) Code Review
e854341878 Merge change I7c0d20a7 into eclair
* changes:
  Run the metadataretriever at background priority. Bug 2187133.
2009-10-26 21:00:46 -04:00
Dave Sparks
7c0d20a753 Run the metadataretriever at background priority. Bug 2187133.
This change forces metadata retreiver threads to background priority.
Uses an inner class to encapsulate the priority change so that it
automatically restores priority when returning to the client.
2009-10-26 16:28:26 -07:00
Andreas Huber
3085c83e00 When freeing an OMX node, attempt to transition it from its current state all the way to "Loaded" in order to properly free any allocated buffers. 2009-10-26 16:11:54 -07:00
Andreas Huber
6e50a8c6f5 Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."
This reverts commit 7a03b074a554ba3fd08dbc20cfd4b2f37c5f3aaa.
2009-10-26 11:11:02 -07:00
Eric Laurent
97d9af295d am 848f9c99: am 7ed70c95: am bf96aaad: Merge change Icf10db28 into eclair
Merge commit '848f9c99af9c1f3fe0cc30717ea4c73e6fefb527'

* commit '848f9c99af9c1f3fe0cc30717ea4c73e6fefb527':
  Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
2009-10-24 01:53:57 -07:00