Commit Graph

3473 Commits

Author SHA1 Message Date
Andreas Huber
2fadaf5634 am 5884468b: am 1f522294: Merge change I24b0a95d into eclair-mr2
Merge commit '5884468b448a5e2810d2ae421b69cc9c18a1a2f5'

* commit '5884468b448a5e2810d2ae421b69cc9c18a1a2f5':
  The original delay after which we dropped a frame was too aggressive. 40ms lateness seems more appropriate (about 25fps).
2009-11-23 16:06:56 -08:00
Andreas Huber
19cbbb8b0f am d1f11997: am e71a6408: Merge change I1bceff91 into eclair-mr2
Merge commit 'd1f11997e5845938b50a58dd3aecbc966ee00373'

* commit 'd1f11997e5845938b50a58dd3aecbc966ee00373':
  Make sure the decoder's input buffers are large enough to hold the largest input data. Verify that the setting actually sticks.
2009-11-23 16:06:25 -08:00
Andreas Huber
4bbdf93445 am 44e15c44: Some playable/decodable streams have been found in the wild that violate this assertion, let\'s be lenient for now.
Merge commit '44e15c44ad10b36bd3649b21ea7432348e2f05f8' into eclair-mr2-plus-aosp

* commit '44e15c44ad10b36bd3649b21ea7432348e2f05f8':
  Some playable/decodable streams have been found in the wild that violate this assertion, let's be lenient for now.
2009-11-23 15:39:26 -08:00
Andreas Huber
44e15c44ad Some playable/decodable streams have been found in the wild that violate this assertion, let's be lenient for now. 2009-11-23 15:14:44 -08:00
Andreas Huber
5884468b44 am 1f522294: Merge change I24b0a95d into eclair-mr2
Merge commit '1f52229453c3df8eaeda64133bd332b01589354f' into eclair-mr2-plus-aosp

* commit '1f52229453c3df8eaeda64133bd332b01589354f':
  The original delay after which we dropped a frame was too aggressive. 40ms lateness seems more appropriate (about 25fps).
2009-11-23 14:42:30 -08:00
Android (Google) Code Review
1f52229453 Merge change I24b0a95d into eclair-mr2
* changes:
  The original delay after which we dropped a frame was too aggressive. 40ms lateness seems more appropriate (about 25fps).
2009-11-23 14:39:03 -08:00
Andreas Huber
d1f11997e5 am e71a6408: Merge change I1bceff91 into eclair-mr2
Merge commit 'e71a6408867a80f847cd3f7671f6ef009f67a78e' into eclair-mr2-plus-aosp

* commit 'e71a6408867a80f847cd3f7671f6ef009f67a78e':
  Make sure the decoder's input buffers are large enough to hold the largest input data. Verify that the setting actually sticks.
2009-11-23 14:31:25 -08:00
Andreas Huber
1bceff916a Make sure the decoder's input buffers are large enough to hold the largest input data. Verify that the setting actually sticks. 2009-11-23 14:06:42 -08:00
Andreas Huber
24b0a95de7 The original delay after which we dropped a frame was too aggressive. 40ms lateness seems more appropriate (about 25fps). 2009-11-23 14:04:48 -08:00
Andreas Huber
e21fb34387 am 5493df91: am bbd6cb46: Merge change Ib1b7bce4 into eclair-mr2
Merge commit '5493df919b01952857eb3b78fad3fe2cff573935'

* commit '5493df919b01952857eb3b78fad3fe2cff573935':
  Squashed commit of the following:
2009-11-23 10:55:40 -08:00
Andreas Huber
5493df919b am bbd6cb46: Merge change Ib1b7bce4 into eclair-mr2
Merge commit 'bbd6cb463b405fc90912dee470fe6c7b8c6b1f54' into eclair-mr2-plus-aosp

* commit 'bbd6cb463b405fc90912dee470fe6c7b8c6b1f54':
  Squashed commit of the following:
