619 Commits

Author SHA1 Message Date
Andreas Huber
cad4d807f9 am cfe45c77: Merge change I96c4d4b3 into eclair
Merge commit 'cfe45c775ddb5e48bf556aee7422298260eb4fd8' into eclair-plus-aosp

* commit 'cfe45c775ddb5e48bf556aee7422298260eb4fd8':
  Fix for random audio output failures, properly dup() the file descriptor in IMediaPlayer::setDataSource to assume ownership as the caller will otherwise close it.
2009-11-10 12:30:08 -08:00
Andreas Huber
da440f137f Fix for random audio output failures, properly dup() the file descriptor in IMediaPlayer::setDataSource to assume ownership as the caller will otherwise close it. 2009-11-10 12:26:26 -08:00
Gloria Wang
76acb3195f am bf964e6a: Merge change Ic060d86f into eclair
Merge commit 'bf964e6a0488c25bfe18d2c041aafe42cf493b9e' into eclair-plus-aosp

* commit 'bf964e6a0488c25bfe18d2c041aafe42cf493b9e':
  Check whether test server is up before running tests which use streaming files.
2009-11-10 10:07:44 -08:00
Gloria Wang
c060d86f7d Check whether test server is up before running tests which use streaming files. 2009-11-09 15:51:12 -08:00
Andreas Huber
4b4d1b8980 am fde273ba: Merge change Ic997acac into eclair
Merge commit 'fde273baf6592a5fde15ee4dd4d798d90368e440' into eclair-plus-aosp

