786 Commits

Author SHA1 Message Date
Eric Laurent
e7c6644778 am 653d5d41: am fcae6c71: am 67b69292: Merge change I93f500a5 into eclair
Merge commit '653d5d415c3447a4250120548bf32d1ee63fe36f'

* commit '653d5d415c3447a4250120548bf32d1ee63fe36f':
  Fix issue 2203561: Sholes: audio playing out of earpiece.
2009-11-05 02:01:30 -08:00
Eric Laurent
653d5d415c am fcae6c71: am 67b69292: Merge change I93f500a5 into eclair
Merge commit 'fcae6c71794696a074cabf20beeb02fd87853e30' into eclair-mr2-plus-aosp

* commit 'fcae6c71794696a074cabf20beeb02fd87853e30':
  Fix issue 2203561: Sholes: audio playing out of earpiece.
2009-11-05 01:55:51 -08:00
Eric Laurent
fcae6c7179 am 67b69292: Merge change I93f500a5 into eclair
Merge commit '67b692920c18f99b096dce285adc6f7439fa866c' into eclair-mr2

* commit '67b692920c18f99b096dce285adc6f7439fa866c':
  Fix issue 2203561: Sholes: audio playing out of earpiece.
2009-11-05 00:01:33 -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
Jean-Michel Trivi
fc078b1307 am bd38397b: am 3d2d155a: am 7ed0ceeb: Merge change I6869df3a into eclair
Merge commit 'bd38397bc4f754c040d4abf5435c2469c3357924'

* commit 'bd38397bc4f754c040d4abf5435c2469c3357924':
  Add new audio sources to support the A1026 recording configurations.
2009-11-04 13:46:17 -08:00
Jean-Michel Trivi
bd38397bc4 am 3d2d155a: am 7ed0ceeb: Merge change I6869df3a into eclair
Merge commit '3d2d155a87cdd3038a2e6df8741181431cb250e1' into eclair-mr2-plus-aosp

* commit '3d2d155a87cdd3038a2e6df8741181431cb250e1':
  Add new audio sources to support the A1026 recording configurations.
2009-11-04 13:23:00 -08:00
Jean-Michel Trivi
3d2d155a87 am 7ed0ceeb: Merge change I6869df3a into eclair
Merge commit '7ed0ceeba54712f76e9a4f2dd4c9197d76813488' into eclair-mr2

* commit '7ed0ceeba54712f76e9a4f2dd4c9197d76813488':
  Add new audio sources to support the A1026 recording configurations.
2009-11-04 12:05:34 -08:00
Andreas Huber
b4ff8629af am 84953593: am ad278f22: Merge change I6bce6d87 into eclair-mr2
Merge commit '8495359382bc7c94a776e51c596e807448796476'

* commit '8495359382bc7c94a776e51c596e807448796476':
  Adds a WAVExtractor for 16-bit signed PCM audio wave files.
2009-11-04 10:53:03 -08:00
Andreas Huber
afd80d96c5 am 7146332e: am 0533aade: Merge change I313953dc into eclair-mr2
Merge commit '7146332e9999443e22296d6d0968f95b80e79af6'

* commit '7146332e9999443e22296d6d0968f95b80e79af6':
  Support raw audio sources in MediaPlayerImpl.
2009-11-04 10:52:53 -08:00
Andreas Huber
79d4002734 am 5a58de8b: am 2f133015: Merge change I5126e183 into eclair-mr2
Merge commit '5a58de8b3bb1b6cc5304f83c8a3d527f952b91de'

* commit '5a58de8b3bb1b6cc5304f83c8a3d527f952b91de':
  Fix MP3Extractor duration overflows...
2009-11-04 10:52:31 -08:00
Andreas Huber
8495359382 am ad278f22: Merge change I6bce6d87 into eclair-mr2
Merge commit 'ad278f2276de23197571e486ad387dacc7f346ee' into eclair-mr2-plus-aosp

