861 Commits

Author SHA1 Message Date
Jean-Michel Trivi
f86d0d0ef0 am 15b0bd2e: am 4eaf35b9: am a0e37e9d: Merge change I941136fd into eclair
Merge commit '15b0bd2e6efd0960c85320b1d7dfae3b8bc4e008'

* commit '15b0bd2e6efd0960c85320b1d7dfae3b8bc4e008':
  Fix bug 2271468 Update the javadoc for MediaRecorder.AudioSource
2009-11-18 17:55:44 -08:00
Jean-Michel Trivi
15b0bd2e6e am 4eaf35b9: am a0e37e9d: Merge change I941136fd into eclair
Merge commit '4eaf35b99deb2abbb350383dd6458f1ea12e5bee' into eclair-mr2-plus-aosp

* commit '4eaf35b99deb2abbb350383dd6458f1ea12e5bee':
  Fix bug 2271468 Update the javadoc for MediaRecorder.AudioSource
2009-11-18 17:32:25 -08:00
Jean-Michel Trivi
4eaf35b99d am a0e37e9d: Merge change I941136fd into eclair
Merge commit 'a0e37e9defea04e8c0d97828db02361fe511c53f' into eclair-mr2

* commit 'a0e37e9defea04e8c0d97828db02361fe511c53f':
  Fix bug 2271468 Update the javadoc for MediaRecorder.AudioSource
2009-11-18 17:04:30 -08:00
Jean-Michel Trivi
941136fd08 Fix bug 2271468 Update the javadoc for MediaRecorder.AudioSource
to define how the two new audio sources behave when used on devices
that don't support them.
2009-11-18 16:15:12 -08:00
Ray Chen
78bcc8660e am edc1b064: am ae9dd9b7: am b3f35041: Merge change I86db22ef into eclair
Merge commit 'edc1b064ee1da7bca9d9a6114e984962b2633530'

* commit 'edc1b064ee1da7bca9d9a6114e984962b2633530':
  Fix issue 2265955	Use dateCreated when dateTaken isn't valid when writing images/videos to database.
2009-11-17 16:13:57 -08:00
Ray Chen
edc1b064ee am ae9dd9b7: am b3f35041: Merge change I86db22ef into eclair
Merge commit 'ae9dd9b77d37b430459b55120c13553dc5e67cfc' into eclair-mr2-plus-aosp

* commit 'ae9dd9b77d37b430459b55120c13553dc5e67cfc':
  Fix issue 2265955	Use dateCreated when dateTaken isn't valid when writing images/videos to database.
2009-11-17 16:05:43 -08:00
Andreas Huber
4788b3148b am 39dc5104: am 2c766498: Merge change Iea6a38c6 into eclair-mr2
Merge commit '39dc51040f9b766adaa9ee487bb0568a2ed1c916'

* commit '39dc51040f9b766adaa9ee487bb0568a2ed1c916':
  Squashed commit of the following:
2009-11-17 15:10:44 -08:00
Andreas Huber
3fc9f51494 am ed9880f3: am a35f1c63: Merge change Ib64ea2dd into eclair-mr2
Merge commit 'ed9880f399015782c9f635db744d25281d0deeb4'

* commit 'ed9880f399015782c9f635db744d25281d0deeb4':
  Improvements to TimedEventQueue.
2009-11-17 15:10:25 -08:00
Andreas Huber
4ed0fab49d am 775508d9: am 744043fc: Update FileSource to also accept a file descriptor and a range.
Merge commit '775508d97f709e621f9d1540aca819224fbdcebf'

* commit '775508d97f709e621f9d1540aca819224fbdcebf':
  Update FileSource to also accept a file descriptor and a range.
2009-11-17 15:10:07 -08:00
Ray Chen
ae9dd9b77d am b3f35041: Merge change I86db22ef into eclair
Merge commit 'b3f35041aa50839e5d8ed3a4ad72e6eef2cb4ea6' into eclair-mr2

* commit 'b3f35041aa50839e5d8ed3a4ad72e6eef2cb4ea6':
  Fix issue 2265955	Use dateCreated when dateTaken isn't valid when writing images/videos to database.
2009-11-17 14:28:18 -08:00
Andreas Huber
39dc51040f am 2c766498: Merge change Iea6a38c6 into eclair-mr2
Merge commit '2c7664989f7388c0c6cf0ec7d80ffa2704c8c2be' into eclair-mr2-plus-aosp

* commit '2c7664989f7388c0c6cf0ec7d80ffa2704c8c2be':
  Squashed commit of the following:
