drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,281 Commits 1 Branch 0 Tags
Commit Graph

66 Commits

Author SHA1 Message Date
Andreas Gampe
5a15d0d31b Frameworks/base: Wall Werror in media/jni 
Turn on -Wall -Werror in media/jni. Fix warnings.

Change-Id: I9da54ad379d8172ee535b52ee2b0637a2533f4e3
 2014-11-10 18:19:40 -08:00
Ruben Brunk
b6079005ed camera2: Move DngCreator to hardware/camera2. 
Bug: 15091253
Change-Id: Ibe2ee376436e5c796e33c0b782ea68278589f2e6
 2014-05-22 22:57:11 +00:00
Ruben Brunk
f967a5486a camera2: Plumb DngCreator to native library. 
Change-Id: Ic58bf6cf5086808b503460ef8e451fc0d6f1f850
 2014-05-16 23:25:51 -07:00
Ying Wang
29894c6176 am db55bb06: am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS." 
* commit 'db55bb0622e9fbe4b858d59409f516de01c1f1fd':
  Remove unused LOCAL_LDLIBS.
 2014-05-08 18:31:18 +00:00
Ying Wang
4463cbc61d am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS." 
* commit '3b9600b673ad6a83481dcf88db6c9b2dc5bc9ba3':
  Remove unused LOCAL_LDLIBS.
 2014-05-08 00:21:38 +00:00
Ying Wang
b38e3fdf5a Remove unused LOCAL_LDLIBS. 
Change-Id: I01346e76f4ac6402af0ef33e3b2eef4a69e704a2
 2014-05-07 15:23:37 -07:00
Marco Nelissen
aefa427c27 Make MtpDatabase use libexif instead of libjhead 
b/12203995

Change-Id: I0e0e6209be7a9d3e493abdcee8619cae6d4b9501
 2014-03-07 10:30:23 -08:00
Marco Nelissen
faab8b2313 Fix build 
Bad automerge

Change-Id: I000a9d3ac2915b3e39d2d34bd52062ac47e9f0fe
 2014-03-06 22:19:02 -08:00
Marco Nelissen
da7ad468d9 am 4bf85e84: am daefb17c: am e1af0bd8: am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-dev 
* commit '4bf85e84e95cd39f5bded8abc8d1e0bf9c28e3ce':
  libexif is now libjhead
 2014-03-07 03:10:01 +00:00
Marco Nelissen
c0786cc258 libexif is now libjhead 
b/12203995
Change-Id: I6b749e251a2e03738550ce911e59527f80d26212
 2014-03-06 16:00:35 -08:00
Derek Sollenberger
eece0dda56 Fix includes so that they no longer rely on the global Skia includes directories. 
bug:13225538
Change-Id: Ia5d816dc665f81c7985f21036af4fd0a63c560cf
 2014-02-27 14:31:29 -05:00
Andreas Huber
9ae000ca8c Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest." 
This reverts commit 7825334929b098b36e1144872200e75ba6d24b13.

Change-Id: I1702eb3ff9d7192d64039c8bf4bc3fc5d8e458c4
 2014-02-13 17:22:33 +00:00
Andreas Huber
7825334929 Split AndroidRuntime into AndroidRuntimeBase base-class and the rest. 
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
 2014-02-12 15:00:05 -08:00
Andreas Huber
d2506a5063 FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to media code 
Change-Id: I7f6cdcfd2a28846d36d89dd5180ef20a22b03af8
 2014-02-04 14:45:28 -08:00
Marco Nelissen
92351c5886 libjhead_jni is still needed 
protip: do not remove things from makefiles just because it builds without them
b/12528751

Change-Id: I3ef8dcdf638e8b59d309922bb972c893fc75a712
 2014-01-13 10:19:17 -08:00
Marco Nelissen
3cd393c505 Make MtpDatabase use libexif instead of libjhead 
b/12203995

Change-Id: I0e0e6209be7a9d3e493abdcee8619cae6d4b9501
 2014-01-10 10:39:27 -08:00
