summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Bluetooth SCO audio API improvements.Eric Laurent2011-05-252-89/+258
| | | | | | | | | | | | | | | | | | | | | | The AudioManager API to control bluetooth SCO did not provide an easy way for applications to handle SCO connection errors. When a request to activate SCO with AudioManager.startBluetoothSco() failed, no state change was indicated via AudioManager.ACTION_SCO_AUDIO_STATE_CHANGED intent. The application had to implement a timeout to handle connection failures. The API change consists in defining a new intent AudioManager.ACTION_SCO_AUDIO_STATE_UPDATED and deprecate AudioManager.ACTION_SCO_AUDIO_STATE_CHANGED. The new intent will broacast a new state CONNECTING when the SCO connection is initiated. The application can monitor changes from CONNECTING to either CONNECTED or DISCONNECTED states to detect connection success or failure. An extra indicating the previous state is also added to the new intent. Also improved BluetoothHeadset service management in AudioService. A disconnection from the service is not considered as a device or SCO link disconnection. Instead, if the service interface is not present when a request to activate SCO is received, an attempt is made to reconnect to the service. Change-Id: I005fda1caaf74bb7de64fece44e9c7e628e828db
* Merge "Make sure all references to the decoder plugin are accounted for"Andreas Huber2011-05-244-2/+10
|\
| * Make sure all references to the decoder plugin are accounted forAndreas Huber2011-05-244-2/+10
| | | | | | | | | | | | | | before calling dlunload(). Change-Id: I59aa1d19edf566b8a86a6f73b1c2eeb47c96b0de related-to-bug: 4466387
* | Merge "Make sure the software mpeg4 decoder supports multiple input frames ↵Andreas Huber2011-05-242-8/+21
|\ \ | |/ | | | | per input buffer"
| * Make sure the software mpeg4 decoder supports multiple input frames per ↵Andreas Huber2011-05-242-8/+21
| | | | | | | | | | | | | | | | input buffer to enable faster throughput in ACodec. Change-Id: I6f6a1c70d9446f9d52c3df257b2d22358b0e71f4
* | am c41a17de: am 6e5cdca1: am ef89cc14: Merge "Multi-repository checkin, goes ↵Jeffrey Tinker2011-05-242-19/+19
|\ \ | |/ |/| | | | | | | | | with https://android-git.corp.google.com/g/111038" into honeycomb-mr2 * commit 'c41a17de2b2e80f246adeef4962073916dcfff0b': Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
| * am 6e5cdca1: am ef89cc14: Merge "Multi-repository checkin, goes with ↵Jeffrey Tinker2011-05-232-19/+19
| |\ | | | | | | | | | | | | | | | | | | https://android-git.corp.google.com/g/111038" into honeycomb-mr2 * commit '6e5cdca12bdbc26dd4d4eb1b1d986783b13601aa': Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
| | * am ef89cc14: Merge "Multi-repository checkin, goes with ↵Jeffrey Tinker2011-05-232-19/+19
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | https://android-git.corp.google.com/g/111038" into honeycomb-mr2 * commit 'ef89cc14957ab631346564801841190346632ac9': Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
| | | * Merge "Multi-repository checkin, goes with ↵Jeffrey Tinker2011-05-232-19/+19
| | | |\ | | | | | | | | | | | | | | | https://android-git.corp.google.com/g/111038" into honeycomb-mr2
| | | | * Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038Jeffrey Tinker2011-05-232-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for b/4198446 HC - Support for Widevine Adaptive VOD Change-Id: Ia777c80825e3416bab6ae6273fba46a194135e60
* | | | | resolved conflicts for merge of d5762583 to masterJames Dong2011-05-242-1/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: Icba2bcdbc9f967288a65c930b198405fd8566abd
| * | | | am ebae1923: am a5293d1c: Add some logging to track down where ANR happens ↵James Dong2011-05-232-1/+7
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | during MediaPlayer._release(). * commit 'ebae1923869ee71ab119f766ac01c5a320619290': Add some logging to track down where ANR happens during MediaPlayer._release().
| | * | | am a5293d1c: Add some logging to track down where ANR happens during ↵James Dong2011-05-232-1/+7
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | MediaPlayer._release(). * commit 'a5293d1ca4459293f4993ea39c09ea703a022844': Add some logging to track down where ANR happens during MediaPlayer._release().
| | | * | Add some logging to track down where ANR happens during MediaPlayer._release().James Dong2011-05-232-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o add a log message in AwesomePlayer::reset before acquiring the lock Change-Id: I9f228f615f99c03c394e9d0dd78c855c0b9fcfbb related-to-bug: 4409547
* | | | | Merge "Bug 4184736 unhide MediaPlayer.setTexture"Glenn Kasten2011-05-201-1/+6
|\ \ \ \ \
| * | | | | Bug 4184736 unhide MediaPlayer.setTextureGlenn Kasten2011-05-201-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4c8456465611b717e42c0a11e3ce3b4dc0a34270
* | | | | | am 4d8ceada: am dbfd055d: am a6f1104b: Use pread() to get the decrypted data ↵Gloria Wang2011-05-201-0/+7
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | for container based DRM file. For bug 4392094. * commit '4d8ceada09441f43a98f5c7dadde9192e7d6abf9': Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
| * | | | | am dbfd055d: am a6f1104b: Use pread() to get the decrypted data for ↵Gloria Wang2011-05-201-0/+7
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | container based DRM file. For bug 4392094. * commit 'dbfd055d51b51b7a6f412155c2391666efbb638a': Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
| | * | | | am a6f1104b: Use pread() to get the decrypted data for container based DRM ↵Gloria Wang2011-05-201-0/+7
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | file. For bug 4392094. * commit 'a6f1104b9d829c636b60b9387e379f9667b5df09': Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
| | | * | | Use pread() to get the decrypted data for container based DRM file.Gloria Wang2011-05-201-0/+7
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | For bug 4392094. Change-Id: Icc64a26c5b413313cc35dcd02d60484dc8245dfb
* | | | | Merge "Merge Chromium at 10.0.621.0: Fixes for libstagefreight"Kristian Monsen2011-05-202-21/+23
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge Chromium at 10.0.621.0: Fixes for libstagefreightKristian Monsen2011-05-132-21/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | URLRequest is now a member of the net namespace. HttpCache constructor has a new argument, which is a CertVerifier() Change-Id: I21d524938868b2e37993838f4fbb8447b02c3606
* | | | | Merge "Publish setLocation() method as a public Java API"James Dong2011-05-191-5/+4
|\ \ \ \ \
| * | | | | Publish setLocation() method as a public Java APIJames Dong2011-05-181-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | related-to-bug: 4260295 Change-Id: I91b923af8549127eb08f0d7e535cd53ad229e1f6
* | | | | | Merge "Add one more MIME type (audio/aac-adts) for aac file. Fix for bug ↵Gloria Wang2011-05-191-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 4463059."
| * | | | | | Add one more MIME type (audio/aac-adts) for aac file.Gloria Wang2011-05-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for bug 4463059. Change-Id: Ie2125349667e65b41871a228d87e4dce6b513398
* | | | | | | resolved conflicts for merge of a8939e0d to masterJames Dong2011-05-194-30/+162
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | Change-Id: I090479ed09618e1aa3685ca79e16202d9c82f523
| * | | | | | am 380244e9: am d148a499: Merge "Using widevine:// to stream adaptive ↵James Dong2011-05-184-29/+155
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bitrate wvm content no longer" into honeycomb-mr2 * commit '380244e9d6c8016bc1a04691a3af0fd999ddf6b0': Using widevine:// to stream adaptive bitrate wvm content no longer
| | * | | | | am d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content ↵James Dong2011-05-184-29/+155
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no longer" into honeycomb-mr2 * commit 'd148a499c27145e0473f89ece0500ebed38f875f': Using widevine:// to stream adaptive bitrate wvm content no longer
| | | * | | | Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" ↵James Dong2011-05-184-29/+155
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb-mr2
| | | | * | | | Using widevine:// to stream adaptive bitrate wvm content no longerAndreas Huber2011-05-104-29/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uses stagefright's http cache but defers caching to the WVMExtractor, which now has the responsibility of reporting buffer status/duration. Change-Id: Ieec64a20203977fd0a61d0c6834da124de78bfa2 related-to-bug: 4390283
| * | | | | | | am 5a6c3d49: am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed ↵Gloria Wang2011-05-182-8/+4
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit of the following:" into honeycomb-mr2 * commit '5a6c3d491ccac07ef3f6a624a8a3e0c36959b661': DO NOT MERGE For bug 4422428 Squashed commit of the following:
| | * | | | | | am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the ↵Gloria Wang2011-05-182-8/+4
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | following:" into honeycomb-mr2 * commit '07e9267d33bb199d0a2b8de221c64541bdf2465a': DO NOT MERGE For bug 4422428 Squashed commit of the following:
| | | * | | | | Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into ↵Gloria Wang2011-05-182-8/+4
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr2
| | | | * | | | | DO NOT MERGEGloria Wang2011-05-132-8/+4
| | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For bug 4422428 Squashed commit of the following: commit ae2e13783db2284f40d3891e70e152dab941edfc Author: Gloria Wang <gwang@google.com> Date: Fri May 13 11:43:11 2011 -0700 Add one more DRM error code. For bug 4422428. Change-Id: I4e333f474c96c0e0f162dde4013ad32b336bebd6 commit 0f88249d0cb5221f622cf1d1ac3cdccefb8f58a2 Author: Gloria Wang <gwang@google.com> Date: Fri Apr 29 10:44:46 2011 -0700 Add DRM errors in the DRM frameworks to MediaErrors also. For bug 4350156. Change-Id: Ib5711ec642178a49203a448b7f5114e675d49394 Change-Id: Ia02de462159400eef8c015d28531bf1dd6796a18
* | | | | | | | Merge "Properly forward rotation information from input format to output ↵Andreas Huber2011-05-181-2/+10
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | format."
| * | | | | | | Properly forward rotation information from input format to output format.Andreas Huber2011-05-181-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The software renderer would otherwise never rotate videos as it only has access to the decoder's output format. Change-Id: If893c0c23d0e85a3d9d4eb94390a114af5514b1c
* | | | | | | | am 53b988ba: am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add ↵Mike Lockwood2011-05-181-7/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | getStorageId() accessor" into honeycomb-mr2 * commit '53b988ba1842f40e595bb85f2ca055c24787e6dc': StorageVolume: Add getStorageId() accessor
| * | | | | | am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" ↵Mike Lockwood2011-05-171-7/+8
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb-mr2 * commit '5a79cfd7518defdce1911cecbc2441bb0a057e54': StorageVolume: Add getStorageId() accessor
| | * | | | | am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into ↵Mike Lockwood2011-05-171-7/+8
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr2 * commit '27ac64eceee8d4e392983861c6bc6bd620e4c6f7': StorageVolume: Add getStorageId() accessor
| | | * | | | StorageVolume: Add getStorageId() accessorMike Lockwood2011-05-171-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ID is used for MTP as well as per volume querying in the media provider. Change-Id: Ic4fc986d972bd477730643f7e9450c390c0b3a4b Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | | | | | am bf81d4be: am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS ↵Andreas Huber2011-05-171-1/+7
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2 * commit 'bf81d4be0514265875d7deffe50c31a344f6eac5': DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
| | * | | | | am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even ↵Andreas Huber2011-05-171-1/+7
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if sizeof(codec-specific-data) != 2" into honeycomb-mr2 * commit 'c56e81c88706d79ce51a314b5bfd3e247ca6f86c': DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
| | | * | | | Merge "DO NOT MERGE: Properly construct the ESDS metadata even if ↵Andreas Huber2011-05-171-1/+7
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | sizeof(codec-specific-data) != 2" into honeycomb-mr2
| | | | * | | | DO NOT MERGE: Properly construct the ESDS metadata even if ↵Andreas Huber2011-05-041-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sizeof(codec-specific-data) != 2 Change-Id: Ie711ea8d6956fa8370c78e23bf795325627164d1 related-to-bug: 4381047
| * | | | | | | am d90a2c4d: am 1e662c32: Merge "DO NOT MERGE. Integrate from master: ↵Dianne Hackborn2011-05-161-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rework display size access." into honeycomb-mr2 * commit 'd90a2c4d4463085155444efb07eba2d6579b444a': DO NOT MERGE. Integrate from master: Rework display size access.
| | * | | | | | am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display ↵Dianne Hackborn2011-05-161-2/+2
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | size access." into honeycomb-mr2 * commit '1e662c3294b740ff694ad98e4d9a366e1e4b5e62': DO NOT MERGE. Integrate from master: Rework display size access.
| | | * | | | | Merge "DO NOT MERGE. Integrate from master: Rework display size access." ↵Dianne Hackborn2011-05-161-2/+2
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb-mr2
| | | | * | | | | DO NOT MERGE. Integrate from master: Rework display size access.Dianne Hackborn2011-05-161-2/+2
| | | | | |/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Applications now get the display size from the window manager. No behavior should be changed yet, this is just prep for some real changes. Change-Id: I47bf8b55ecd4476c25ed6482494a7bcc5fae45d2
* | | | | | | | Revert "Add const to the finders method in MetaData.cpp"James Dong2011-05-172-7/+7
| |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 78fed171d9d62b25aa846d7373a7040e3fd2241e. Conflicts: include/media/stagefright/MPEG4Writer.h Change-Id: Ie6f497f67a473ad95b50bb949c1aa49e1804bac3
generated by cgit v1.1 at 2025-02-03 15:02:46 +0000