summaryrefslogtreecommitdiffstats
path: root/media/libmedia/Android.mk
Commit message (Collapse)AuthorAgeFilesLines
* Deprecations are warnings not errorsGlenn Kasten2015-05-281-2/+2
| | | | Change-Id: Ib77f45fdc27ea53f1dd181f48c76810d03f8dcdb
* libmedia: fix all warning, make warnings errors, use clangLajos Molnar2015-04-171-0/+6
| | | | Change-Id: Ic00d2c5d0bbb1605e96666e25c9ccc22bea6d3ff
* Unhide the android.media.[Media]DataSource interface.Chris Watkins2015-04-151-0/+1
| | | | | | | | | | | | | | | | | | | | | This allows apps to implement MediaDataSource, which is modeled on stagefright's DataSource, to supply media data to the framework. This was already implemented for MediaExtractor, but it was renamed from DataSource. MediaExtractor, MediaPlayer and MediaMetadataRetriever each have a new overload: #setDataSource(android.media.MediaDataSource) Only NuPlayer supports this new data source. The change introduces: * IDataSource: The binder interface for DataSource. * JMediaDataSource: The native counterpart to the java interface. It implements IDataSource. * CallbackDataSource: A stagefright DataSource that wraps an IDataSource. Change-Id: Ib3c944b49cc8a792c8eb9c85e5015c07f298ebc1
* media: add ResourceManagerServiceRonghua Wu2015-03-231-0/+4
| | | | | Bug: 19620911 Change-Id: Iea173d310d31781bc50effe3d9bd6553cb5139eb
* am 88d74d20: Add missing AudioPolicy.cpp to Android.mkBrian Carlstrom2015-01-271-1/+2
|\ | | | | | | | | * commit '88d74d203cda0ee6da387f3a5b929934b505d307': Add missing AudioPolicy.cpp to Android.mk
| * Add missing AudioPolicy.cpp to Android.mkBrian Carlstrom2015-01-271-1/+2
| | | | | | | | Change-Id: Iddafc39affe1082dc437f863b35d82790eca550d
* | resolved conflicts for merge of 9391844d to masterMarco Nelissen2015-01-271-4/+1
|\ \ | |/ | | | | Change-Id: I348a71d1b3e3238bc3871a69454edc8247d03111
| * Remove MediaPlayerService::decode()Marco Nelissen2015-01-261-2/+0
| | | | | | | | | | | | | | and make SoundPool use MediaCodec for decoding files to PCM. Bug: 18239054 Change-Id: Ia144fc1bbb0d2787638ee972e2224339b4965310
| * Use callbacks for Midi I/OMarco Nelissen2015-01-081-0/+1
| | | | | | | | | | | | | | Instead of having the Sonivox engine directly open the file and use stdio to read from it, use caller-provided callbacks. Change-Id: Ie55129109060a4a7862fee3177f994401e00b6c1
* | Move roundup from frameworks/av to system/mediaGlenn Kasten2015-01-071-2/+0
| | | | | | | | Change-Id: I1083ab739e445e5bd3e3082fc1d3a20cc19601d5
* | am 991aa3a7: am bef17542: am 5c97c4e1: Merge "Remove hardcoded ICU & OpenSSL ↵Narayan Kamath2015-01-051-2/+0
|\ \ | | | | | | | | | | | | | | | | | | include paths." * commit '991aa3a70b26c7d9c93361394a43a95355c1c26e': Remove hardcoded ICU & OpenSSL include paths.
| * \ am bef17542: am 5c97c4e1: Merge "Remove hardcoded ICU & OpenSSL include paths."Narayan Kamath2015-01-051-2/+0
| |\ \ | | |/ | | | | | | | | | * commit 'bef17542c7e0563c6004463b1ede18a404a17c89': Remove hardcoded ICU & OpenSSL include paths.
| | * Remove hardcoded ICU & OpenSSL include paths.Narayan Kamath2015-01-051-2/+0
| | | | | | | | | | | | | | | | | | | | | They're exported using LOCAL_EXPORT_C_INCLUDE_DIRS. bug: 18581021 Change-Id: I9593422b9eddb8203bee88d60e31a03b4a5f976b
* | | Merge "Remove explicit instantiation of SingleStateQueue"Andy Hung2014-12-221-11/+0
|\ \ \
| * | | Remove explicit instantiation of SingleStateQueueAndy Hung2014-12-191-11/+0
| |/ / | | | | | | | | | | | | | | | | | | Refactoring now possible due to changes in the Android atomic include. Change-Id: Ia0094d322d9ad3d8c186307306821376ca8002c4
* | | Use callbacks for Midi I/OMarco Nelissen2014-12-161-0/+1
|/ / | | | | | | | | | | | | Instead of having the Sonivox engine directly open the file and use stdio to read from it, use caller-provided callbacks. Change-Id: I4d775c8458c48c591a15794c4517e006dcf034e1
* | am c49d9cda: am 2dda40d6: Merge "audio policy: add support for custom mixes" ↵Eric Laurent2014-12-101-1/+2
|\ \ | |/ |/| | | | | | | | | into lmp-mr1-dev * commit 'c49d9cda49dab8b7dd0376cf56476b3e1895d5c6': audio policy: add support for custom mixes
| * audio policy: add support for custom mixesEric Laurent2014-12-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for custom mixes in AudioPolicyManager. Two methods are added to register or unregister a list of custom mixes with their attributes and format. getOutputForAttr() and getInputForAttr() first look for a match in registered mixes before defaulting to normal output/input selection Remote submix device connection disconnection now takes address into account to identify the correspnoding custom mix. Bug: 16009464. Change-Id: I3f1c2a485a0fb71b1f984ed0adc9b68aa971e408
* | libcutils no longer requires that its users configure ANDROID_SMP.Elliott Hughes2014-11-171-2/+0
| | | | | | | | Change-Id: Ib91ff0696ab2472c62168eb5261bbda5d22f623e
* | Resolve conflictThe Android Open Source Project2014-11-061-23/+27
|\ \ | |/
| * Merge "Use CharacterEncodingDetector in metadataretriever" into lmp-devMarco Nelissen2014-09-031-2/+3
| |\
| | * Use CharacterEncodingDetector in metadataretrieverMarco Nelissen2014-09-021-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of media scanner. This way the java MediaMetadataRetriever API will give the same result as the media scanner. Also apply some tweaks to the encoding detector to improve handling of ISO-8859-1 tags. Bug: 16302581, 17205395 Change-Id: I1682a7a6a8bf04cffaa455044ba72dd7fd152d49
| * | [AU]Sync libmedia/Android.mk modification from KLP-SproutHochi Huang2014-08-291-1/+1
| |/ | | | | | | | | | | Bug: 17322146 Change-Id: If29fbd87252710bd794f2e0bb270bc846380ef1d Signed-off-by: Hochi Huang <hochi.huang@mediatek.com>
| * stagefright: rework media codec list and infosLajos Molnar2014-08-071-0/+3
| | | | | | | | | | | | | | | | This is in preparation of serving the codec list and codec infos from the mediaserver Bug: 11990470 Change-Id: Ib8e2708679c9ce461a4ba179974a740cdcdf2731
| * resolved conflicts for merge of 373e21cc to masterElliott Hughes2014-07-091-2/+2
| |\ | | | | | | | | | Change-Id: I91afd8f9cba04559d21e1c84e25c5c60c990165d
| * | audio policy: add routing update client interfaceEric Laurent2014-05-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added IAudioPolicyServiceClient client binder interface for client process to receive notifications from AudioPolicyService when audio ports are added/removed or audio patches created/released. The audio patches owned by a given client are automatically released when this client binder dies. Bug: 14815883. Change-Id: I6013f6aec03b50565cffb1ad2cd1f0f8852032c5
| * | Fix includes to no longer pull in Skia includes directories.Derek Sollenberger2014-02-271-1/+0
| | | | | | | | | | | | | | | bug:13225538 Change-Id: I4fccc414923f7e62cd46d691c67cb44b9692c225
| * | Simplify and remove old commentGlenn Kasten2014-02-181-3/+1
| | | | | | | | | | | | Change-Id: Iee41641252f65cea9ce0ea0ec1ea4229608f7c64
| * | Move StateQueueInstantiations to libinstantssqGlenn Kasten2014-02-181-6/+16
| | | | | | | | | | | | | | | | | | This removes a circular dependency between libmedia and libnbaio Change-Id: I3692cbbe2b76028a953b36606b62cdda70c8c26f
| * | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available ↵Andreas Huber2014-02-041-0/+2
| | | | | | | | | | | | | | | | | | to media code Change-Id: I9f74a86e70422187c9cf0ca1318a29019700192d
| * | Better character set encoding detectionMarco Nelissen2013-12-111-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Id3 tags are supposed to be ISO-8859-1 or unicode, but often aren't. To better detect the real encoding we now use ICU to detect possible encodings for a given byte sequence, then apply additional heuristics to determine the most likely one. b/5564857 Change-Id: I53bc83b006433da5c2f2ccfcd770ddb3a26b64d0
* | | Fix definining of ANDROID_SMP.Ian Rogers2014-11-061-1/+14
| |/ |/| | | | | | | | | | | | | | | If TARGET_CPU_SMP is undefined, such as in SDK builds, then the condition as written before could cause SMP memory barriers to be missing. Also, add a dependency for Android.mk so that changes to it cause recompilation. Change-Id: I63ac0dc4342a39b9355fce2b2200016244cffc4a
* | Switch frameworks/av/media/libmedia to the new icu.Elliott Hughes2014-07-091-1/+1
|/ | | | Change-Id: I45349756bac6d89b02dba082ba6d606f4c489dcf
* Instantiate SingleStateQueue<AudioTimestamp>Glenn Kasten2013-09-031-0/+1
| | | | | | as typedef AudioTimestampSingleStateQueue and use it in MonoPipe. Change-Id: Idaebb362bd9d0a81a7ed83792ab9369dc37c0e74
* libutils clean-upMathias Agopian2013-05-071-1/+2
| | | | Change-Id: I3bf32d72aa8eec627249a675c130c91a8aff6710
* Add liblogYing Wang2013-04-091-1/+1
| | | | | Bug: 8580410 Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
* Implement async event callout from drm plugin to Java appJeff Tinker2013-04-031-0/+1
| | | | Change-Id: I007f147d693664e777b8758be2bb8a4c7ec0236b
* Implementing MediaDrm APIsJeff Tinker2013-03-131-0/+1
| | | | Change-Id: I9ff8eeb7d0c383b5c0c68cd54eb54ce7d2d22fe6
* Add template class SingleStateQueueGlenn Kasten2013-03-051-0/+7
| | | | Change-Id: If7e2bc9b2a216524ee9cbb68682e2634933b4973
* Add media.log service based on NBLogGlenn Kasten2013-01-251-0/+1
| | | | Change-Id: Ie45093df6ac9a739d05c8d408fab52a9a8a27e7f
* Split off the current control block to separate fileGlenn Kasten2012-12-031-0/+1
| | | | | | Prepare for a new implementation of step() etc. Change-Id: I268421976ba577aa1fb5d7015de5441c05861190
* Remove obsolete references to libmedia_nativeGlenn Kasten2012-10-301-1/+1
| | | | | Bug: 6654403 Change-Id: I3993d62987cf0dd85db10bf002a5cce53d4f01bd
* am e7c992c6: am 5abc91d6: Merge "Fix libmedia and libstagefright to get ↵Elliott Hughes2012-09-091-1/+0
|\ | | | | | | | | | | | | expat header files from the approved location." * commit 'e7c992c675e0075cd60b0b11c06d5956e3ddd7a3': Fix libmedia and libstagefright to get expat header files from the approved location.
| * Fix libmedia and libstagefright to get expat header files from the approved ↵Elliott Hughes2012-09-091-1/+0
| | | | | | | | | | | | | | | | location. Found during a libexpat upgrade. Change-Id: I9e5abd502a884975d898486edde374fb2519164e
* | Implement remote display service stubs.Jeff Brown2012-09-051-0/+2
| | | | | | | | Change-Id: I582ed000026bba6d116db8304e15a3c52f8a9a01
* | Preliminary support for HDCP as a binder service for wifi display support.Andreas Huber2012-08-291-0/+1
|/ | | | Change-Id: Ie0de1c086c629a668d1c7863992eef56fb94157c
* Merge "Provisional support for secure decryption of media streams."Andreas Huber2012-03-261-0/+1
|\
| * Provisional support for secure decryption of media streams.Andreas Huber2012-03-261-0/+1
| | | | | | | | Change-Id: Ib3982a9c960bfdb0cb7e1b174440b141b194cfbe
* | Merge "reorganize SoundPool and JetPlayer code."Eric Laurent2012-03-261-1/+3
|\ \ | |/ |/|
| * reorganize SoundPool and JetPlayer code.Eric Laurent2012-03-261-1/+3
| | | | | | | | | | | | | | | | | | | | Reorganize SoundPool and JetPlayer code to be ready for the creation of libmedia_native. Split SoundPool between libsoundpool (JNI) and libmedia(sound pool implementation). Remove dependencies on nativehelper/jni.h from JetPlayer. Change-Id: I130c6014173b714329929dd82c5dfb70b757a610
generated by cgit v1.1 at 2024-11-01 00:07:07 +0000