* commit 'ad278f2276de23197571e486ad387dacc7f346ee':
  Adds a WAVExtractor for 16-bit signed PCM audio wave files.
2009-11-04 10:43:01 -08:00
Andreas Huber
7146332e99 am 0533aade: Merge change I313953dc into eclair-mr2
Merge commit '0533aadef6d93dec868d648402f5ec326161de57' into eclair-mr2-plus-aosp

* commit '0533aadef6d93dec868d648402f5ec326161de57':
  Support raw audio sources in MediaPlayerImpl.
2009-11-04 10:42:53 -08:00
Andreas Huber
5a58de8b3b am 2f133015: Merge change I5126e183 into eclair-mr2
Merge commit '2f1330155153e590548e711d619765edc8ebb62f' into eclair-mr2-plus-aosp

* commit '2f1330155153e590548e711d619765edc8ebb62f':
  Fix MP3Extractor duration overflows...
2009-11-04 10:42:35 -08:00
Android (Google) Code Review
ad278f2276 Merge change I6bce6d87 into eclair-mr2
* changes:
  Adds a WAVExtractor for 16-bit signed PCM audio wave files.
2009-11-04 13:33:27 -05:00
Android (Google) Code Review
0533aadef6 Merge change I313953dc into eclair-mr2
* changes:
  Support raw audio sources in MediaPlayerImpl.
2009-11-04 13:33:13 -05:00
Android (Google) Code Review
2f13301551 Merge change I5126e183 into eclair-mr2
* changes:
  Fix MP3Extractor duration overflows...
2009-11-04 13:32:46 -05: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
6bce6d87b3 Adds a WAVExtractor for 16-bit signed PCM audio wave files. 2009-11-03 16:00:58 -08:00
Andreas Huber
313953dccb Support raw audio sources in MediaPlayerImpl. 2009-11-03 16:00:22 -08:00
Andreas Huber
5126e18362 Fix MP3Extractor duration overflows... 2009-11-03 15:58:35 -08:00
Andreas Huber
4cbb490fde am 4d4e9856: am d6e54a90: am 338ccf43: Merge change Id2906ad8 into eclair
Merge commit '4d4e985673de1fa0bae72df3485af86381c3ec12'

* commit '4d4e985673de1fa0bae72df3485af86381c3ec12':
  Fix video flickering by propagating the NO_CACHING flag from the master to MemoryHeapPMem.
2009-11-03 12:30:57 -08:00
Andreas Huber
4d4e985673 am d6e54a90: am 338ccf43: Merge change Id2906ad8 into eclair
Merge commit 'd6e54a902368885072975dd0bad78dcd1cafaaea' into eclair-mr2-plus-aosp

* commit 'd6e54a902368885072975dd0bad78dcd1cafaaea':
  Fix video flickering by propagating the NO_CACHING flag from the master to MemoryHeapPMem.
2009-11-03 12:10:27 -08:00
Andreas Huber
d6e54a9023 am 338ccf43: Merge change Id2906ad8 into eclair
Merge commit '338ccf43b6a4468aea6aa7d831be7d6c8d8d134d' into eclair-mr2

* commit '338ccf43b6a4468aea6aa7d831be7d6c8d8d134d':
  Fix video flickering by propagating the NO_CACHING flag from the master to MemoryHeapPMem.
2009-11-03 11:59:59 -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
ffca760612 am 76370140: am 9d4dcf28: am f67eff17: Merge change Ib0036762 into eclair
Merge commit '763701408b09195a2b82bd088fc83c61b27c9be4'

* commit '763701408b09195a2b82bd088fc83c61b27c9be4':
  Add windows media support check in MediaMetadataRetrieverTest
2009-11-02 17:46:36 -08:00
Brett Chabot
a98c5675d2 am 64e648fd: am b580d53e: am 774d956d: Merge change Ic8c7ca7b into eclair
Merge commit '64e648fdd93c9642bdbda3e44082e50f4baeb0c1'

* commit '64e648fdd93c9642bdbda3e44082e50f4baeb0c1':
  Remove testCheckMediaPlaybackHandlesApplicationItunes from continuous.