2009-11-17 10:50:22 -08:00
Android (Google) Code Review
2c7664989f Merge change Iea6a38c6 into eclair-mr2
* changes:
  Squashed commit of the following:
2009-11-17 10:46:41 -08:00
Ray Chen
05df33ea74 Fix issue 2265955 Use dateCreated when dateTaken isn't valid when writing images/videos to database. 2009-11-17 10:42:01 -08:00
Andreas Huber
ed9880f399 am a35f1c63: Merge change Ib64ea2dd into eclair-mr2
Merge commit 'a35f1c63a67df0832d9b3f1aed3e2376367d4398' into eclair-mr2-plus-aosp

* commit 'a35f1c63a67df0832d9b3f1aed3e2376367d4398':
  Improvements to TimedEventQueue.
2009-11-17 10:40:59 -08:00
Andreas Huber
775508d97f am 744043fc: Update FileSource to also accept a file descriptor and a range.
Merge commit '744043fcbf48c32c2051f222eca552fa2df5dfcb' into eclair-mr2-plus-aosp

* commit '744043fcbf48c32c2051f222eca552fa2df5dfcb':
  Update FileSource to also accept a file descriptor and a range.
2009-11-17 10:36:27 -08:00
Android (Google) Code Review
a35f1c63a6 Merge change Ib64ea2dd into eclair-mr2
* changes:
  Improvements to TimedEventQueue.
