summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Added support for HE-AAC recording.Dave Burke2012-04-302-11/+7
| | | | | | | | Not unhiding HE-AACv2 since that requires stereo mics. Bug: 6275957 Change-Id: I953a6d21e615c8fd23f9390e3c86d63089f5fb75
* Merge "Unhide APIs for timed text and multiple audio track switch APIs" into ↵James Dong2012-04-273-247/+319
|\ | | | | | | jb-dev
| * Unhide APIs for timed text and multiple audio track switch APIsJames Dong2012-04-273-247/+319
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o made all the member variables in helper classes for TimedText to be public and final since they are read-only o removed Text and TextPos helper classes o added two public methods in TimedText class: getText() and getBounds() o cleaned up the javadoc of related methods in MediaPlayer.java and TimedText.java classes o make the inner classes of TimedText static and final o change invoke and let it throw RuntimeException on failure (thus a test class needs to be modified also). o related-to-bug: 6110705,5542712 Change-Id: Ia1dd1fd5eb8e9fd1b61c6c0d67405edb627a3002
* | Migrate ringtone playback to SystemUI.Jeff Sharkey2012-04-276-83/+164
|/ | | | | | | | | | | | | Introduce IRingtonePlayer, which handles playback for both Ringtone objects and Notifications. SystemUI now hosts this player, which it registers with AudioService. It also keeps MediaPlayer instances warm, and cleans them up after stop() or Binder death. Move both Ringtone and NotificationManagerService to play back audio through this new interface. Bug: 6376128, 6350773 Change-Id: I1dcb86d16ee3c4f07cdb2248d33dcff4ead3609a
* Merge "Protect system services with DUMP permission." into jb-devJeff Sharkey2012-04-271-0/+2
|\
| * Protect system services with DUMP permission.Jeff Sharkey2012-04-261-0/+2
| | | | | | | | Change-Id: I5e53859f8b8e5473e54eca43ebd7de841f1a05ff
* | Merge "system and UI sounds volume policy" into jb-devEric Laurent2012-04-273-40/+144
|\ \
| * | system and UI sounds volume policyEric Laurent2012-04-263-40/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement a more consistent policy for system and UI sounds (key clicks, lock/unlock, camera shutter, DTMF, low battery...): - All system sounds are played over STREAM_SYSTEM stream type. - The STREAM_SYSTEM volume that was previously fixed now tracks the volume of a "master" stream type. This "master" stream type is STREAM_RING for phones and STREAM_MUSIC for tablets which corresponds to the stream whose volume is modified by default by the volume keys. - The STREAM_SYSTEM volume ranges from -24dB to -6dB (-24dB to -12dB over headphones) when the "master" stream volume ranges from its min to its max. - DTMF tones are played over STREAM_DTMF that tracks the "master" stream volume in the same manner with the following exception: when in call, DTMF stream tracks STREAM_VOICE_CALL volume. - Camera shutter sound is played over STREAM_SYSTEM_ENFORCED stream that tracks the "master" stream volume except in countries where regulation enforces this sound. In this case its volume is fixed and cannot be muted. - Low battery sound is played over STREAM_SYSTEM and therefore has a tunable volume and is heard while in call. Issue 6344620. Issue 6069229. Issue 6213100. Change-Id: I53a237878ead596e706c5dbbb1420e62cde32bd7
* | | Merge "Resolving the black screen / crash in effects" into jb-devPannag Sanketi2012-04-261-3/+18
|\ \ \ | |/ / |/| |
| * | Resolving the black screen / crash in effectsPannag Sanketi2012-04-261-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | b:/6278826 The SurfaceTextureTarget Filter was not unregistering the surface on closing leading to crashes and blank screens. Change-Id: Ia9f6fc69b92d5a5e2e1e3803969152d11528aa3d
* | | Merge "Fix the test cases which fail to launch the camera in the device ↵Yu Shan Emily Lau2012-04-265-7/+14
|\ \ \ | | | | | | | | | | | | which only has one camera." into jb-dev
| * | | Fix the test cases which fail to launch the cameraYu Shan Emily Lau2012-04-265-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | in the device which only has one camera. Change-Id: Ia34087715e49f1aa3e86f3f85cb4e77168323321
* | | | Merge "Unhide new AAC-ELD audio record type." into jb-devDave Burke2012-04-261-0/+2
|\ \ \ \
| * | | | Unhide new AAC-ELD audio record type.Dave Burke2012-04-251-0/+2
| |/ / / | | | | | | | | | | | | Change-Id: Ibb9d3cd797c0b14c495776dc172ff7dadf6df7d6
* | | | Merge "The MediaExtractor can now unselect tracks and has more control over ↵Andreas Huber2012-04-263-12/+61
|\ \ \ \ | | | | | | | | | | | | | | | seeking." into jb-dev
| * | | | The MediaExtractor can now unselect tracks and has more control over seeking.Andreas Huber2012-04-263-12/+61
| |/ / / | | | | | | | | | | | | | | | | Change-Id: I12c28bf31fe9fb4057352999fa38213ae289a417 related-to-bug: 6276111
* | | | Merge "Fix AudioManager.forceVolumeControlStream()" into jb-devEric Laurent2012-04-263-19/+70
|\ \ \ \ | |/ / / |/| | |
| * | | Fix AudioManager.forceVolumeControlStream()Eric Laurent2012-04-253-19/+70
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioManager.forceVolumeControlStream() is used by VolumePanel to temporarily force the stream type which volume is controlled by volume keys. Current implementation is not working if the VolumePanel is not executed by the same process as the one receiving the volume key events. Issue 6302421. Change-Id: I2700587a027ffb962429b42083312cd92fe79215
* | | Further speed up playlist processingMarco Nelissen2012-04-251-96/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously when processing playlists, the entire audio table would be read for every line in a playlist file. While there would be only one query, a lot of data was being moved from sqlite to java over and over again, and if the data didn't all fit in a CursorWindow, additional queries would be done under the hood. With this change, playlists are first cached in memory. Then the audio table is queried, and for every row in the audio table, the best match from the playlist cache is found. This way the audio table is only traversed once, so each row is only fetched once. Once the entire audio table has been read, the in-memory playlist cache contains the best matching entry for each line, and the playlists are written out to the database. Currently, the audio table is traversed once for each playlist. This could be further optimized in the future by processing all playlists at the same time. b/6346786 Change-Id: Iead3f9ae838d600d085e8e6d3c4874d42314468e
* | | Merge "Move RINGTONE_PICKER to handle external storage." into jb-devJeff Sharkey2012-04-251-4/+4
|\ \ \ | |/ / |/| |
| * | Move RINGTONE_PICKER to handle external storage.Jeff Sharkey2012-04-251-4/+4
| |/ | | | | | | | | | | | | | | To give RINGTONE_PICKER external storage access, move it from system to MediaProvider. Fix OOBE when getRingtoneUri() kicked requery(). Bug: 6346701 Change-Id: I837002eef0580b8cdd8920a27b068c745995a8a3
* | Allow multichannel configurations in android.media.AudioTrackJean-Michel Trivi2012-04-251-6/+26
|/ | | | | | | | Compare the channel configuration against a mask of the public channel masks in AudioFormat for up to 5.1 with back channels, and allow combinations within this mask. Change-Id: I84b72dfd88d4490f0c67bf10d13151a9eb06f6a8
* am b4781b9b: am ea8ceca8: am 90577af7: Merge "use utf8_length() instead of ↵Dianne Hackborn2012-04-241-48/+5
|\ | | | | | | | | | | | | local function, isValidUtf8()" * commit 'b4781b9b489bc8b0049e1e92b7ab00e32b02b12c': use utf8_length() instead of local function, isValidUtf8()
| * am 90577af7: Merge "use utf8_length() instead of local function, isValidUtf8()"Dianne Hackborn2012-04-181-48/+5
| |\ | | | | | | | | | | | | * commit '90577af796cd526f842d6f07c2d95ed4fcc2f6d8': use utf8_length() instead of local function, isValidUtf8()
| | * use utf8_length() instead of local function, isValidUtf8()Homin Lee2012-04-131-48/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | utf8_length() from libutils returns -1 when source not contains valid sequence for UTF-8. Fixed to use it and removed the local function isValidUtf8(). Change-Id: If2834ce1d1ae07fd8526ce8bc5df3fd3f44e85c8 Signed-off-by: Homin Lee <suapapa@insignal.co.kr>
* | | Speed up playlist processingMarco Nelissen2012-04-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | When matching entries in playlists, only consider audio files. b/6346786 Change-Id: Ia744d002c2821a81840303b9409593da48a08b73
* | | Add the ability to query the amount of cached data to MediaExtractor.Andreas Huber2012-04-203-0/+62
| | | | | | | | | | | | | | | Change-Id: I47ae60bc6fb8d88979c1f0d650b6ac528e811371 related-to-bug: 6364341
* | | Merge "Update javadoc for timed text / multiple audio track APIs"James Dong2012-04-191-44/+65
|\ \ \
| * | | Update javadoc for timed text / multiple audio track APIsJames Dong2012-04-191-44/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o Throw runtime exception when selectTrack, unselectTrack, getTrackInfo fails o remove redundant code for selectTrack and unselectTrack methods o related-to-bug: 6110705,5542712 Change-Id: I59f0ed638e93d0365eccab1e33c9d50354a9c1ba
* | | | Merge "DRM errors signaled by the CryptoPlugin are now visible to MediaCodec ↵Andreas Huber2012-04-193-13/+68
|\ \ \ \ | | | | | | | | | | | | | | | clients"
| * | | | DRM errors signaled by the CryptoPlugin are now visible to MediaCodec clientsAndreas Huber2012-04-193-13/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | through a custom exception "MediaCodec.CryptoException". Change-Id: I30215e9e13bab68abad23e27dcead7c1accd07f1 related-to-bug: 6365261
* | | | | Merge "Unhide Visualizer scaling mode definitions and methods"Jean-Michel Trivi2012-04-191-4/+0
|\ \ \ \ \
| * | | | | Unhide Visualizer scaling mode definitions and methodsJean-Michel Trivi2012-04-191-4/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unhide Visualizer set/get methods, and associated constant definitions. Change-Id: Iaafe5f7a2f1273f72c3f7f842b416b93614dfa65
* | | | | Merge "unhide API for synchronous audio capture."Eric Laurent2012-04-193-4/+1
|\ \ \ \ \
| * | | | | unhide API for synchronous audio capture.Eric Laurent2012-04-193-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unhide MediaSyncEvent class and AudioRecord.startRecording() method with synchronization event allowing to start audio capture upon occurence of a specific event. So far the only event defined is playback presentation complete but more events and synchronized playback/capture methods could be defined in the future. Change-Id: If05fc6cd125dd9afad451727f792a3fd9e916bef
* | | | | | Merge "Add functional tests for Visualizer volume scaling mode"Jean-Michel Trivi2012-04-191-0/+116
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add functional tests for Visualizer volume scaling modeJean-Michel Trivi2012-04-191-0/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add test to set/get the volume scaling mode. Add test to verify that volume decreases diminish the commputed energy. Change-Id: I0a5d45d064a46a18e5c4b9d7a304c9572f100cdf
* | | | | | Merge "Add support for scaling mode parameter in Visualizer effect"Jean-Michel Trivi2012-04-192-0/+79
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | |
| * | | | Add support for scaling mode parameter in Visualizer effectJean-Michel Trivi2012-04-172-0/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add set/get methods to set how the Visualizer scales the captured data. Change-Id: Ia1da00fd5474dd3484b59caf7d1d0a812d0347de
* | | | | unhide audio pre processing API.Eric Laurent2012-04-184-9/+2
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unhide APIs for Noise Suppressor(NS), Acoustic Echo Canceler (AEC) and Automatic Gain Control (AGC) audio pre processings. Also unhide getAudioSessionId() method on AudioRecord. Change-Id: I788f7a0724b152cc98c8167d9434e64c12bada95
* | | | Fix a typo and choose a reasonable default for crypto-mode (0 would be ↵Andreas Huber2012-04-181-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | unencrypted) Change-Id: Ia46a7d7dd405bd569f319a64e43123d802c867d3 related-to-bug: 6275919
* | | | Information required to decrypt buffers is now packaged into ↵Andreas Huber2012-04-185-30/+249
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaCodec.CryptoInfo New API on MediaExtractor to retrieve a CryptoInfo structure where applicable. Change-Id: I18edfc9ac56a4544c8f17cba24401b96dacbff7d related-to-bug: 6275919
* | | | Merge "AddExternalSource(String path) needs to turn the path to fd if it is ↵James Dong2012-04-171-11/+14
|\ \ \ \ | | | | | | | | | | | | | | | a file"
| * | | | AddExternalSource(String path) needs to turn the path to fd if it is a fileJames Dong2012-04-171-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o related-to-bug: 5542712 Change-Id: Iea32012996ca9de4c86f144de916df64fcab3c52
* | | | | Make seekTo not throw exceptions.Andreas Huber2012-04-171-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9d0469962364b86fbab920e9ac65f468fc630737 related-to-bug: 6276111
* | | | | MediaCrypto's constructor can throw RuntimeException.Andreas Huber2012-04-172-2/+2
|/ / / / | | | | | | | | | | | | | | | | Change-Id: I5718e9abab0d1465882580e826747d6a78bdefb5 related-to-bug: 6275919
* | | | Unhide new media related java APIs.Andreas Huber2012-04-1612-139/+579
|/ / / | | | | | | | | | Change-Id: If0b8201eaca74f51f3499b6ecdfb73088586ee24
* | | Merge "Fix failure from setDataSource(String path) when path is a local file"James Dong2012-04-122-11/+20
|\ \ \
| * | | Fix failure from setDataSource(String path) when path is a local fileJames Dong2012-04-122-11/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | o the failure was because the mediaserver does not have read permission to sdcard o related-to-bug: 6325960,6322913 Change-Id: I4feec01b8165c78563eee8aab69cb24df3244d03
* | | | Fix thumbnail generation failureJames Dong2012-04-112-10/+19
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | o Change the impl of MediaMetadataRetriever.setDataSource(String). It opens and passes an fd to the media framework rather than pass the file path directly to the media server. The change is needed since media server does not have read permission to sdcard o Remove the unnecessary jni method Change-Id: I5a2f47dde804523d264b588f855ba2575a99c179
generated by cgit v1.1 at 2025-02-10 04:52:57 +0000