summaryrefslogtreecommitdiffstats
path: root/media/jni/Android.mk
Commit message (Collapse)AuthorAgeFilesLines
* DO NOT MERGE: Remove the use of JHEAD in ExifInterfaceSungsoo Lim2016-07-211-4/+0
| | | | | Bug: 29270469 Change-Id: I6a6c8aeab2a842ff1646316363d614851625e78f
* Deprecations are warnings not errorsGlenn Kasten2015-05-281-1/+1
| | | | Change-Id: Ib77f45fdc27ea53f1dd181f48c76810d03f8dcdb
* MediaSync: address API review.Wei Jia2015-05-081-1/+1
| | | | | | | | Rename *Settings to *Params; Remove size parameter from MediaSync.queueAudio(); Bug: 20887706 Change-Id: I4c572da92ada51458031a482b96b3f624224e608
* media: add SyncSettings to MediaSync and MediaPlayerLajos Molnar2015-04-221-2/+3
| | | | | Bug: 18249558 Change-Id: I76d7e20d0e0c2d1d24bf60ade6386986573476f0
* GraphicsJNI Canvas cleanupJohn Reck2015-04-221-1/+2
| | | | Change-Id: I72e142986a8bc9f464c1951b6b5187919de3462e
* Revert "A bunch more cleanups"John Reck2015-04-171-2/+1
| | | | | | This reverts commit c294d128d03bc9a9982b273a82516c04583438cc. Change-Id: Id1ebb236950f7c36c6d86e1dd95566d3a200748d
* Merge "Unhide the android.media.[Media]DataSource interface."Chris Watkins2015-04-161-0/+1
|\
| * 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: I6d9c1167b4a7384c469b1e928f31791a7ebed716
* | A bunch more cleanupsJohn Reck2015-04-141-1/+2
|/ | | | | | | | Switch a few places to using android::canvas instead of SkCanvas as well which eliminated some JNI Change-Id: I8f98b56442a06362b82b984cd1bd3a92398d8dbc
* MediaSync: add MediaSync JAVA APIWei Jia2015-04-031-1/+2
| | | | | Bug: 19666434 Change-Id: Iab6941f6d81cb95a3b86be14b239287acb0d0eee
* ImageReader/Writer: Add ImageWriter and Opaque ImageReaderZhijun He2015-03-201-0/+1
| | | | | | | | | | | ImageWriter/Reader API change, including below changes * Interface for Opaque ImageReader * ImageWriter Interface and implementation * Image class minor update to support ImageWriter opaque ImageReader detach/attach interface are defined but yet to be implemented. Change-Id: Ic7c0d2df73c80b1a81a7316d8c4556bf7703c309
* Frameworks/base: Wall Werror in media/jniAndreas Gampe2014-11-101-1/+1
| | | | | | Turn on -Wall -Werror in media/jni. Fix warnings. Change-Id: I9da54ad379d8172ee535b52ee2b0637a2533f4e3
* camera2: Move DngCreator to hardware/camera2.Ruben Brunk2014-05-221-3/+0
| | | | | Bug: 15091253 Change-Id: Ibe2ee376436e5c796e33c0b782ea68278589f2e6
* camera2: Plumb DngCreator to native library.Ruben Brunk2014-05-161-0/+3
| | | | Change-Id: Ic58bf6cf5086808b503460ef8e451fc0d6f1f850
* am db55bb06: am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-081-2/+0
|\ | | | | | | | | * commit 'db55bb0622e9fbe4b858d59409f516de01c1f1fd': Remove unused LOCAL_LDLIBS.
| * am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-081-2/+0
| |\ | | | | | | | | | | | | * commit '3b9600b673ad6a83481dcf88db6c9b2dc5bc9ba3': Remove unused LOCAL_LDLIBS.
| | * Remove unused LOCAL_LDLIBS.Ying Wang2014-05-071-2/+0
| | | | | | | | | | | | Change-Id: I01346e76f4ac6402af0ef33e3b2eef4a69e704a2
| * | Make MtpDatabase use libexif instead of libjheadMarco Nelissen2014-03-071-2/+2
| | | | | | | | | | | | | | | | | | b/12203995 Change-Id: I0e0e6209be7a9d3e493abdcee8619cae6d4b9501
* | | Fix buildMarco Nelissen2014-03-061-0/+1
| | | | | | | | | | | | | | | | | | Bad automerge Change-Id: I000a9d3ac2915b3e39d2d34bd52062ac47e9f0fe
* | | am 4bf85e84: am daefb17c: am e1af0bd8: am 4f36104f: am e29c96e7: Merge ↵Marco Nelissen2014-03-071-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | "libexif is now libjhead" into klp-dev * commit '4bf85e84e95cd39f5bded8abc8d1e0bf9c28e3ce': libexif is now libjhead
| * | libexif is now libjheadMarco Nelissen2014-03-061-2/+2
| |/ | | | | | | | | b/12203995 Change-Id: I6b749e251a2e03738550ce911e59527f80d26212
* | Fix includes so that they no longer rely on the global Skia includes ↵Derek Sollenberger2014-02-271-2/+1
| | | | | | | | | | | | | | directories. bug:13225538 Change-Id: Ia5d816dc665f81c7985f21036af4fd0a63c560cf
* | Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."Andreas Huber2014-02-131-1/+0
| | | | | | | | | | | | This reverts commit 7825334929b098b36e1144872200e75ba6d24b13. Change-Id: I1702eb3ff9d7192d64039c8bf4bc3fc5d8e458c4
* | Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.Andreas Huber2014-02-121-0/+1
| | | | | | | | | | | | | | | | AndroidRuntimeBase (exported by libandroid_runtime_base.so) is all you need to link against to gain the ability to do AndroidRuntimeBase::getJNIEnv() thus minimizing build dependencies. Change-Id: Ia7f0c94c8c02b974c068e0db34774827f96aa95b
* | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available ↵Andreas Huber2014-02-041-0/+1
| | | | | | | | | | | | to media code Change-Id: I7f6cdcfd2a28846d36d89dd5180ef20a22b03af8
* | libjhead_jni is still neededMarco Nelissen2014-01-131-0/+3
| | | | | | | | | | | | | | protip: do not remove things from makefiles just because it builds without them b/12528751 Change-Id: I3ef8dcdf638e8b59d309922bb972c893fc75a712
* | Make MtpDatabase use libexif instead of libjheadMarco Nelissen2014-01-101-5/+2
| | | | | | | | | | | | b/12203995 Change-Id: I0e0e6209be7a9d3e493abdcee8619cae6d4b9501
* | libexif is now libjheadMarco Nelissen2013-12-191-2/+2
|/ | | | Change-Id: I6b749e251a2e03738550ce911e59527f80d26212
* ImageReader: get correct jpeg size.Zhijun He2013-07-011-0/+2
| | | | | | | | | | | the jpeg size was set to the buffer width, which is the max jpeg buffer size. the right size can be obtained by parsing the camera3_jpeg_blob data sent by hal. Also correct the buffer size check when crop is not set. Bug: 9254294 Change-Id: Ic73de47ef97efa4eb356a399c1576715e2eacbfd
* ImageReader: Implementation of ImageReader and Image APIsZhijun He2013-06-261-0/+1
| | | | | | | Used for direct image data access from producer like camera or video decoder. Bug: 9254294 Change-Id: I1853af03f4487ac3585d86202f6140854471fa89
* Add liblogYing Wang2013-04-091-0/+1
| | | | | Bug: 8580410 Change-Id: I746aa8258866508c3a725d0773faf4518096548f
* Implementing MediaDrm APIsJeff Tinker2013-03-131-0/+1
| | | | Change-Id: Ib6eeb9c04c5c5cf1d485f9004cd3e6a1047a1d19
* Java API for MediaMuxerztenghui2013-03-111-0/+1
| | | | | | | | Implement the Java API for MediaMuxer. bug:7991013 Change-Id: Ibf3aa256cc1d89f1c7636b74c9fb53073d173636
* Remove obsolete references to libmedia_nativeGlenn Kasten2012-10-301-1/+0
| | | | | Bug: 6654403 Change-Id: I05d8e81fd31617b587fd1228a303c40db83e7f2d
* rename exif to exif_jni due to refactoring in external/jheadKeun young Park2012-06-071-0/+3
| | | | | | | - also pull libexif_jni from media_jni Bug: 6623618 Change-Id: I4f06a4614c5fddcf98d95caff16a2c40f345dade
* Unhide new media related java APIs.Andreas Huber2012-04-161-1/+1
| | | | Change-Id: If0b8201eaca74f51f3499b6ecdfb73088586ee24
* New Crypto JAVA class to facilitate decryption via MediaCodec.Andreas Huber2012-04-041-0/+1
| | | | | Change-Id: Ic4e395faa84f003793c2804f2badabab9e7f1034 related-to-bug: 6275919
* New API to query available codecs and their capabilities.Andreas Huber2012-04-021-0/+1
| | | | Change-Id: I448ba443a96d8fee2bc9179750d57362ed31d9d9
* frameworks base Android.mk file changesJames Dong2012-03-281-6/+6
| | | | Change-Id: I7459b9e959a60751b8fa6e0d893cb2c820c064ce
* Add libmedia_nativeGlenn Kasten2012-03-161-0/+1
| | | | Change-Id: Ib8cff8abd73723b793f08da99ad59549f219e0e7
* Switched to use the header files in /frameworks/nativeJames Dong2012-03-121-1/+1
| | | | | | | | and deleted the duplicate header files in /frameworks/base o related-to-bug: 6044887 Change-Id: I17e0692d9a9b5c8796ded36677c833ca8ab36795
* Implementation of a java media codec interface and associated tools.Andreas Huber2012-02-221-0/+5
| | | | Change-Id: I13e54062d4de584355c5d82bb027a68aeaf2923b
* The software AMR NB encoder is now an OMX component.Andreas Huber2012-02-011-1/+5
| | | | Change-Id: I890eab052a7c36409b8b694c964884e28dd8d8fc
* Don't need to link to libsqlite from media JNI library.Jeff Brown2012-01-191-1/+0
| | | | | | Media JNI library doesn't actually use libsqlite. Change-Id: If8017444d259779d459ef2da83119814e31454c2
* Refactor to share code between MediaPlayer and MediaMetadataRetriever JNIJames Dong2011-05-051-0/+1
| | | | Change-Id: Ib847213f566dee79126d7c14d00750a9a8dedeb9
* MTP: Implement GetThumb commandMike Lockwood2011-04-251-1/+3
| | | | | | | | | This allows the PC to access thumbnails in JPEG files over MTP/PTP Bug: 3219495 Change-Id: I4964f8b4826dffb7f0f77464ec91bd2e97a2f007 Signed-off-by: Mike Lockwood <lockwood@android.com>
* merge libsurfaceflinger_client into libguiMathias Agopian2011-03-251-1/+1
| | | | | | | | | | | | this is the first step in unifying surfacetexture and surface. for this reason the header files were not moved, as most of them will eventually go away. NOTE: currently we keep libsurfaceflinger_client.so as an empty library to workaround prebuilt binaries wrongly linking against it. Change-Id: I130f0de2428e8579033dc41394d093f4e1431a00
* New APIs for MTP and PTP host supportMike Lockwood2011-01-221-0/+1
| | | | | | | This replaces the previous ContentProvider based interface Change-Id: I4cea2544854adb9fdcc04345e4d73d8ef05380f3 Signed-off-by: Mike Lockwood <lockwood@android.com>
* Remove support for obsolete PTP content providerMike Lockwood2011-01-061-2/+0
| | | | | | | This will be replaced by a new PTP host API in an upcoming commit. Change-Id: Ib914194e332b5c090cb8e34ed35bd691bc9f85d1 Signed-off-by: Mike Lockwood <lockwood@android.com>
* Move MTP Java classes to android.mtp.* package.Mike Lockwood2010-12-301-4/+4
| | | | | Change-Id: Ib18bcaabf314241a95e517d0b93be5845d988e2c Signed-off-by: Mike Lockwood <lockwood@android.com>