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

1538 Commits

Author SHA1 Message Date
Ray Chen
f974b84b54 am e4b62c23: am 84d12f3f: am dbad286c: am 25c2dd60: Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871" into froyo 2010-04-07 13:52:52 -07:00
Ray Chen
25c2dd60d4 Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871" into froyo 2010-04-07 12:05:58 -07:00
Andreas Huber
5294f14ce2 am 1bf6cb72: am 1e6edab6: am 01f78928: am 567b57b6: Merge "Report the requested seek time while seek is in progress." into froyo 2010-04-07 11:12:15 -07:00
Andreas Huber
ddb709c45e Report the requested seek time while seek is in progress. 
Change-Id: I862bfb801701f9ce54dede51c492e4eb37591894
related-to-bug: 2576102
 2010-04-07 10:35:18 -07:00
Ray Chen
b7c8c76180 Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener 
http://2553871

Change-Id: I293b8138a2c23ea107b634da014902f838966c0e
 2010-04-07 10:14:04 -07:00
Andreas Huber
ba56799fb9 am b93ae7ea: am 3e8b89bd: am 2be77a22: Merge "Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance." into froyo 2010-04-06 14:57:43 -07:00
Andreas Huber
548b7999fe Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance. 
Change-Id: I14e9fbc1fdff61bcf89218d83cb1d2e3d6eb8438
related-to-bug: 2574491
 2010-04-06 14:36:23 -07:00
Ray Chen
505a318eae am 507748e9: am 6c935602: am 44dcf658: Make createVideoThumbnail and createImageThumbnail look consistent. 2010-04-05 13:30:13 -07:00
Ray Chen
44dcf65871 Make createVideoThumbnail and createImageThumbnail look consistent. 
Change-Id: I9a4798fefe3968ac847d46100036a6dde39791c9
 2010-04-05 13:06:39 -07:00
Andreas Huber
04506177a3 am e47009aa: am 0f7c543c: am eb6e3edc: Merge "Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly." into froyo 2010-04-02 14:20:17 -07:00
Andreas Huber
eb6e3edc0f Merge "Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly." into froyo 2010-04-02 14:03:46 -07:00
Andreas Huber
a4357addf6 Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly. 
Change-Id: I90c7db6656a53339c5d454336548c4f00d0d9064
related-to-bug: 2548426
 2010-04-02 12:55:31 -07:00
Andreas Huber
9702a03b75 am 1f857164: am f0e62b7a: am 29039dee: Merge "Support another kind of iso mpeg4 file." into froyo 2010-04-02 11:32:48 -07:00
Andreas Huber
29039deea9 Merge "Support another kind of iso mpeg4 file." into froyo 2010-04-02 11:18:32 -07:00
Jean-Michel Trivi
5a3a3b16ba am 055897ac: am 28525488: am 9ab05fff: Merge "Fix bug 2565463 Ensure an object cannot appear twice in the AudioFocus stack. Enforce parameter check in AudioManager.requestAudioFocus() Typo correction in AudioService.unregisterMediaButtonEventReceiver()" into froyo 2010-04-02 09:28:50 -07:00
Dave Sparks
6f9ff5d226 am 4cd79e3c: am 6c8770df: am d9c16c37: Merge "Use local lock for most MediaMetadataRetriever methods. Bug 2560834." into froyo 2010-04-02 09:28:46 -07:00
Jean-Michel Trivi
9ab05fff41 Merge "Fix bug 2565463 Ensure an object cannot appear twice in the AudioFocus stack. Enforce parameter check in AudioManager.requestAudioFocus() Typo correction in AudioService.unregisterMediaButtonEventReceiver()" into froyo 2010-04-02 08:53:42 -07:00
Yu Shan Emily Lau
aae05df08a am 05e7aedd: am 948e7dc0: am e11bafec: Add the test template for the media audio manager test. 2010-04-01 23:48:17 -07:00
Dave Sparks
db6cc0ba71 Use local lock for most MediaMetadataRetriever methods. Bug 2560834. 
MediaMetadataRetriever uses a single static lock for all operations.
This effectively serializes all metadata retrieval operations in a
single process. This patch uses the object level lock for all normal
operations and only uses the static lock to serialize calls to
release.

Change-Id: I81c9f234c2f0007a26d18e1398c709b41a4dbbd7
 2010-04-01 18:08:22 -07:00
Jean-Michel Trivi
55d1bb3483 Fix bug 2565463 Ensure an object cannot appear twice in the 
AudioFocus stack.
 Enforce parameter check in AudioManager.requestAudioFocus()
 Typo correction in AudioService.unregisterMediaButtonEventReceiver()

Change-Id: Iedd6081a2a096bd7effbaeb9f888a31691201b3b
 2010-04-01 17:40:58 -07:00
Yu Shan Emily Lau
e11bafec8d Add the test template for the media audio manager test. 
Change-Id: I55b5de0c55dbfded8d972f7378da3c19a613978c
 2010-04-01 16:11:49 -07:00
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
bf3b4985b6 am 85bc2ae1: am d12d6c30: am ccc17b34: Merge "Public API changes for CameraProfile and CamcorderProfile classes" into froyo 2010-04-01 10:56:47 -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
43c754271a am a74a751c: am 5100df84: am 49e5a4c5: Update AMR codec. 2010-04-01 10:00:16 -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
Glenn Kasten
7f9b1fa671 Add isSilentMode initially hidden before API council approval, test case to be added separately. 
Change-Id: Id9384a2caf45b8775705cde6c990c3c65c7c6312
 2010-03-31 15:54:12 -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