2009-11-23 10:51:41 -08:00
Andreas Huber
27366fc954 Squashed commit of the following:
commit 1efc38dc3c33fef57b759002db3965ed07a28cb0
Author: Andreas Huber <andih@google.com>
Date:   Thu Nov 19 14:36:14 2009 -0800

    Sending the SEEK-COMPLETE notification temporarily broke seeking backwards in time behaviour. This is now fixed.

    Also, get rid of the semi-random delay after posting buffers to surface flinger in favour of delaying the buffer release until the next frame is displayed.

commit 51973062eb5ee63fd64b845d72bac517cc3369cf
Author: Andreas Huber <andih@google.com>
Date:   Wed Nov 18 14:01:43 2009 -0800

    Fix one more unit test, properly send seek-complete notification only after seek actually completed.

commit cb22250b34b1fcfe1bf459723a761fd003950229
Author: Andreas Huber <andih@google.com>
Date:   Wed Nov 18 12:31:36 2009 -0800

    Fix seek-while-paused in AwesomePlayer, revert to using FileSource if MmapSource fails.

commit 25eb9241138ddf7bb27ce90657116c5f8a94d880
Author: Andreas Huber <andih@google.com>
Date:   Wed Nov 18 12:30:40 2009 -0800

    Support seeking and duration in AMRExtractor, assuming all frames are the same size.

commit 44192f2ebb7ea3bbd3ba5910025692dbc6a08faa
Author: Andreas Huber <andih@google.com>
Date:   Wed Nov 18 10:21:44 2009 -0800

    MediaPlayerImpl is dead, long live AwesomePlayer.

commit c5b52d3c0674f5dc94db506afbce52401cceddac
Author: Andreas Huber <andih@google.com>
Date:   Wed Nov 18 09:42:23 2009 -0800

    New implementation of the stagefright mediaplayer.
2009-11-23 10:44:30 -08:00
Eric Laurent
0b74d40ac1 am 86526461: am 949c572a: am e7800946: Merge change I49f02be9 into eclair
Merge commit '8652646105a6ace559280b579ee8935541ada6c1'

* commit '8652646105a6ace559280b579ee8935541ada6c1':
  Issue 2265163: Audio still reported routed through earpiece on sholes
2009-11-21 00:29:36 -08:00
Eric Laurent
8652646105 am 949c572a: am e7800946: Merge change I49f02be9 into eclair
Merge commit '949c572a16881aa40079a42bf7682637b23eb16a' into eclair-mr2-plus-aosp

* commit '949c572a16881aa40079a42bf7682637b23eb16a':
  Issue 2265163: Audio still reported routed through earpiece on sholes
2009-11-21 00:26:09 -08:00
Eric Laurent
7d4cc41ad2 am e7800946: Merge change I49f02be9 into eclair
Merge commit 'e7800946a42c0ebe8e0b3f6eba04a96a9641aaff' into eclair-plus-aosp

* commit 'e7800946a42c0ebe8e0b3f6eba04a96a9641aaff':
  Issue 2265163: Audio still reported routed through earpiece on sholes
2009-11-21 00:22:06 -08:00
Eric Laurent
949c572a16 am e7800946: Merge change I49f02be9 into eclair
Merge commit 'e7800946a42c0ebe8e0b3f6eba04a96a9641aaff' into eclair-mr2

* commit 'e7800946a42c0ebe8e0b3f6eba04a96a9641aaff':
  Issue 2265163: Audio still reported routed through earpiece on sholes
2009-11-21 00:21:15 -08:00
Android (Google) Code Review
e7800946a4 Merge change I49f02be9 into eclair
* changes:
  Issue 2265163: Audio still reported routed through earpiece on sholes
2009-11-21 00:18:24 -08:00
Yu Shan Emily Lau
ea1862bbf4 am c6bb089d: am 507322ca: am 9ed314ce: Merge change Ib3191441 into eclair
Merge commit 'c6bb089df15c25948757f6dbd9007fc0d49bb568'

* commit 'c6bb089df15c25948757f6dbd9007fc0d49bb568':
  Add the checking for mediaplayer stress test.