2009-11-02 17:46:12 -08:00
James Dong
763701408b am 9d4dcf28: am f67eff17: Merge change Ib0036762 into eclair
Merge commit '9d4dcf287cb74d8d82a89df8d93301cd9c6b27d8' into eclair-mr2-plus-aosp

* commit '9d4dcf287cb74d8d82a89df8d93301cd9c6b27d8':
  Add windows media support check in MediaMetadataRetrieverTest
2009-11-02 17:27:54 -08:00
Brett Chabot
64e648fdd9 am b580d53e: am 774d956d: Merge change Ic8c7ca7b into eclair
Merge commit 'b580d53e7517e6020ee42c4f0fcda21bf381c74e' into eclair-mr2-plus-aosp

* commit 'b580d53e7517e6020ee42c4f0fcda21bf381c74e':
  Remove testCheckMediaPlaybackHandlesApplicationItunes from continuous.
2009-11-02 17:20:08 -08:00
James Dong
9d4dcf287c am f67eff17: Merge change Ib0036762 into eclair
Merge commit 'f67eff177515baa421d8717ee20efdc516fde580' into eclair-mr2

* commit 'f67eff177515baa421d8717ee20efdc516fde580':
  Add windows media support check in MediaMetadataRetrieverTest
2009-11-02 17:19:51 -08:00
Brett Chabot
b580d53e75 am 774d956d: Merge change Ic8c7ca7b into eclair
Merge commit '774d956d5d2f6bece15c10c0db275596148c7ef8' into eclair-mr2

* commit '774d956d5d2f6bece15c10c0db275596148c7ef8':
  Remove testCheckMediaPlaybackHandlesApplicationItunes from continuous.
2009-11-02 17:14:54 -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
5d66d7fc27 am fb1d992f: am 1166ff76: am 1d9246e8: Merge change Id095e180 into eclair
Merge commit 'fb1d992f4b8addad729a94cb006a732a40b62756'

* commit 'fb1d992f4b8addad729a94cb006a732a40b62756':
  Make sure the visualization stops immediately when sound stops, instead of continuing for a fraction of a second.
2009-11-02 15:22:44 -08:00
Marco Nelissen
fb1d992f4b am 1166ff76: am 1d9246e8: Merge change Id095e180 into eclair
Merge commit '1166ff76eb3dbb5304dc40b3056e48c2c9dc7577' into eclair-mr2-plus-aosp

* commit '1166ff76eb3dbb5304dc40b3056e48c2c9dc7577':
  Make sure the visualization stops immediately when sound stops, instead of continuing for a fraction of a second.
2009-11-02 15:06:57 -08:00
Marco Nelissen
1166ff76eb am 1d9246e8: Merge change Id095e180 into eclair
Merge commit '1d9246e8bb8de624e14c55dce57e93da18cfd7a8' into eclair-mr2

* commit '1d9246e8bb8de624e14c55dce57e93da18cfd7a8':
  Make sure the visualization stops immediately when sound stops, instead of continuing for a fraction of a second.
2009-11-02 14:41:28 -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
146742b1a2 am a3763b85: am 9cf96280: am 3a814141: Merge change Iee0486e2 into eclair
Merge commit 'a3763b85d4d95a0316df9718bb0d132cf458374d'

* commit 'a3763b85d4d95a0316df9718bb0d132cf458374d':
  Dump media recorder PID in dumpsys media.player, and fix minor bugs.
2009-10-29 20:19:43 -07:00
Gloria Wang
a3763b85d4 am 9cf96280: am 3a814141: Merge change Iee0486e2 into eclair
Merge commit '9cf962809dc5d26d91fd7e9bbfeb7266867216d1' into eclair-mr2-plus-aosp

* commit '9cf962809dc5d26d91fd7e9bbfeb7266867216d1':
  Dump media recorder PID in dumpsys media.player, and fix minor bugs.
2009-10-29 19:59:33 -07:00
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
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