* commit 'fde273baf6592a5fde15ee4dd4d798d90368e440':
  Make AudioPlayer a little less verbose, defer starting audio playback until after the first video frame has been decoded (if there's video at all).
2009-11-06 10:07:47 -08:00
Android (Google) Code Review
fde273baf6 Merge change Ic997acac into eclair
* changes:
  Make AudioPlayer a little less verbose, defer starting audio playback until after the first video frame has been decoded (if there's video at all).
2009-11-06 11:27:03 -05:00
Andreas Huber
c997acacd5 Make AudioPlayer a little less verbose, defer starting audio playback until after the first video frame has been decoded (if there's video at all). 2009-11-05 16:34:39 -08:00
James Dong
4bcff01e43 am 1e495da1: Merge change I4b03c2cd into eclair
Merge commit '1e495da19f3f0061de38821a4ac733dca833b3eb' into eclair-plus-aosp

* commit '1e495da19f3f0061de38821a4ac733dca833b3eb':
  Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
2009-11-05 16:26:07 -08:00
Android (Google) Code Review
1e495da19f Merge change I4b03c2cd into eclair
* changes:
  Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
2009-11-05 19:15:56 -05:00
Jean-Michel Trivi
eb918b0da4 am d94ed379: Merge change I1dc2ae28 into eclair
Merge commit 'd94ed3794c68b93ac9faa357bb3517f4fae88162' into eclair-plus-aosp

* commit 'd94ed3794c68b93ac9faa357bb3517f4fae88162':
  Fix bug 2242585 to unhide the new audio recording sources.
2009-11-05 16:10:18 -08:00
Jean-Michel Trivi
1dc2ae2871 Fix bug 2242585 to unhide the new audio recording sources.
Unhide CAMCORDER and VOICE_RECOGNITION in android.media.MediaRecorder
2009-11-05 15:49:37 -08:00
Andreas Huber
76bd517ed2 am 05eca1d4: Merge change Ie80e2381 into eclair
Merge commit '05eca1d46a45723a57899dabad698537b7faef82' into eclair-plus-aosp

* commit '05eca1d46a45723a57899dabad698537b7faef82':
  DO NOT MERGE: Squashed commit of the following:
2009-11-05 13:58:55 -08:00
Andreas Huber
9744959eb2 am 818a9cf8: Merge change Ia4eedace into eclair
Merge commit '818a9cf827f282addbf7c8ee23534e08a3aaa358' into eclair-plus-aosp

* commit '818a9cf827f282addbf7c8ee23534e08a3aaa358':
  Now that UseBuffer on this component is fixed, let's use it.
2009-11-05 13:16:32 -08:00
Andreas Huber
dcaa220ff5 DO NOT MERGE: Squashed commit of the following:
commit 08259dd3dc9026887f9bbfedaf45866eb56ea9bc
Author: Andreas Huber <andih@google.com>
Date:   Thu Nov 5 12:02:31 2009 -0800

    DO NOT MERGE: Use PV for metadata extraction even if stagefright is used for playback.

commit 991832fe4dc012e51d3d9ed8d647c7f09991858f
Author: Andreas Huber <andih@google.com>
Date:   Thu Nov 5 11:24:11 2009 -0800

    DO NOT MERGE: Do not assert if we encounter OMX_StateInvalid. All bets are off though.

commit cec45cf302d9218fe79956cbe8a462d7ca3a10bb
Author: Andreas Huber <andih@google.com>
Date:   Mon Oct 26 16:11:54 2009 -0700

    DO NOT MERGE: 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.

commit 34a1e885ef9113d68acbc26d36fcc47fdebbed84
Author: Andreas Huber <andih@google.com>
Date:   Thu Nov 5 11:10:49 2009 -0800

    DO NOT MERGE: Fix heap corruptin in OMXNodeInstance.

commit 5a47f7439a1298b330541a7e4e647a8b44487388
Author: Andreas Huber <andih@google.com>
Date:   Thu Nov 5 11:08:19 2009 -0800

    DO NOT MERGE: Fix seek-on-initial-read behaviour of OMXCodec.

commit 45bed64722501b9f411a2940aff5aff4cc4d2e98
Author: Andreas Huber <andih@google.com>
Date:   Thu Nov 5 11:02:23 2009 -0800

    DO NOT MERGE: Renaming string.h to stagefright_string.h to avoid conflicts.

commit 6738e306a50196f31a73d4fc7b7c45faff639903
Author: Andreas Huber <andih@google.com>
Date:   Thu Oct 15 13:46:54 2009 -0700

    DO NOT MERGE: Reimplement the OMX backend for stagefright.

    Besides a major cleanup and refactoring, OMX is now a singleton living in the media server, it listens for death notifications of node observers/clients that allocated OMX nodes and performs/attempts cleanup.

    Changed APIs to conform to the rest of the system.
2009-11-05 13:06:17 -08:00
Andreas Huber
a4eedace99 Now that UseBuffer on this component is fixed, let's use it. 2009-11-05 09:56:03 -08:00
Eric Laurent
d889f189b5 am 67b69292: Merge change I93f500a5 into eclair
Merge commit '67b692920c18f99b096dce285adc6f7439fa866c' into eclair-plus-aosp

* commit '67b692920c18f99b096dce285adc6f7439fa866c':
  Fix issue 2203561: Sholes: audio playing out of earpiece.
2009-11-05 00:01:50 -08:00
Android (Google) Code Review
67b692920c Merge change I93f500a5 into eclair
* changes:
  Fix issue 2203561: Sholes: audio playing out of earpiece.
2009-11-05 02:55:26 -05:00
Eric Laurent
bda7469d9b Fix issue 2203561: Sholes: audio playing out of earpiece.
Create a new IAudioTrack interface to AudioFlinger when start() fails due to a broken pipe error.
Do the same if start fails due to the same error after time out in obtainBuffer().
Do not indicate that the AudioTrack is started to AudioPolicyManager if IAudioTrack start fails.
This avoids that an AudioTrack keeps a dead IAudioTrack after a media server crash.

Same modifications for AudioRecord.

Add a flag to ToneGenerator indicating that the callback thread can call Java. Without it, when the media server crashes and restarts, the AudioSystem error callback will crash in JNI if the IAudiotrack is created from AudioTrack callback thread.
2009-11-04 23:47:21 -08:00
James Dong
b1c85ec47a Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java 2009-11-04 23:00:09 -08:00
Jean-Michel Trivi
39995fdf31 am 7ed0ceeb: Merge change I6869df3a into eclair
Merge commit '7ed0ceeba54712f76e9a4f2dd4c9197d76813488' into eclair-plus-aosp

* commit '7ed0ceeba54712f76e9a4f2dd4c9197d76813488':
  Add new audio sources to support the A1026 recording configurations.
2009-11-04 12:05:45 -08:00
Jean-Michel Trivi
6869df3a5d Add new audio sources to support the A1026 recording configurations. 2009-11-03 19:43:21 -08:00
Andreas Huber
f716b0e347 am 338ccf43: Merge change Id2906ad8 into eclair
Merge commit '338ccf43b6a4468aea6aa7d831be7d6c8d8d134d' into eclair-plus-aosp

* commit '338ccf43b6a4468aea6aa7d831be7d6c8d8d134d':
  Fix video flickering by propagating the NO_CACHING flag from the master to MemoryHeapPMem.
2009-11-03 12:00:23 -08:00
Andreas Huber
d2906ad835 Fix video flickering by propagating the NO_CACHING flag from the master to MemoryHeapPMem. 2009-11-03 10:28:48 -08:00
James Dong
d4048822ef am f67eff17: Merge change Ib0036762 into eclair
Merge commit 'f67eff177515baa421d8717ee20efdc516fde580' into eclair-plus-aosp

* commit 'f67eff177515baa421d8717ee20efdc516fde580':
  Add windows media support check in MediaMetadataRetrieverTest
2009-11-02 17:19:56 -08:00
Brett Chabot
acb3676f92 am d6af2e0c: Merge change I43a335c3 into eclair
Merge commit 'd6af2e0cbf144b091d9c9d1bf2f3061547220c80' into eclair-plus-aosp

* commit 'd6af2e0cbf144b091d9c9d1bf2f3061547220c80':
  Suppress takePicture test from continuous DO NOT MERGE.
2009-11-02 17:15:09 -08:00
Brett Chabot
7cf85c8ebd am 774d956d: Merge change Ic8c7ca7b into eclair
Merge commit '774d956d5d2f6bece15c10c0db275596148c7ef8' into eclair-plus-aosp

* commit '774d956d5d2f6bece15c10c0db275596148c7ef8':
  Remove testCheckMediaPlaybackHandlesApplicationItunes from continuous.
2009-11-02 17:15:02 -08:00
Android (Google) Code Review
f67eff1775 Merge change Ib0036762 into eclair
* changes:
  Add windows media support check in MediaMetadataRetrieverTest bug 2232274
2009-11-02 20:13:20 -05:00
Android (Google) Code Review
d6af2e0cbf Merge change I43a335c3 into eclair
* changes:
  Suppress takePicture test from continuous DO NOT MERGE.
2009-11-02 20:08:16 -05:00
Android (Google) Code Review
774d956d5d Merge change Ic8c7ca7b into eclair
* changes:
  Remove testCheckMediaPlaybackHandlesApplicationItunes from continuous.
2009-11-02 20:07:11 -05:00
Marco Nelissen
f48d2e87b1 am 1d9246e8: Merge change Id095e180 into eclair
Merge commit '1d9246e8bb8de624e14c55dce57e93da18cfd7a8' into eclair-plus-aosp

* commit '1d9246e8bb8de624e14c55dce57e93da18cfd7a8':
  Make sure the visualization stops immediately when sound stops, instead of continuing for a fraction of a second.
2009-11-02 14:40:57 -08:00
Marco Nelissen
758613de28 Make sure the visualization stops immediately when sound stops, instead of continuing for a fraction of a second. 2009-11-02 13:55:04 -08:00
James Dong
38b03a7661 Add windows media support check in MediaMetadataRetrieverTest
bug 2232274
2009-11-02 12:20:58 -08:00
Brett Chabot
43a335c3cc Suppress takePicture test from continuous DO NOT MERGE.
Bug 2141755
2009-10-30 17:07:03 -07:00
Brett Chabot
c8c7ca7bd7 Remove testCheckMediaPlaybackHandlesApplicationItunes from continuous.
This test causes the whole suite to hang.
2009-10-30 16:48:09 -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
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
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
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
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
0c4ba3e1a4 am bf96aaad: Merge change Icf10db28 into eclair
Merge commit 'bf96aaadd46fb5b0884070177faa16ec4f22e2ba' into eclair-plus-aosp

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