2009-11-17 10:36:24 -08:00
Andreas Huber
9c54010f76 Improvements to TimedEventQueue.
Events are now cancelled given their "unique" event_id instead of the event pointer
itself (which may be reallocated in place if we're unlucky). Also the ability to
cancel multiple events matching a predicate has been added.
2009-11-17 10:29:32 -08:00
Andreas Huber
744043fcbf Update FileSource to also accept a file descriptor and a range. 2009-11-17 10:21:03 -08:00
Andreas Huber
ea6a38c63b Squashed commit of the following:
commit 333057b355f8c260c549553b9a0634755c838b6a
Author: Andreas Huber <andih@google.com>
Date:   Fri Nov 13 15:35:48 2009 -0800

    Some more tweaks to AVC encoding on sholes.

commit 9981d0ee52ec5b8b0182aae733d1571e3ebb8390
Author: Andreas Huber <andih@google.com>
Date:   Thu Nov 12 16:36:57 2009 -0800

    Support for avc encoding, including sholes specific tweaks to pick the right colorspace for the camera to not require transcoding.

commit 5ba0ebbbd4efca51f3ae1f60e2ca31e7d2cf136d
Author: Andreas Huber <andih@google.com>
Date:   Wed Nov 11 09:50:03 2009 -0800

    Enable actual (camera) video-only recording using h.263 or mpeg4 encoding.

commit 3fd59c3526a37fe7c696f4a978925d1831c09313
Author: Andreas Huber <andih@google.com>
Date:   Tue Nov 10 14:57:48 2009 -0800

    Allow switching between the PV recorder implementation and one supported by stagefright.

    This is controlled through the property "media.stagefright.enable-record".
2009-11-16 15:43:38 -08:00
Eric Laurent
4f2ef8c857 am 99e03a3f: am 6efdbcc3: am fddfb9ae: Merge change Iad79689a into eclair
Merge commit '99e03a3f94ff8bbd68599e7f43517dbc25421fe9'

* commit '99e03a3f94ff8bbd68599e7f43517dbc25421fe9':
  Improvements for issue 2197683:	English IME key-press latency is noticeably higher on passion than sholes
2009-11-13 10:53:15 -08:00
Eric Laurent
bfdece49cf am 355743c7: am 609acfd2: am 1aa9f3ca: Merge change I923d7d72 into eclair
Merge commit '355743c70d9810fda3e59d718d055f9513fb05b7'

* commit '355743c70d9810fda3e59d718d055f9513fb05b7':
  Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
2009-11-13 10:53:01 -08:00
Eric Laurent
99e03a3f94 am 6efdbcc3: am fddfb9ae: Merge change Iad79689a into eclair
Merge commit '6efdbcc3c1afafe2f9401668ce252167600b498f' into eclair-mr2-plus-aosp

* commit '6efdbcc3c1afafe2f9401668ce252167600b498f':
  Improvements for issue 2197683:	English IME key-press latency is noticeably higher on passion than sholes
2009-11-13 09:28:06 -08:00
Eric Laurent
355743c70d am 609acfd2: am 1aa9f3ca: Merge change I923d7d72 into eclair
Merge commit '609acfd2a1067f49e51925776484b070a24d8301' into eclair-mr2-plus-aosp

* commit '609acfd2a1067f49e51925776484b070a24d8301':
  Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
2009-11-13 09:27:55 -08:00
Eric Laurent
6efdbcc3c1 am fddfb9ae: Merge change Iad79689a into eclair
Merge commit 'fddfb9ae03a2730ac5ce27fa4c47b7d3a0285d0f' into eclair-mr2

* commit 'fddfb9ae03a2730ac5ce27fa4c47b7d3a0285d0f':
  Improvements for issue 2197683:	English IME key-press latency is noticeably higher on passion than sholes
2009-11-12 23:10:34 -08:00
Eric Laurent
609acfd2a1 am 1aa9f3ca: Merge change I923d7d72 into eclair
Merge commit '1aa9f3cac31a7c2b50fcb3c9259cead8d638ae54' into eclair-mr2

* commit '1aa9f3cac31a7c2b50fcb3c9259cead8d638ae54':
  Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
2009-11-12 23:10:18 -08:00
Android (Google) Code Review
fddfb9ae03 Merge change Iad79689a into eclair
* changes:
  Improvements for issue 2197683:	English IME key-press latency is noticeably higher on passion than sholes
2009-11-12 22:53:28 -08:00
Android (Google) Code Review
1aa9f3cac3 Merge change I923d7d72 into eclair
* changes:
  Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
2009-11-12 22:45:50 -08:00
Eric Laurent
923d7d721d Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
The headset state indicated by HeadsetObserver in the broadcast intent ACTION_HEADSET_PLUG was not 0 or 1 as specified in the java doc but contained a bit field indicating the type of headset connected.

Modified HeadsetObserver to broacast a state conforming to java doc.
Added an extra to intent ACTION_HEADSET_PLUG to indicate if headset has a microphone or not.
Removed handling of non standard headset indications from HeadsetObserver.
Removed platform specific devices from output devices defined in AudioSystem.
Modified AudioService to use new ACTION_HEADSET_PLUG intent extra instead of bitfield in state.
2009-11-12 12:09:06 -08:00
Andreas Huber
c20da0b8db am bfdb1e88: am d0f3228d: resolved conflicts for merge of c66d53f9 to eclair-mr2
Merge commit 'bfdb1e88ef796969efc906e7648b552078c82aee'

* commit 'bfdb1e88ef796969efc906e7648b552078c82aee':
  Delegate the platform dependent hardware renderer implementation to a shared library provided by the vendor.
2009-11-12 10:47:27 -08:00
Andreas Huber
bfdb1e88ef am d0f3228d: resolved conflicts for merge of c66d53f9 to eclair-mr2
Merge commit 'd0f3228daa9ea26ec959cb79451e6f150648bce8' into eclair-mr2-plus-aosp

* commit 'd0f3228daa9ea26ec959cb79451e6f150648bce8':
  Delegate the platform dependent hardware renderer implementation to a shared library provided by the vendor.
2009-11-12 10:43:31 -08:00
Andreas Huber
d0f3228daa resolved conflicts for merge of c66d53f9 to eclair-mr2 2009-11-12 10:32:26 -08:00
Andreas Huber
c8d7c1492e Delegate the platform dependent hardware renderer implementation to a shared library provided by the vendor. 2009-11-12 09:36:10 -08:00
Eric Laurent
059b4be2a5 Improvements for issue 2197683: English IME key-press latency is noticeably higher on passion than sholes
This change goes with a kernel driver change that reduces the audio buffer size from 4800 bytes (~27ms) to 3072 bytes (~17ms).
- The AudioFlinger modifcations in change 0bca68cfff161abbc992fec82dc7c88079dd1a36 have been removed: the short sleep period was counter productive when the AudioTrack is using the call back thread as it causes to many preemptions.
- AudioFlinger mixer thread now detects long standby exit time and in this case anticipates start by writing 0s as soon as a track is enabled even if not ready for mixing.
- AudioTrack::start() is modified to start call back thread before starting the IAudioTrack so that thread startup time is masked by IAudioTrack start and mixer thread wakeup time.
2009-11-11 12:13:27 -08:00
Andreas Huber
7ddad6159c am 555ecc7d: am 6780d8c0: Make MediaPlayerImpl less verbose by default.
Merge commit '555ecc7d8e3f4983517c056f6f5c14a24e082363'

* commit '555ecc7d8e3f4983517c056f6f5c14a24e082363':
  Make MediaPlayerImpl less verbose by default.
2009-11-10 13:58:46 -08:00
Andreas Huber
555ecc7d8e am 6780d8c0: Make MediaPlayerImpl less verbose by default.
Merge commit '6780d8c006c9381919c0ee4de3d2bdc6d7a728d6' into eclair-mr2-plus-aosp

* commit '6780d8c006c9381919c0ee4de3d2bdc6d7a728d6':
  Make MediaPlayerImpl less verbose by default.
2009-11-10 13:55:12 -08:00
Andreas Huber
6780d8c006 Make MediaPlayerImpl less verbose by default. 2009-11-10 13:47:45 -08:00
Andreas Huber
19d494549b am 00443d66: am d533ca61: am cfe45c77: Merge change I96c4d4b3 into eclair
Merge commit '00443d661de7d8a06f5126a735d832045a827110'

* commit '00443d661de7d8a06f5126a735d832045a827110':
  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:38:00 -08:00
Andreas Huber
00443d661d am d533ca61: am cfe45c77: Merge change I96c4d4b3 into eclair
Merge commit 'd533ca61fa1e6a456f93a790cdb9b4eb5893a5a7' into eclair-mr2-plus-aosp

* commit 'd533ca61fa1e6a456f93a790cdb9b4eb5893a5a7':
  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:33:53 -08:00
Andreas Huber
d533ca61fa am cfe45c77: Merge change I96c4d4b3 into eclair
Merge commit 'cfe45c775ddb5e48bf556aee7422298260eb4fd8' into eclair-mr2

* 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:29:34 -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
5cfcedc540 am 28b0e311: am 9d7e75eb: am bf964e6a: Merge change Ic060d86f into eclair
Merge commit '28b0e311959baa55e0c6c9762831165dbafb5046'

* commit '28b0e311959baa55e0c6c9762831165dbafb5046':
  Check whether test server is up before running tests which use streaming files.
2009-11-10 10:14:46 -08:00
Gloria Wang
28b0e31195 am 9d7e75eb: am bf964e6a: Merge change Ic060d86f into eclair
Merge commit '9d7e75eb0c774e36cbfbe71f37cedec6f1cc5331' into eclair-mr2-plus-aosp

* commit '9d7e75eb0c774e36cbfbe71f37cedec6f1cc5331':
  Check whether test server is up before running tests which use streaming files.
2009-11-10 10:11:21 -08:00
Gloria Wang
9d7e75eb0c am bf964e6a: Merge change Ic060d86f into eclair
Merge commit 'bf964e6a0488c25bfe18d2c041aafe42cf493b9e' into eclair-mr2

* commit 'bf964e6a0488c25bfe18d2c041aafe42cf493b9e':
  Check whether test server is up before running tests which use streaming files.
2009-11-10 10:07:10 -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
4f2a1f5679 am 3c452e36: am f28e0c2a: Merge change I9a50fdf4 into eclair-mr2
Merge commit '3c452e366001521b2ea07dcc2bd2aaa51c5ffd67'

* commit '3c452e366001521b2ea07dcc2bd2aaa51c5ffd67':
  Handle OMX_StateInvalid in emergency shutdown properly (by ignoring it and hoping for the best) instead of asserting.
2009-11-06 11:46:27 -08:00
Andreas Huber
3c452e3660 am f28e0c2a: Merge change I9a50fdf4 into eclair-mr2
Merge commit 'f28e0c2ac75bf630a595d442a7ddefcc1f8386f6' into eclair-mr2-plus-aosp

* commit 'f28e0c2ac75bf630a595d442a7ddefcc1f8386f6':
  Handle OMX_StateInvalid in emergency shutdown properly (by ignoring it and hoping for the best) instead of asserting.
2009-11-06 11:35:57 -08:00
Android (Google) Code Review
f28e0c2ac7 Merge change I9a50fdf4 into eclair-mr2
* changes:
  Handle OMX_StateInvalid in emergency shutdown properly (by ignoring it and hoping for the best) instead of asserting.
2009-11-06 14:25:26 -05:00
Andreas Huber
3f2dfc35df am 5959228b: am be364022: am fde273ba: Merge change Ic997acac into eclair
Merge commit '5959228b6cfcbcbc7d27cc969ff49a330398018f'

* commit '5959228b6cfcbcbc7d27cc969ff49a330398018f':
  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:28:46 -08:00
Andreas Huber
5959228b6c am be364022: am fde273ba: Merge change Ic997acac into eclair
Merge commit 'be364022fbdaa8eaef986b0ac4dae1c4ac7d64d5' into eclair-mr2-plus-aosp

* commit 'be364022fbdaa8eaef986b0ac4dae1c4ac7d64d5':
  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:17:35 -08:00
Andreas Huber
be364022fb am fde273ba: Merge change Ic997acac into eclair
Merge commit 'fde273baf6592a5fde15ee4dd4d798d90368e440' into eclair-mr2

* 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:53 -08:00