summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* 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()"
| * - To track the usage of all audio output devicesGloria Wang2011-03-021-5/+13
| | | | | | | | | | | | | | | | - To track the currently used audio device - The devices are separated as speaker and other audio devices - Provide the collected data to battery application through pullBatteryData() Change-Id: I374c755266b5ac6b1c6c630400f4daf901ea8acc
* | Allow optional specification of a PTS timestamp when signalling a discontinuity.Andreas Huber2011-03-021-0/+6
|/ | | | | | | If present, rendering will be suppressed until reaching the timestamp. Change-Id: Ic64bdf4225063c5a4d042ea9809960b843a46d19 related-to-bug: 3489454
* Merge "Add support for up to 32 buffers per Surface"Mathias Agopian2011-03-011-3/+3
|\
| * Add support for up to 32 buffers per SurfaceMathias Agopian2011-03-011-3/+3
| | | | | | | | | | | | Bug: 3488016 Change-Id: Ie5536ad77d42a4d0e8270e0fd87ecb73471bcbbc
* | Get rid of redundant media profilesJames Dong2011-03-011-2/+69
| | | | | | | | | | | | bug - 3330679 Change-Id: Idc55aea32746c0c57552c5e15a289681421aa859
* | Add an OMX IL API for querying buffer usage flags.Jamie Gennis2011-02-282-0/+15
|/ | | | | | | | | | This change defines an OpenMAX IL API for querying from the IL component the gralloc buffer usage flags that should be used to allocate the buffers. It also adds the Stagefright plumbing for using the new OMX IL API. Change-Id: I046b5e7be70ce61e2a921dcdc6e3aa9324d19ea6 Related-Bug: 3479027
* Merge "Bug 3438258 Add SurfaceTexture as MediaPlayer sink"Glenn Kasten2011-02-244-1/+76
|\
| * Bug 3438258 Add SurfaceTexture as MediaPlayer sinkGlenn Kasten2011-02-234-1/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This change enables the use of a SurfaceTexture in place of a Surface as the video sink for an android.media.MediaPlayer. The new API MediaPlayer.setTexture is currently hidden. This includes: - New Java and C++ interfaces - C++ plumbing and implementation (JNI, Binder) - Stagefright AwesomePlayer and NuPlayer use ANativeWindow (either Surface or SurfaceTextureClient) Change-Id: I2b568bee143d9eaf3dfc6cc4533c1bebbd5afc51
* | Merge "Add YV12 preview format to camera parameter constants."Wu-cheng Li2011-02-241-2/+1
|\ \ | |/ |/|
| * Add YV12 preview format to camera parameter constants.Wu-cheng Li2011-02-241-2/+1
| | | | | | | | | | bug:3463624 Change-Id: I8f2992dadfd3fb9e3c9d67743e52da7f3212827e
* | Merge "Application-managed callback buffer support for raw image"James Dong2011-02-232-14/+21
|\ \
| * | Application-managed callback buffer support for raw imageJames Dong2011-02-222-14/+21
| | | | | | | | | | | | | | | | | | bug - 3292153 Change-Id: I9789f7c5cde3a3889d7375e881181e9152d95fc2
* | | Merge "- Add method in MediaPlayerService to collect and pull codec usage ↵Gloria Wang2011-02-231-0/+16
|\ \ \ | |/ / |/| | | | | (duration) for the battery app - Collect MediaPlayer decoding usage data"
| * | - Add method in MediaPlayerService to collect and pullGloria Wang2011-02-221-0/+16
| |/ | | | | | | | | | | | | codec usage (duration) for the battery app - Collect MediaPlayer decoding usage data Change-Id: I0ef4e32b6a041ba1fe73c19f9c67185c61d03965
* | Support more MPEG4-LATM audio functionality.Andreas Huber2011-02-221-1/+2
|/ | | | | | | related-to-bug: 3474610 Change-Id: I6dab40e8b465922c62be9ee7f168718822c6caac Now skipping extra header that the spec claimed shouldn't be present in LATM...
* A/V synchronization at the beginning of a recording sessionJames Dong2011-02-171-3/+3
| | | | | | | | | | | | | o do not use edts/elst boxes since these optional boxes are ignored o manipulate the first video/audio frame duration to make sure that the rest of the audio/video is in sync (ideally, we should only manipulate the vidoe frame duration, not the audio) o reduce the initial audio mute/suppression period, which is used to eliminate the "recording" sound. bug - 3405882 and 3362703 Change-Id: Ib0acfb4f3843b365157288951dc122b006299c18
* Decouple AudioRecord read and audio encodingJames Dong2011-02-161-6/+18
| | | | | | bug - 3313754 Change-Id: I951dd0e21e34aa1412c391f003bc32103d0424b0
* Merge "Add AAC extractor"Gloria Wang2011-02-151-0/+1
|\
| * Add AAC extractorGloria Wang2011-02-151-0/+1
| | | | | | | | Change-Id: Iedb08525ac72e65ba98e5c791734da0720a0e3f6
* | Make available h263 DSI information from MPEG4ExtractorJames Dong2011-02-111-0/+2
|/ | | | | | bug - 3446863 Change-Id: Idbaf7a564d544784fdbc36ed0339c98a519adc88
* Bug 3352047 Wrong message when adjusting volumeGlenn Kasten2011-02-102-0/+2
| | | | | | Add hidden AudioManager.getDevicesForStream and output device codes. Change-Id: I4d1c1d3b6a077cd117720817d1f733dda557b947
* Reduce blocking time in file writeJames Dong2011-02-091-5/+8
| | | | | | bug - 3418787 Change-Id: I4723662bf46ed07271be8468f84ae5d93cb793fa
* Merge "Handle some edge cases when seeking while starting up OMXCodec"Andreas Huber2011-02-081-0/+1
|\
| * Handle some edge cases when seeking while starting up OMXCodecAndreas Huber2011-02-081-0/+1
| | | | | | | | | | | | | | | | | | | | These were exposed by the new preview-seekframe while paused code. In particular, the codec may have been in state RECONFIGURING when attempting to seek, or we may have initiated flushing of the output port and this may not have completed yet by the time we want to reconfigure the output port. Change-Id: Id7640ade11dbc7205a22f648ea0b5e3e9b49cf4b related-to-bug: 3392259
generated by cgit v1.1 at 2024-07-04 05:04:43 +0000