Marco Nelissen
7f6abf84ab libexif is now libjhead 
Change-Id: I6b749e251a2e03738550ce911e59527f80d26212
 2013-12-19 14:21:19 -08:00
Zhijun He
534046d2b1 ImageReader: get correct jpeg size. 
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
 2013-07-01 11:03:41 -07:00
Zhijun He
212e78df9e ImageReader: Implementation of ImageReader and Image APIs 
Used for direct image data access from producer like camera or video decoder.

Bug: 9254294
Change-Id: I1853af03f4487ac3585d86202f6140854471fa89
 2013-06-26 15:56:27 -07:00
Ying Wang
d685894212 Add liblog 
Bug: 8580410
Change-Id: I746aa8258866508c3a725d0773faf4518096548f
 2013-04-09 21:54:12 -07:00
Jeff Tinker
8a0c80fdcc Implementing MediaDrm APIs 
Change-Id: Ib6eeb9c04c5c5cf1d485f9004cd3e6a1047a1d19
 2013-03-13 13:40:56 -07:00
ztenghui
68ccf103a1 Java API for MediaMuxer 
Implement the Java API for MediaMuxer.

bug:7991013

Change-Id: Ibf3aa256cc1d89f1c7636b74c9fb53073d173636
 2013-03-11 12:30:56 -07:00
Glenn Kasten
b24a1b7f99 Remove obsolete references to libmedia_native 
Bug: 6654403
Change-Id: I05d8e81fd31617b587fd1228a303c40db83e7f2d
 2012-10-30 10:59:52 -07:00
Keun young Park
bb52c49c9a rename exif to exif_jni due to refactoring in external/jhead 
- also pull libexif_jni from media_jni

Bug: 6623618
Change-Id: I4f06a4614c5fddcf98d95caff16a2c40f345dade
 2012-06-07 10:36:41 -07:00
Andreas Huber
07ea426e3a Unhide new media related java APIs. 
Change-Id: If0b8201eaca74f51f3499b6ecdfb73088586ee24
 2012-04-16 10:14:05 -07:00
Andreas Huber
8240d9239d New Crypto JAVA class to facilitate decryption via MediaCodec. 
Change-Id: Ic4e395faa84f003793c2804f2badabab9e7f1034
related-to-bug: 6275919
 2012-04-04 14:06:32 -07:00
Andreas Huber
5a04bf3955 New API to query available codecs and their capabilities. 
Change-Id: I448ba443a96d8fee2bc9179750d57362ed31d9d9
 2012-04-02 15:43:42 -07:00
James Dong
ba4d043331 frameworks base Android.mk file changes 
Change-Id: I7459b9e959a60751b8fa6e0d893cb2c820c064ce
 2012-03-28 11:03:25 -07:00
Glenn Kasten
ae75f994cc Add libmedia_native 
Change-Id: Ib8cff8abd73723b793f08da99ad59549f219e0e7
 2012-03-16 11:51:30 -07:00
James Dong
e1dea48f92 Switched to use the header files in /frameworks/native 
and deleted the duplicate header files in /frameworks/base

o related-to-bug: 6044887

Change-Id: I17e0692d9a9b5c8796ded36677c833ca8ab36795
 2012-03-12 21:28:57 -07:00
Andreas Huber
88572f7a3e Implementation of a java media codec interface and associated tools. 
Change-Id: I13e54062d4de584355c5d82bb027a68aeaf2923b
 2012-02-22 15:06:06 -08:00
Andreas Huber
9dd295af25 The software AMR NB encoder is now an OMX component. 
Change-Id: I890eab052a7c36409b8b694c964884e28dd8d8fc
 2012-02-01 10:39:26 -08:00
Jeff Brown
05bd7b5daf Don't need to link to libsqlite from media JNI library. 
Media JNI library doesn't actually use libsqlite.

Change-Id: If8017444d259779d459ef2da83119814e31454c2
 2012-01-19 18:13:19 -08:00
James Dong
79f407cc6c Refactor to share code between MediaPlayer and MediaMetadataRetriever JNI 
Change-Id: Ib847213f566dee79126d7c14d00750a9a8dedeb9
 2011-05-05 15:11:23 -07:00
