summaryrefslogtreecommitdiffstats
path: root/media/jni
Commit message (Collapse)AuthorAgeFilesLines
* Improve error handling for DRM errors reported by pluginsJeff Tinker2013-04-171-0/+53
| | | | | Change-Id: I25df78f16379b32c54189949daa3ab9c91187375 related-to-bug: 8621516
* Make MediaDrm APIs publicJeff Tinker2013-04-171-8/+8
| | | | | | bug: 8603279 Change-Id: I9fab2673867ad413a084933cee7239d13e8b7893
* Add liblogYing Wang2013-04-094-0/+4
| | | | | Bug: 8580410 Change-Id: I746aa8258866508c3a725d0773faf4518096548f
* Merge "Add support for common encryption" into jb-mr2-devMarco Nelissen2013-04-083-3/+40
|\
| * Add support for common encryptionMarco Nelissen2013-04-083-3/+40
| | | | | | | | Change-Id: I2d56a6a90dff3ce1c37296934fca01b8a2ca0f89
* | Merge "Implement async event callout from drm plugin to Java app" into ↵Jeff Tinker2013-04-052-5/+159
|\ \ | | | | | | | | | jb-mr2-dev
| * | Implement async event callout from drm plugin to Java appJeff Tinker2013-04-032-5/+159
| | | | | | | | | | | | Change-Id: I451b7c6f766aafac39ce432a71ef5a03bffe29f1
* | | Merge "MediaDrm API update" into jb-mr2-devJeff Tinker2013-04-021-37/+243
|\ \ \ | |/ / | | / | |/ |/|
| * MediaDrm API updateJeff Tinker2013-04-011-37/+243
| | | | | | | | | | | | | | | | Clarify offline usage of sessions and keys and implement implement CryptoSession to support additional crypto use cases. Change-Id: Id3f8c706e9e3034b09af8e2a6a2f26bd74a49f93
* | MTP: Implement date created field in GetObjectInfoMike Lockwood2013-04-011-1/+2
|/ | | | | | Bug: 8293874 Change-Id: I3e50ea1049f63e2ed3a1f849fef74a2fbf206fe8
* Load crypto plugins from additional shared librariesJeff Tinker2013-03-221-1/+1
| | | | | | | | | | | | | | | | | Currently crypto plugins are expected to be in libdrmdecrypt.so. When there are multiple plugins supporting different schemes, this approach requires source code integration across vendors which is unmanagable. Also, for integration with MediaDrm where the crypto keys are obtained from a drm server, the MediaCrypto plugin needs to interoperate with the MediaDrm plugin. This change allows {MediaCrypto, MediaDrm} pairs that are logically related to be implemented in a common shared library. Multi-repository commit, goes with: https://googleplex-android-review.googlesource.com/287838 Change-Id: I08577cda0cbcb22ebe3cb874f5fcafe411c36be3
* Merge "Add the orientation hint to the MediaMuxer" into jb-mr2-devztenghui2013-03-201-0/+21
|\
| * Add the orientation hint to the MediaMuxerztenghui2013-03-191-0/+21
| | | | | | | | | | | | bug:7991013 Change-Id: I7e3e513851589e4ba7983d2c416152b2b08cbcfb
* | Merge "Implementing MediaDrm APIs" into jb-mr2-devJeff Tinker2013-03-204-0/+878
|\ \ | |/ |/|
| * Implementing MediaDrm APIsJeff Tinker2013-03-134-0/+878
| | | | | | | | Change-Id: Ib6eeb9c04c5c5cf1d485f9004cd3e6a1047a1d19
* | remove uses of Surface in favor of IGraphicBufferProducerMathias Agopian2013-03-121-1/+1
|/ | | | Change-Id: I2ec590eed03c76a084ee6b0af362a3ca6476bf9f
* Java API for MediaMuxerztenghui2013-03-113-0/+240
| | | | | | | | Implement the Java API for MediaMuxer. bug:7991013 Change-Id: Ibf3aa256cc1d89f1c7636b74c9fb53073d173636
* fix JNI use of incStrong/decStrongMathias Agopian2013-03-061-4/+4
| | | | Change-Id: Ia11b404dea483dc19bbc30f4d7bcff516655e180
* Implement Surface input to MediaCodec.Andy McFadden2013-03-042-0/+57
| | | | | | | | | Adds two new public methods to MediaCodec, and one new public constant to MediaCodecInfo (currently @hidden). Bug 7991062 Change-Id: I830a9794e92334ad05c870cc5fc90be4652147a5
* Camera and MediaRecorder: Support AppOpsEino-Ville Talvala2013-02-251-2/+13
| | | | | | | | - Allow media processes to update AppOps state - Pass package name to media services Bug: 8181262 Change-Id: I115d39f0b306cb9eb7cd3d3e663c680b7322fd3f
* Refactoring: Rename SurfaceTextureClient to SurfaceMathias Agopian2013-02-153-7/+6
| | | | Change-Id: I5a218ca11abeeec05e3a4c3cfc581bcc788814ea
* Surface doens't have an identity anymoreMathias Agopian2013-02-141-1/+1
| | | | Change-Id: Ic62c0f6ba9aae9b67335a2029a5de1caa3fc5b94
* split Surface in two classes: SurfaceControl and SurfaceMathias Agopian2013-02-142-59/+8
| | | | | | | | | SurfaceControl is the window manager side; it can control the attributes of a surface but cannot push buffers to it. Surface on the other hand is the application (producer) side and is used to push buffers to the surface. Change-Id: Ib6754c968924e87e8dd02a2073c7a447f729f4dd
* am 789e3fa0: am 9f03d4f9: Merge "Revert "use utf8_length() instead of local ↵Marco Nelissen2013-02-121-5/+48
|\ | | | | | | | | | | | | | | function, isValidUtf8()"" # Via Gerrit Code Review (2) and Android Git Automerger (1) * commit '789e3fa052747feb72e8ffdc778d5bc19a718c06': Revert "use utf8_length() instead of local function, isValidUtf8()"
| * Merge "Revert "use utf8_length() instead of local function, isValidUtf8()""Marco Nelissen2013-02-121-5/+48
| |\
| | * Revert "use utf8_length() instead of local function, isValidUtf8()"Marco Nelissen2013-02-121-5/+48
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1a8b6c29aaa5a1591097daca0876808cc029cbda Reason for revert: utf8_length handles a slightly different range than the checkjni code, so it's possible for a given string to pass the utf8_length check, but then fail the jni check. Change-Id: I81e15c95edd8f89782d8ad9025e68502b9340f22
* | | am edde28fd: am 5d5526aa: Merge "Handle errors from ↵James Dong2012-12-281-2/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | AudioEffect::queryNumberEffects" * commit 'edde28fd0956d941e4962e3228f3030e203da4aa': Handle errors from AudioEffect::queryNumberEffects
| * | Merge "Handle errors from AudioEffect::queryNumberEffects"James Dong2012-12-211-2/+5
| |\ \
| | * | Handle errors from AudioEffect::queryNumberEffectsPeter Karlsson2012-11-161-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There may be cases where queryNumberEffects fails leading to the usage of the uninitialized numEffects. Change-Id: If6d46987021ff6f0c9a2123d8714ff5fdf9ced45
* | | | Merge "Don't create weird ByteBuffers"Marco Nelissen2012-12-191-2/+17
|\ \ \ \
| * | | | Don't create weird ByteBuffersMarco Nelissen2012-12-191-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that we don't create ByteBuffers with a NULL memory pointer but nonzero size. b/7892060 Change-Id: I2fc52e19fd05e698c38d94275e738e23a2999e1f
* | | | | Rename ISurfaceTexture and SurfaceTextureAndy McFadden2012-12-183-16/+16
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The C++ class names don't match what the classes do, so rename ISurfaceTexture to IGraphicBufferProducer, and SurfaceTexture to GLConsumer. Bug 7736700 Change-Id: I08e677faf2ebb418ef131d0a8008e01037db0e50
* | | | Merge "Turn off execute bit for ordinary media files"Glenn Kasten2012-12-171-0/+0
|\ \ \ \
| * | | | Turn off execute bit for ordinary media filesGlenn Kasten2012-11-151-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Idbb4f793307d4e1c4af289f855bd4a1a781722db
* | | | | am 800c8ab6: am 2644494a: Merge changes I8462f040,Ie471f40fAndreas Huber2012-11-303-0/+64
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | * commit '800c8ab68d695f1b6c5332c80a32316cdca69954': MediaCodec: Allow getting the codec info directly MediaCodec: Allow getting the chosen component name
| * | | MediaCodec: Allow getting the codec info directlyMartin Storsjo2012-11-141-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This saves the caller from manually iterating through the MediaCodecList for finding the right codec. This adds new public API. Change-Id: I8462f040573427542d86d1b957a5aef53dd55e8e
| * | | MediaCodec: Allow getting the chosen component nameMartin Storsjo2012-11-142-0/+42
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, when the codec was opened by createDecoder/EncoderByType, the caller does not know what codec actually was chosen, and (for encoders) thus cannot know what color formats it supports. This adds new public API. Change-Id: Ie471f40f8104b37d27ced3dba5a54facc6504b1b
* | | am 58ed5d74: am 768d9e1a: Merge "Correct executable bit for source files"Kenny Root2012-11-0714-0/+0
|\ \ \ | |/ / | | | | | | | | | * commit '58ed5d748c0b9b64845975ef5844ad313de7c3f6': Correct executable bit for source files
| * | am 768d9e1a: Merge "Correct executable bit for source files"Kenny Root2012-11-0714-0/+0
| |\ \ | | | | | | | | | | | | | | | | * commit '768d9e1a72ceee7d4a5f608776b87b62d6ce4a04': Correct executable bit for source files
| | * | Correct executable bit for source filesKenny Root2012-11-0714-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many media files and source code files were marked as executable in Git. Remove those. Also a shell script and python script were not marked as executable. Change-Id: Ieb51bafb46c895a21d2e83696f5a901ba752b2c5
* | | | Remove obsolete references to libmedia_nativeGlenn Kasten2012-10-303-5/+2
|/ / / | | | | | | | | | | | | Bug: 6654403 Change-Id: I05d8e81fd31617b587fd1228a303c40db83e7f2d
* | | Throw an exception instead of crash when a surface does not have a binding ↵James Dong2012-10-041-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | surface texture o related-to-bug: 7270329 Change-Id: I498d72187968e89d9498d01b10719569e12be2af
* | | MtpDatabase: Use actual file size instead of media database size columnMike Lockwood2012-09-121-27/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes problems with file transfer from device to host that can occur if the database size value is wrong. Bug: 6954446 Change-Id: I03c3dd4b75267d1f4613f0b588c8899ded9a70be Signed-off-by: Mike Lockwood <lockwood@google.com>
* | | Add plumbing for new surface flinger display API.Jeff Brown2012-08-272-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaned up the implementation of Surface and SurfaceSession to use more consistent naming and structure. Added JNI for all of the new surface flinger display API calls. Enforced the requirement that all Surfaces created by the window manager be named. Updated the display manager service to use the new methods. Change-Id: I2a658f1bfd0437e1c6f9d22df8d4ffcce7284ca2
* | | Let apps provide a custom data source for extractorsMarco Nelissen2012-08-242-0/+102
|/ / | | | | | | | | | | | | | | Adds android.media.DataSource, which is modeled after its native namesake, and a new method on MediaExtractor that lets apps specify their implementation of a DataSource as the source of data for the extractor. Change-Id: If1b169bd18d2691ebc4f8996494dfc8ee0894b6c
* | am 26f8ce83: Merge "To avoid the JNI memory leaks in video editor codes"Jean-Baptiste Queru2012-08-203-0/+17
|\ \ | | | | | | | | | | | | * commit '26f8ce83e04c4efd10c09bb83cfacdcd154d9450': To avoid the JNI memory leaks in video editor codes
| * | To avoid the JNI memory leaks in video editor codeswfeng62012-08-173-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a protential memory leak in video editor JNI codes. When importing so many video clips, the number of local reference will exceed 512, which will cause the Dalvik virtual machine crash. The patch will free each local reference when it's no longer used to avoid memory leaks. Change-Id: Iecd986c83f05a1103641746d6d43eef0a9c5ee40 Author: Wei Feng <wei.feng@intel.com> Signed-off-by: Wei Feng <wei.feng@intel.com> Singed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 40786
* | | am 4da3769d: Merge "mediacodec: Don\'t crash if trying to open a codec that ↵Jean-Baptiste Queru2012-08-131-1/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | does not exist" * commit '4da3769d30851f0b517a688a5c835715d7d0b0bf': mediacodec: Don't crash if trying to open a codec that does not exist
| * | mediacodec: Don't crash if trying to open a codec that does not existMartin Storsjo2012-08-131-1/+4
| | | | | | | | | | | | Change-Id: If75e3156517993629f50622a84a9ac573fced815
* | | Changed to obtain a parcel in each notify() call in jni.Insun Kang2012-07-101-8/+4
|/ / | | | | | | | | Change-Id: I5faf0f5d1fdf76a5b4bd1cff37aa58df79d18e85 related-to-bug: 6785452
generated by cgit v1.1 at 2024-10-27 14:37:46 +0000