summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge "Add setParameter/getParameter to MediaPlayer API. for bug 1982947"Gloria Wang2011-04-293-0/+7
|\ \ \
| * | | Add setParameter/getParameter to MediaPlayer API.Gloria Wang2011-04-293-0/+7
| |/ / | | | | | | | | | | | | | | | for bug 1982947 Change-Id: If3f40e4f18cbba155af29944af38bdc627f8cd53
* | | Add DRM errors in the DRM frameworks to MediaErrors also.Gloria Wang2011-04-292-9/+22
|/ / | | | | | | | | | | For bug 4350156. Change-Id: Ib5711ec642178a49203a448b7f5114e675d49394
* | get rid of dependency on copybit HAL moduleMathias Agopian2011-04-281-2/+0
|/ | | | Change-Id: Ia608099a2426c11a91d33063ba53c93e1eccb428
* Merge changes I22d9e018,Ib0701fcc,Ibc637918,I9eb7e002,I4adcec73Dima Zavin2011-04-2710-362/+141
|\ | | | | | | | | | | | | | | | | * changes: audioflinger: don't do work in constructor, instead do it in onFirstRef audioflinger: enumerate all the possible audio interfaces audio/media: convert to using the audio HAL and new audio defs libmedia: move AudioParameter out of AudioSystem audioflinger: move legacy audio hw/policy out to libhardware_legacy
| * audio/media: convert to using the audio HAL and new audio defsDima Zavin2011-04-2710-322/+70
| | | | | | | | | | Change-Id: Ibc637918637329e4f2b62f4ac7781102fbc269f5 Signed-off-by: Dima Zavin <dima@android.com>
| * libmedia: move AudioParameter out of AudioSystemDima Zavin2011-04-272-44/+75
| | | | | | | | | | Change-Id: I9eb7e002d141936258050d4fa4f0ccd8202bfc54 Signed-off-by: Dima Zavin <dima@android.com>
* | am d84df054: am 96974931: am 83ddcdf7: Add heartbeat error codes into ↵Gloria Wang2011-04-271-0/+11
|\ \ | |/ |/| | | | | | | | | MediaErrors.h * commit 'd84df05490e8b102e81cca848f65c174398be1b6': Add heartbeat error codes into MediaErrors.h
| * Add heartbeat error codes into MediaErrors.hGloria Wang2011-04-261-0/+11
| | | | | | | | | | | | related-to-bug: 4322415 Change-Id: I78137c61e3a8ce9afcb9fb38cb77a83561b9b72d
* | Merge "MediaScanner: reimplement the ".nomedia" feature for hiding files ↵Mike Lockwood2011-04-251-3/+2
|\ \ | | | | | | | | | from the media provider"
| * | MediaScanner: reimplement the ".nomedia" feature for hiding files from the ↵Mike Lockwood2011-04-251-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | media provider Previously we ignored any files and directories that had name started with '.' and ignored any directories that contained a ".nomedia" file. Now to support transferring any file via MTP, we now add these previously ignored files to the media database, but will not mark them as audio, video, image or playlist files. That way they will be included in the files table but will be hidden from the audio, video, images and playlist views that are used by apps like Music and Gallery. Bug: 3405327 Change-Id: I2d7285bd32e06c1a5c4ef6a8a15f8f8b2c33b39b Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | Clarify the meaning of weight in the focus and metering area HAL.Eino-Ville Talvala2011-04-251-9/+12
|/ / | | | | | | | | | | | | | | | | Weigh values must be less than 1000, but have no restriction on their sum. Weights should be interpreted as per-pixel values, meaning larger areas will have more influence over focus/metering than smaller areas of the same weight. Change-Id: I988b74f988ddba2ff0c49d078ff3174b47cbae18
* | Merge "- Add another parameter in notify() to be able to send timed text ↵Gloria Wang2011-04-133-6/+9
|\ \ | | | | | | | | | sample through listener during video playback. - Add OnTimedTextListener in the MediaPlayer For feature request 800939."
| * | - Add another parameter in notify() to be able to send timed text sampleGloria Wang2011-04-133-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | through listener during video playback. - Add OnTimedTextListener in the MediaPlayer For feature request 800939. Change-Id: I65072c27acb4c0037109a72be38c73e9f667420f
* | | Add camera metering area API.Wu-cheng Li2011-04-131-0/+38
|/ / | | | | | | | | | | | | The API are still hidden. bug:3475893 Change-Id: Id4147528def5e0fe067e1a3ed315fa34c14a0640
* | Add camera focus area API.Wu-cheng Li2011-04-081-0/+38
| | | | | | | | | | | | | | | | The API are still hidden. bug:3475893 Change-Id: I92405c9e332b7fb141788cda7ebc9705dd666c67
* | Merge "Miscellaneous code cleanup in audio framework"Glenn Kasten2011-04-061-3/+8
|\ \
| * | Miscellaneous code cleanup in audio frameworkGlenn Kasten2011-04-061-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: - Move declaration of kClassPathName to top of file so it can be used in more than one place, instead of "android/media/AudioSystem". - Make private methods static. - Add comment to stream_type, audio_mode, force_use types that they must match values in AudioSystem.java. - Add comment about unused types mp3_sub_format and vorbis_sub_format. - Fix typos. - Use @ in javadoc comments. - Delete dead APIs setMode, getMode, setRouting, getRouting in AudioSystem.java (they are all hidden, deprecated, and unused by rest of framework) - Delete unused private log method. - Fix pathname for android_media_AudioSystem.cpp. - Improve code formatting for space after == and !=. - Add logging of delta for changing audio policy manager ref count. Change-Id: I18037c7beb8ab76d1fda08c11e589f6e591d36e1
* | | Merge "Remove unused references to ISurface"Mathias Agopian2011-04-063-3/+0
|\ \ \
| * | | Remove unused references to ISurfaceMathias Agopian2011-04-043-3/+0
| |/ / | | | | | | | | | Change-Id: I542806b5c91c525ed7cde821f6963f1e020ddf1a
* | | New fix for issue 4111672: control block flagsEric Laurent2011-04-051-4/+4
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first fix (commit 913af0b4) is problematic because it makes threads in mediaserver process block on the cblk mutex. This is not permitted as it can cause audio to skip or worse have a malicious application prevent all audio playback by keeping the mutex locked. The fix consists in using atomic operations when modifying the control block flags. Also fixed audio_track_cblk_t::framesReady() so that it doesn't block when called from AudioFlinger (only applies when a loop is active). Change-Id: Ibf0abb562ced3e9f64118afdd5036854bb959428
* | Support for divx files, i.e. mpeg 4 video + mpeg audio layer III in .avi filesAndreas Huber2011-03-301-0/+1
| | | | | | | | | | Change-Id: I6e1e989c43300ddb0d341e3e9183cdccd69eeae6 related-to-bug: 4192562
* | Stagefright DataSources now expose the underlying content mime type.Andreas Huber2011-03-301-0/+2
| | | | | | | | | | | | | | | | Use that mime type to determine if we should do upfront buffering at the start of playback and don't for audio streams to ensure playback starts fairly instantly. Change-Id: If21e36d1b024f0e5c723911bceadaa2e0307ab42 related-to-bug: 4090916
* | frameworks/base: some camera-interface cleanupIliyan Malchev2011-03-284-94/+0
| | | | | | | | | | | | | | | | | | Methods getNumberOfVideoBuffers() and getVideoBuffer() as well as struct image_rect_struct are no longer used (instead, the necessary information is passed through ANativeWindow.) Change-Id: If4b11446fc9ccbde1f6b45bc70c0d0b8e54376eb Signed-off-by: Iliyan Malchev <malchev@google.com>
* | am ed7b688c: am aac43ea1: am b8b85ea2: Merge "Fix for bug 4126624. Change ↵Gloria Wang2011-03-251-1/+1
|\ \ | |/ | | | | | | | | | | the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1 * commit 'ed7b688c015dbd064b81dfaed5dd6c7ed6728ac3': Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.
| * Fix for bug 4126624.Gloria Wang2011-03-241-1/+1
| | | | | | | | | | | | Change the mDrmManagerClientImpl to sp to avoid double delete the pointer. Change-Id: I7aacea1bc58ab6425ef6f6f09472c6f2970ebb4d
* | Delay signaling the end of audio playback until all frames have actually played.Andreas Huber2011-03-221-0/+2
| | | | | | | | | | Change-Id: I1fa07358a885a818fd0a5d7da425740f86095e10 related-to-bug: 3404000
* | am fc4c13be: am 01240177: am 3cc797b9: Merge "Add one more field in ↵Gloria Wang2011-03-221-0/+6
|\ \ | |/ | | | | | | | | | | DecryptHandle to support bug 4126624" into honeycomb-mr1 * commit 'fc4c13be8ce8c2d05432d855c2c61548abef3385': Add one more field in DecryptHandle to support bug 4126624
| * Add one more field in DecryptHandle to support bug 4126624Gloria Wang2011-03-211-0/+6
| | | | | | | | Change-Id: Ic7ea5fd211c4f8283de8fdf722f89b6a94e5750b
| * do not merge: Cherry pick change I6529695c from master to partially fix bug ↵Gloria Wang2011-03-211-0/+16
| | | | | | | | | | | | 4126624. Change-Id: If724de60bd6da1becdffc815d5358ffe78629469
| * DO NOT MERGE Send WebView the current transform and whether we're drawing a ↵Romain Guy2011-03-181-0/+50
| | | | | | | | | | | | | | | | | | | | | | layer. Bug #3275491 These can be used by WebView to correctly apply alpha and geometric transforms. Change-Id: I61057997f5fda1e803d247fc77500a038d5f3aab
* | Fix for 4084554.Gloria Wang2011-03-211-0/+16
| | | | | | | | | | | | DRM framework support for enabling/disabling copy control settings from a DRM plugin Change-Id: I6529695cc4adbab2b9a63708bb459e3b77e07564
* | Support passing headers to MediaMetadataRetriever's setDataSource APIAndreas Huber2011-03-213-4/+17
| | | | | | | | | | Change-Id: Ib1a5c08fc5034cac05034db27007a35c9b660b26 related-to-bug: 3506316
* | Better organize media recorder error and information event and typesJames Dong2011-03-182-17/+48
| | | | | | | | Change-Id: I45f1f953596985494725525c1fabf57eccc19175
* | Fix for bug 4126103.Gloria Wang2011-03-171-3/+3
| | | | | | | | | | | | | | | | | | mMessage in DrmInfoEvent is a reference to the message string, so the temporary message created in the plugin was going out of scope and being destructed while the message was being sent. Changed DrmInfoEvent's mMessage to be const String8 instead of const String8& Change-Id: I174197ad24f3df997d3bc1f897658cfc53862636
* | am 782ffe91: am 9c0c5b56: am 2f1f2248: Fix missing AOSP copyright headers ↵James Dong2011-03-174-0/+64
|\ \ | |/ | | | | | | | | | | for a bunch of media framework files * commit '782ffe91da665c6b1fb9e297faa6e0dc6035f40c': Fix missing AOSP copyright headers for a bunch of media framework files
| * Fix missing AOSP copyright headers for a bunch of media framework filesJames Dong2011-03-174-0/+64
| | | | | | | | | | | | bug - 4119349 Change-Id: If5924e16a5f596d5d73d9beb66eaf5ac9a6f0e50
* | Send WebView the current transform and whether we're drawing a layer.Romain Guy2011-03-171-0/+50
| | | | | | | | | | | | | | | | | | Bug #3275491 These can be used by WebView to correctly apply alpha and geometric transforms. Change-Id: I2ecd4376d68df886dead3c9240317de33f56828f
* | Add memory leak tracking/debugging code to drm serverJames Dong2011-03-141-0/+28
| | | | | | | | | | | | bug - 4099038 Change-Id: I6c048eaf3d7f34bc144b8daaa5fdef1ed474af66
* | am 67718e07: am 132bb659: Merge "For issue 4082089 Add more info and error ↵Gloria Wang2011-03-141-0/+7
|\ \ | |/ | | | | | | | | | | events into the DRM framework" into honeycomb-mr1 * commit '67718e076422f8f28f4e30a39df9e462ef32d19b': For issue 4082089 Add more info and error events into the DRM framework
| * For issue 4082089Gloria Wang2011-03-141-0/+7
| | | | | | | | | | | | Add more info and error events into the DRM framework Change-Id: I0bb3251c5947fc8e977d478e1ba46b242cb97e9d
* | resolved conflicts for merge of c761a80d to masterGloria Wang2011-03-141-1/+0
|\ \ | |/ | | | | Change-Id: I0c0474b95d66c23310d04b7a7f4c9571a211582c
| * - Some change on the DrmManager in order to support feature request 4082089.Gloria Wang2011-03-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | In DrmManager, we currently lock both processDrmInfo() and onInfo() which is ok for now since processDrmInfo() is async call, and it will return without waiting for onInfo() call. However, if we send an event in processDrmInfo(), we will got deadlock here because we need to invoke onInf() which will wait for processDrmInfo() to release the lock. Use different lock for onInfo(). - Remove some redundent mutex lock. Change-Id: I59c794f95ba1693425723224114fa975cf9b235f
* | am 055066e1: am 92f2f3ff: Merge "Bug 3012968 DRM output control" into ↵Glenn Kasten2011-03-111-0/+4
|\ \ | |/ | | | | | | | | | | honeycomb-mr1 * commit '055066e1e77d944383360d50057f5b8187f23c0b': Bug 3012968 DRM output control
| * Bug 3012968 DRM output controlGlenn Kasten2011-03-101-0/+4
| | | | | | | | | | | | | | Modifies Stagefright to verify that there is a hardware-protected path to video sink for DRM content. Change-Id: I18b8741390e803a05a88c7f180b860a24ba88a10
* | Fix for bug 3477330Gloria Wang2011-03-104-16/+25
| | | | | | | | | | | | | | This patch fixs a crash bug caused by using a NULL DecryptHandle pointer. Fix by using sp<DecryptHandle> instead. Change-Id: Icbd59858385e8256125a615a3c82656b25319d44
* | am 2dc78477: am cc34967f: Merge "Fix issue 3439872: video chat and bluetooth ↵Eric Laurent2011-03-093-2/+15
|\ \ | |/ | | | | | | | | | | SCO" into honeycomb-mr1 * commit '2dc78477364bd4accb9a603baaafca9a5523dcec': Fix issue 3439872: video chat and bluetooth SCO
| * Fix issue 3439872: video chat and bluetooth SCOEric Laurent2011-03-083-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes the stability problems experienced when using a bluetooth headset supporting both A2DP and SCO. Problems occur when starting the video chat at which time the A2DP output is being stopped to start SCO. At that time, active AudioTracks are invalidated by AudioFlinger so that a new AudioTrack binder interface can be recreated by the client process on the new mixer thread with correct parameters. The problem was that the process to restore the binder interface was not protected against concurrent requests which caused 2 binder interfaces to be created sometimes. This could lead to permanent client deadlock if one of the client threads was waiting for a condition of the first created binder interface while the second one was created (as the AudioFlinger would only signal conditions on the last one created). This concurrent request situation is more likely to happen when a client uses the JAVA AudioTrack as the JNI implementation uses simultaneously the native AudioTrack callback and write push mechanisms. By doing so, the code that checks if the binder interface should be restored (in obtainBuffer()) is much more likely to be called concurrently from two different threads. The fix consists in protecting the critical binder interface restore phase with a flag in the AudioTrack control block. The first thread acting upon the binder interface restore request will raise the flag and the second thread will just wait for a condition to be signaled when the restore process is complete. Also protected all accesses to the AudioTrack control block by a mutex to prevent access while the track is being destroyed and restored. If a mutex cannot be held (e.g because we call a callback function), acquire a strong reference on the IAudioTrack to prevent its destruction while the cblk is being accessed. Modified AudioTrack JNI to use GetByteArrayElements() instead of GetPrimitiveArrayCritical() when writing audio buffers. Entering a critical section would cause the JNI to abort if a mediaserver crash occurs during a write due to the AudioSystem callback being called during the critical section when media server process restarts. Anyway with current JNI implementation, either versions do not copy data most of the times and the criticial version does not guaranty no data copy. The same modifications have been made to AudioRecord. Change-Id: Idc5aa711a04c3eee180cdd03f44fe17f3c4dcb52
* | Added more metadata published by the MediaMetaDataRetrieverAndreas Huber2011-03-041-0/+6
|/ | | | | | | | | - presence of audio/video content - video dimensions - avg. bitrate Change-Id: Ie6d478a3c2d0bb6bebaea99ac0a20a4c17808934 related-to-bug: 3506316
* Merge "- To track the usage of all audio output devices - To track the ↵Gloria Wang2011-03-021-5/+13
|\ | | | | | | currently used audio device - The devices are separated as speaker and other audio devices - Provide the collected data to battery application through pullBatteryData()"
generated by cgit v1.1 at 2024-09-12 09:30:57 +0000