drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,926 Commits 1 Branch 0 Tags
Commit Graph

1766 Commits

Author SHA1 Message Date
Andreas Huber
eea1eefead Support another kind of iso mpeg4 file. 
Change-Id: I052aa1c971c577e50679b6a9263acd32895906c7
related-to-bug: 2558114
 2010-04-01 11:42:50 -07:00
James Dong
ccc17b34fe Merge "Public API changes for CameraProfile and CamcorderProfile classes" into froyo 2010-04-01 10:33:45 -07:00
Dave Sparks
49e5a4c5be Update AMR codec. 
Change-Id: I8ecd2712863f6962b762f26898002912d1c77afb
 2010-04-01 09:16:05 -07:00
James Dong
e64d9a236e Public API changes for CameraProfile and CamcorderProfile classes 
1. CamcorderProfile: “@see” links are broken; Remove m prefix from fields; remove “final”
2. CamcorderProfile.Quality: use an int rather than an enum
3. Add API on MediaRecorder to pass in a CamcorderProfile
4. CameraProfile.getImageEncodingQualityLevels @hide or make it consistent with CamcorderProfile
5. Remove a convenient method and instead let the (mms) app do that task

bug - 2553862

Change-Id: I759215c7892f772aeddf3651d17038489c6fbc50
 2010-04-01 00:12:20 -07:00
Jean-Michel Trivi
3ce1648fce Merge "Fix bug 2553575 API REVIEW: android.media Change 1 of 3 Notes from API Council review: Rename onAudioFocusChanged -> onAudioFocusChange" into froyo 2010-03-31 13:40:42 -07:00
Jean-Michel Trivi
7f7e67f1b6 Fix bug 2553575 API REVIEW: android.media Change 1 of 3 
Notes from API Council review:
  Rename onAudioFocusChanged -> onAudioFocusChange

Change-Id: I8296cc84381506dabe8a9ceb1b5e3c0ab6d4af25
 2010-03-31 12:08:26 -07:00
Andreas Huber
804878f3a3 Merge "Skip any number of leading ID3v2 tags (instead of just the first), also simplify/fix the find-consecutive-mp3-frames functionality." into froyo 2010-03-31 11:33:19 -07:00
Andreas Huber
0d34d8b4d5 Skip any number of leading ID3v2 tags (instead of just the first), also simplify/fix the find-consecutive-mp3-frames functionality. 
Change-Id: I30b93b21de9bd5509b617cca21f46331562c30ac
related-to-bug: 2553445
 2010-03-31 11:08:23 -07:00
Andreas Huber
5c1e96bbc7 Merge "Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour)." into froyo 2010-03-31 09:48:22 -07:00
Andreas Huber
8e2b941e7b Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour). 
Change-Id: I64da5eb97c75b269b4668b3628ed0f05f2e36e51
related-to-bug: 2557482
 2010-03-31 09:40:15 -07:00
Andreas Huber
99e330b5a6 Merge "Properly fill in the component name for the software decoders." into froyo 2010-03-30 15:40:38 -07:00
Andreas Huber
7167472d84 Properly fill in the component name for the software decoders. 
Change-Id: I92071481f7ed94922b10856c981e507a9eec4c0c
related-to-bug: 2557787
 2010-03-30 13:50:38 -07:00
Andreas Huber
b75d137faf Timeout on socket recv calls after 5secs, retry connection also if server unexpectedly closed the connection on its end and we know that there should've been more data available. 
Change-Id: I749859dae28356080fe72ba035719754e7339c7f
related-to-bug: 2492187
 2010-03-30 13:21:12 -07:00
Andreas Huber
c2eeb2f52e Limit the total amount of ID3 metadata to something (un-)reasonable: 3MB. 
Change-Id: I3f9bbcdd4f563bac27c4ccae58e4179656c264b6
related-to-bug: 1903971
 2010-03-29 15:13:40 -07:00
Andreas Huber
1e64e52c8f Merge "Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we're waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns." into froyo 2010-03-29 12:58:03 -07:00
Andreas Huber
62141b430f Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we're waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns. 
Change-Id: I50e8976ce8d0ecc47ee0eb497296930877ce306a
related-to-bug: 2549465
 2010-03-29 12:01:25 -07:00
Andreas Huber
252573cb82 Finer-grained locking in AwesomePlayer, position and duration are now protected by a separate mutex that's only held for brief moments of time. 
Change-Id: I989baf5a0ea8923985c560c2ec274abda0780242
related-to-bug: 2546577
 2010-03-26 10:17:17 -07:00
