summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Removed interface to load audio effects librariesEric Laurent2011-05-273-74/+0
| | | | | | | Removed unused functions allowing dynamic loading of audio effects libraries from effects factory API. Change-Id: I06cc5a51dc10aca87c7a8687bbb874babd711eca
* New effect library APIEric Laurent2011-05-2711-379/+812
| | | | | | | | | | | | | | | | | Moved and renamed media/EffectApi.h to hardware/audio_effect.h Modified the effect library API to expose a library info structure containing an interface functions table. Also removed enums for audio channels, audio format and devices from effect API and use values from system/audio.h instead. Modified effects factory to support new library interface format and load libraries and efffects listed in audio_effects.conf file. The file audio_effects.conf is first loaded from /vendor/etc and then from /system/etc/audio_effects.conf if not found. Modified existing effect libraries to implement the new library interface. Change-Id: Ie52351e071b6d352fa2fbc06c3846686f8c45df9
* Merge "Extract embedded cover art (aka poster frame) in mp4 files"James Dong2011-05-262-1/+37
|\
| * Extract embedded cover art (aka poster frame) in mp4 filesJames Dong2011-05-262-1/+37
| | | | | | | | Change-Id: Ic9421ee27b9aa3b27df00878b887de20f25d232b
* | am c004a0c9: am 05e13b9e: am c1ded373: Merge "Revert "Use pread() to get the ↵James Dong2011-05-261-7/+0
|\ \ | |/ |/| | | | | | | | | decrypted data for container based DRM file."" into honeycomb-mr2 * commit 'c004a0c925ea2c9c48bbf9670d2ebf96f432c90a': Revert "Use pread() to get the decrypted data for container based DRM file."
| * am c1ded373: Merge "Revert "Use pread() to get the decrypted data for ↵James Dong2011-05-251-7/+0
| |\ | | | | | | | | | | | | | | | | | | container based DRM file."" into honeycomb-mr2 * commit 'c1ded373951f8bd489401e93f2dd512ff9705a49': Revert "Use pread() to get the decrypted data for container based DRM file."
| | * Revert "Use pread() to get the decrypted data for container based DRM file."James Dong2011-05-251-7/+0
| | | | | | | | | | | | This reverts commit a6f1104b9d829c636b60b9387e379f9667b5df09.
* | | Merge "Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts ↵Andreas Huber2011-05-2617-280/+892
|\ \ \ | | | | | | | | | | | | streams."
| * | | Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts streams.Andreas Huber2011-05-2517-280/+892
| | | | | | | | | | | | | | | | Change-Id: I9d2ee63495f161e30daba7c3aab16cb9d8ced6a5
* | | | Merge "For out of band timed text support (timed text in a separate file)."Gloria Wang2011-05-259-41/+526
|\ \ \ \ | |/ / / |/| | |
| * | | For out of band timed text support (timed text in a separate file).Gloria Wang2011-05-259-41/+526
| | | | | | | | | | | | | | | | Change-Id: I9e024a63eb9bf6f839deee3c7766a66e63126c96
* | | | Merge "Convert line breaks to Unix style"James Dong2011-05-25175-29631/+29631
|\ \ \ \
| * | | | Convert line breaks to Unix styleMans Rullgard2011-05-21175-29631/+29631
| |/ / / | | | | | | | | | | | | Change-Id: I6219725a9fbd72432bad71a176c14f26fabdbd5f
* | | | Merge "Merge chromium to 10.0.634.0: Compile fix"Kristian Monsen2011-05-251-1/+1
|\ \ \ \
| * | | | Merge chromium to 10.0.634.0: Compile fixKristian Monsen2011-05-251-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | base/thread.h moved to base/threading/thread.h: http://codereview.chromium.org/6028009 Change-Id: I4a7dd04055ed931f6bc2c6b63255f3832d0c78bd
* | | | 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 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 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
* | | | 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 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
* | | | resolved conflicts for merge of a8939e0d to masterJames Dong2011-05-194-30/+162
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: I090479ed09618e1aa3685ca79e16202d9c82f523
| * | | 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 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
| * | | | 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
* | | | | 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
* | | | | 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
* | | | | Make track informational event optional, depending on system propertyJames Dong2011-05-171-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o also add a track informational event to return the encoded data in kilo-bytes Change-Id: I7c383360d57048c8a3606d0b8141ba53e4f4b224
* | | | | Claim support for .3gpp2 A/B files.Andreas Huber2011-05-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I16dd3dcb93a50b3c808ae710d0ba4757c89ab9c8 related-to-bug: 4406745
* | | | | Disable yuv->yuv mode and external display support until various driver ↵Andreas Huber2011-05-162-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes are in. Change-Id: Ib3838f779afc87caca7d78e18a5d72d2971ee306
* | | | | Merge "Instead of using an RGB surface and conversion yuv420->rgb565"Andreas Huber2011-05-161-7/+58
|\ \ \ \ \
| * | | | | Instead of using an RGB surface and conversion yuv420->rgb565Andreas Huber2011-05-051-7/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | convert from OMX_COLOR_FormatYUV420Planar to HAL_PIXEL_FORMAT_YV12 instead. Change-Id: I8c4fc3c54c963f0d4ba6377f3c4ab4e0013152e5 related-to-bug: 4394005
* | | | | | resolved conflicts for merge of b107f4de to masterMike Lockwood2011-05-162-4/+8
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | Change-Id: I0290c8517562bcbba7ac1f6ed358011c8e7e250e
| * | | | | am 15afd076: Merge "MTP: Have GetStorageInfo command return correct storage ↵Mike Lockwood2011-05-162-4/+8
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | type for removable storage" into honeycomb-mr2 * commit '15afd076d6070374cbb4f9dcbe28dda67caa0718': MTP: Have GetStorageInfo command return correct storage type for removable storage
generated by cgit v1.1 at 2024-07-04 20:07:59 +0000