Mike Lockwood
c89f22242b MTP: Implement GetThumb command 
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>
 2011-04-25 17:40:33 -07:00
Mathias Agopian
696257ccf3 merge libsurfaceflinger_client into libgui 
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
 2011-03-25 18:42:40 -07:00
Mike Lockwood
8182e72479 New APIs for MTP and PTP host support 
This replaces the previous ContentProvider based interface

Change-Id: I4cea2544854adb9fdcc04345e4d73d8ef05380f3
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-22 15:56:09 -08:00
Mike Lockwood
27480cd494 Remove support for obsolete PTP content provider 
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>
 2011-01-06 11:47:56 -05:00
Mike Lockwood
0cd0136d44 Move MTP Java classes to android.mtp.* package. 
Change-Id: Ib18bcaabf314241a95e517d0b93be5845d988e2c
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-12-30 11:54:33 -05:00
Mike Lockwood
da03aaad78 Change libusbhost and libmtp from static to shared libraries 
Change-Id: Iccc67db32400cdeb88aa33261c9e0cf73db992ca
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-12-29 09:12:15 -05:00
Mike Lockwood
c0b8b321d5 Rename MtpClient and MtpCursor to PtpClient and PtpCursor 
Change-Id: I26fce3bf32c8e9c8d592106af7ab4c35b19e0996
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-11-23 10:30:31 -05:00
Andreas Huber
ee9c3dbdd0 resolved conflicts for merge of 71c908c4 to master 
Change-Id: I5a462c8e8ee0acfe2cecbfd58cb9aa2b360da047
 2010-09-01 15:53:26 -07:00
Andreas Huber
8d7d413959 Now that AmrInputStream no longer relies on opencore, make sure it's registered in non-opencore builds. 
Change-Id: Ia9748691ba60d3c4b5fcaf319ed0b4493d69abc6
related-to-bug: 2963846
 2010-09-01 13:27:14 -07:00
Mike Lockwood
ff164a7d6f Exclude MTP implementation from simulator build 
Change-Id: I93364c74c26ba6e2bf6b08f1bd82802b966c8dfb
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-07-15 15:27:38 -04:00
Mike Lockwood
d21eac9c70 MTP: Use media provider database to implement MTP device support. 
Uses a new "MTP objects" table in the media provider to support basic
enumeration of the external storage file system.
Support for accessing audio, video and image metadata in the existing
media provider tables will be added in a later commit.

The C++ MtpDatabase class is now abstract, to support a proxy subclass that
calls through JNI to the Java MtpDatabase class in the media provider.

Change-Id: I90f0db5f3acc5d35ae78c27a8507edff16d14305
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-07-08 16:21:09 -04:00
Mike Lockwood
81ea83d108 Move MTP JNI code from libandroid_runtime to libmedia_jni 
Signed-off-by: Mike Lockwood <lockwood@android.com>

Change-Id: I0c54bbe4e6146beba7d22e782e02ded420f50dbd
 2010-06-30 17:54:10 -04:00
Andreas Huber
8d65dd2653 Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright. 
Change-Id: Ieafe75a4550c273ad59b4518d7cd4c0fce0f7cce
related-to-bug: 2370115
 2010-06-23 16:40:57 -07:00
James Dong
49b6fbaebd AmrInputStream refresh: eliminate the dependency upon OpenCore's code 
Change-Id: I0e66bc0a16fcdcf70136012ae1cd4138506cc94b
 2010-06-18 18:56:54 -07:00
Eric Laurent
948235c06e Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI. 
Added AudioEffect C++ class. AudioEffect is the base class for effect specific implementations,
OpenSL ES effect interfaces and audio effect JNI.

Added the AudioEffect JNI and AudioEffect JAVA class. AudioEffect is the base class
to implement more specific JAVA classes to control audio effects from JAVA applications.

Change-Id: If300a1b708f2e6605891261e67bfb4f8330a4624
 2010-06-11 06:26:31 -07:00
Mathias Agopian
000479f9e3 split libsurfaceflinger_client and libcamera_client out of libui 2010-02-11 13:16:22 -08:00