2009-11-20 12:13:26 -08:00
Yu Shan Emily Lau
c6bb089df1 am 507322ca: am 9ed314ce: Merge change Ib3191441 into eclair
Merge commit '507322ca5c5b678714314ae87e27d07c89c40785' into eclair-mr2-plus-aosp

* commit '507322ca5c5b678714314ae87e27d07c89c40785':
  Add the checking for mediaplayer stress test.
2009-11-20 12:08:54 -08:00
Yu Shan Emily Lau
d66b63c266 am 9ed314ce: Merge change Ib3191441 into eclair
Merge commit '9ed314cefb5ec711dfcb5527a2a0a6b87a643c24' into eclair-plus-aosp

* commit '9ed314cefb5ec711dfcb5527a2a0a6b87a643c24':
  Add the checking for mediaplayer stress test.
2009-11-20 12:04:17 -08:00
Yu Shan Emily Lau
507322ca5c am 9ed314ce: Merge change Ib3191441 into eclair
Merge commit '9ed314cefb5ec711dfcb5527a2a0a6b87a643c24' into eclair-mr2

* commit '9ed314cefb5ec711dfcb5527a2a0a6b87a643c24':
  Add the checking for mediaplayer stress test.
2009-11-20 12:03:34 -08:00
Android (Google) Code Review
9ed314cefb Merge change Ib3191441 into eclair
* changes:
  Add the checking for mediaplayer stress test.
2009-11-20 11:59:28 -08:00
Yu Shan Emily Lau
b1ce51fb73 Add the checking for mediaplayer stress test. 2009-11-20 11:55:05 -08:00
Eric Laurent
49f02be9d7 Issue 2265163: Audio still reported routed through earpiece on sholes
This is a second attempt to fix the audio routed to earpiece syndrom.
The root cause identified this time is the crash of an application having an active AudioTrack playing on the VOICE_CALL stream type.
When this happens, the AudioTrack destructor is not called and the audio policy manager is not notified of the track stop.
Results a situation where the VOICE_CALL stream is considered as always in use by audio policy manager which makes that audio is routed to earpiece.

The fix consists in moving the track start/stop/close notification to audio policiy manager from AudioTrack to AudioFlinger Track objet.
The net result is that in the case of a client application crash, the AudioFlinger TrackHandle object (which implements the remote side of the IAudioTrack binder interface) destructor is called which in turn destroys the Track object and we can notify the audio policy manager of the track stop and removal.

The same modification is made for AudioRecord although no bug related to record has been reported yet.
Also fixed a potential problem if record stop is called while the record thread is exiting.
2009-11-19 23:57:45 -08:00
Andreas Huber
8b49e97db9 am f854e077: Merge change I8134d6ed into eclair
Merge commit 'f854e0770207e93ef9d1bf6d50ed18537a107ca4' into eclair-plus-aosp

* commit 'f854e0770207e93ef9d1bf6d50ed18537a107ca4':
  DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.
2009-11-19 15:01:45 -08:00
Andreas Huber
d66a901e6a DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering. 2009-11-19 11:24:18 -08:00
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
e78c72663e am a0e37e9d: Merge change I941136fd into eclair
Merge commit 'a0e37e9defea04e8c0d97828db02361fe511c53f' into eclair-plus-aosp

* commit 'a0e37e9defea04e8c0d97828db02361fe511c53f':
  Fix bug 2271468 Update the javadoc for MediaRecorder.AudioSource
2009-11-18 17:04:41 -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
Ray Chen
1c8270001b am b3f35041: Merge change I86db22ef into eclair
Merge commit 'b3f35041aa50839e5d8ed3a4ad72e6eef2cb4ea6' into eclair-plus-aosp

* commit 'b3f35041aa50839e5d8ed3a4ad72e6eef2cb4ea6':
  Fix issue 2265955	Use dateCreated when dateTaken isn't valid when writing images/videos to database.
2009-11-17 14:27:53 -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