Wu-cheng Li
bb961a05d7 Merge "Fix testCameraPreviewMemoryUsage test." 2010-03-25 03:52:00 -07:00
Wu-cheng Li
59411b3373 Fix testCameraPreviewMemoryUsage test. 
Looper.quit() is asynchronous. The looper may still has some
preview callbacks in the queue after quit is called. The preview
callback still uses the camera object (setHasPreviewCallback).
After camera is released, RuntimeException will be thrown from
the method. So we need to join the looper thread here.

This change also fixes a potential race condition.

bug:2521202
Change-Id: If69bbb3125d1d30192563559579b87c20fa5aac8
 2010-03-25 18:26:42 +08:00
Andreas Huber
ad069eb1d6 Merge "QueryCodecs now returns the names of the software codecs (non-OpenMax) as well." 2010-03-24 13:53:28 -07:00
Andreas Huber
1a189a8232 QueryCodecs now returns the names of the software codecs (non-OpenMax) as well. 
Change-Id: Ic4cd61f4dd722fb0dda544ffaa5615e87e3a4d40
related-to-bug: 2541647
 2010-03-24 13:49:20 -07:00
Andreas Huber
f71daba4cd Enable early termination of the prefetcher's preparation phase. 
Change-Id: I929ac9b0fd0b6ebd98c1bc56be18ac8f8378d48c
related-to-bug: 2537407
 2010-03-24 09:42:21 -07:00
Andreas Huber
9b732dec07 Clear the local prefetcher strong reference before signalling that prepare() was cancelled early in order to avoid a race condition that occasionally triggered an assertion from the main thread. 
Change-Id: I0db198fe5fd0fbe9a6c90a8e5924a2df05432c4c
related-to-bug: 2538486
 2010-03-23 15:30:57 -07:00
Eric Laurent
5b4e654d0c Fix issue 2472495: Phone cannot be set to silent mode via volume keys while Driveabout is taking. 
The problem is that AudioService.adjustStreamVolume() only handles the ringer mode change when the
STREAM_RING volume changes from 1 to 0 or 0 to 1. If another stream is soloed, the STREAM_RING stream
volume is forced to 0 and then never transits from 0 to 0 when volume down key is pressed.

The fix consists in considering the saved value instead of current value when ajusting or setting
the volume of a muted stream: only the saved value is adjusted too, leaving the stream muted but updating
the value that will be restored when it will be unmuted.

Also changed implementation of stream volume control by setRingerModeInt() to use stream mute feature
instead of direct volume control.

Change-Id: Id85d76450b36d61a0fe8195eb4bffe63ffbd427c
 2010-03-22 15:46:58 -07:00
Jean-Michel Trivi
bbbb1dc3c3 Unhide the MediaButton receiver API in android.media.AudioManager 
Change-Id: Ic9222b0bf6e2ff481c6aa5f16ac0259fa7a52355
 2010-03-22 13:49:30 -07:00
James Dong
90f8680f41 Update MediaRecorder.java documentation to mention it does not work on the emulator yet. 
bug - 2532726

Change-Id: If6dbf0d89c4681a647419e1911213a4c22dc3dab
 2010-03-22 00:31:12 -07:00
Mathias Agopian
c2662bf9b9 Merge "libutils Condition are now PRIVATE by default" 2010-03-19 17:20:08 -07:00
Jean-Michel Trivi
9f3168b327 Merge "Fix two AudioFocus issues: - if a focus owner abandons audio focus during a call, the next focus owner in the stack was never notified - if a focus owner requests the focus while alread owning it, and the type of focus request changes, the previous focus owner was not notified that the type of focus loss had changed." 2010-03-19 16:31:34 -07:00
Mathias Agopian
a729f97e8b libutils Condition are now PRIVATE by default 
Condition must be initialized with SHARED for the old behavior, where
they can be used accross processes.

Updated the two places android that require SHARED conditions.

PRIVATE conditions (and mutexes) use more efficient syscalls.

Change-Id: I9a281a4b88206e92ac559c66554e886b9c62db3a
 2010-03-19 16:16:43 -07:00
Jean-Michel Trivi
983ac2b8cf Unhide new constants used in AudioFocus API to denote a situation 
where a new focus owner signals it  allows other audio apps to keep
playing by ducking their audio streams.

Change-Id: I1109f44546f3cbcff8ad33ee21cfff50f4f12177
 2010-03-19 16:10:42 -07:00
Jean-Michel Trivi
e5e1e870fd Fix two AudioFocus issues: 
- if a focus owner abandons audio focus during a call, the next
 focus owner in the stack was never notified
- if a focus owner requests the focus while alread owning it, and
 the type of focus request changes, the previous focus owner was
 not notified that the type of focus loss had changed.

Change-Id: Iee6c6e17bcdd3c225a4b600f40ba434294870f17
 2010-03-19 15:39:03 -07:00
Marco Nelissen
aac4bfb49b Merge "We should pass null for the album artist if it was not set, instead of a copy of the artist, since the media provider needs to know whether the album artist was actually set." 2010-03-19 10:25:13 -07:00
Marco Nelissen
0096b8d7d1 We should pass null for the album artist if it was not set, instead of a copy 
of the artist, since the media provider needs to know whether the album artist
was actually set.

Change-Id: I29b885c8293609299a55babadf9ca2a30e20e5bd
 2010-03-19 08:07:26 -07:00
Atsushi Eno
ebcc51d39c Accept media files by file extension in case insensitive manner. 
Change-Id: I8e246010c96802ae87960797607fc8f8f2ab6031
 2010-03-19 23:18:02 +09:00
Jean-Michel Trivi
4b55d496dd Fix SDK build Remove links to hidden constant in javadoc. 
Change-Id: I21495f0ef64b3dc154ce0e0ca2d44686afd752e9
 2010-03-18 21:37:29 -07:00
Eric Laurent
95b88fbe74 Attempt to fix the SDK build. 
Change-Id: I024df1b513da117057a21c27e6c0cd134cdd8023
 2010-03-18 20:39:38 -07:00
Jean-Michel Trivi
078fd47e91 Support focus requests where ducking of the loser of audio focus 
is acceptable for the new audio focus owner.

Change-Id: I965483f12eeb717115a8f6992d8f1ab7fafa4e45
 2010-03-18 18:28:27 -07:00
Eric Laurent
c04cfa3596 Unhide AudioManager API to control bluetooth SCO audio connection. 
Needed for issue 2416481 in order to allow unbundled applications to play and record
audio to/from a bluetooth SCO headset while not in call.

Change-Id: Ie1f96ded991e65da538c2c4a58bfa1e548d58a01
 2010-03-18 18:18:48 -07:00
Marco Nelissen
42a9c53788 Merge "Include "album artist" when inserting items in the media provider." 2010-03-18 17:23:32 -07:00
Marco Nelissen
abc2819328 Include "album artist" when inserting items in the media provider. 
Change-Id: Ic34e2d54557409866dc35c29ee397afdfe874762
 2010-03-18 17:15:56 -07:00
Andreas Huber
099e3e7eed Merge "Report a runtime error rather than asserting if the amr software decoder reads more data than it was given(!)" 2010-03-18 14:08:56 -07:00
Andreas Huber
bd278758ef Report a runtime error rather than asserting if the amr software decoder reads more data than it was given(!) 
Change-Id: I0a7ad65051a6663a583ea82da5fc75227dcdbbfa
 2010-03-18 14:03:47 -07:00
Andreas Huber
d92820070b Tweak the omx tests to always do a seek-beyond-EOS on the first iteration, followed by a linear read on the second iteration. 
Change-Id: I16fc9e42ee9f8e4cb120ab41364cae6dd4544634
related-to-bug: 2338792
 2010-03-18 13:37:39 -07:00
Andreas Huber
43595bc268 Either the software mp3 decoder's CRC computation is wrong (and PV never enabled it before) or there are files in the wild with wrong CRCs that nonetheless decode correctly, either way, opt out of CRC verification. 
Change-Id: I1d9bd78f4efb53faa82c67110cf61f78122e40f8
related-to-bug: 2511393
 2010-03-18 10:51:09 -07:00
Eric Laurent
cbf1840f4c Merge "Issue 2416481: Support Voice Dialer over BT SCO." 2010-03-18 10:01:10 -07:00
Andreas Huber
cf74ceea59 Merge "While streaming media data, upon a socket-read error, try reconnecting to the server and attempt to re-read for at most 3 times." 2010-03-18 09:01:01 -07:00
Eric Laurent
3def1eec2b Issue 2416481: Support Voice Dialer over BT SCO. 
Added public methods to AudioManager API so that unbundled applications can use bluetooth
SCO audio when the phone is not incall.
Without this change, the only way to activate and use bluetooth SCO is via the BluetoothHeadset API
which is not public yet.

Change-Id: Ia1680f219ea1d0943092d475d5be7d6638983ebb
 2010-03-18 00:26:46 -07:00
Jean-Michel Trivi
a378de742f Merge "Fix bug where the ID stored for an OnAudioFocusChangeListener is an empty string when audio focus is requested or abandonned with a null listener." 2010-03-17 17:47:08 -07:00
Andreas Huber
8783429932 While streaming media data, upon a socket-read error, try reconnecting to the server and attempt to re-read for at most 3 times. 
Change-Id: I7534905e07a6456d18b26d5d60fa8915f25ae99e
related-to-bug: 2492187
 2010-03-17 16:38:30 -07:00
James Dong
aa773543c4 Merge "Don't stop a test case when the test case failed for some of the sample files. Instead, only check against failure or success at the end of the test case." 2010-03-17 15:51:48 -07:00