summaryrefslogtreecommitdiffstats
path: root/media/jni
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of a976bddd to masterYing Wang2013-04-094-0/+4
|\
| * Add liblogYing Wang2013-04-094-0/+4
* | am d563cede: am c4ad3cb0: Merge "Add support for common encryption" into jb-m...Marco Nelissen2013-04-083-3/+40
|\ \ | |/
| * 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
* | | am 72e2307c: am 1e0f36cf: Merge "Implement async event callout from drm plugi...Jeff Tinker2013-04-042-5/+159
|\ \ \ | |/ /
| * | Merge "Implement async event callout from drm plugin to Java app" into jb-mr2...Jeff Tinker2013-04-052-5/+159
| |\ \
| | * | Implement async event callout from drm plugin to Java appJeff Tinker2013-04-032-5/+159
* | | | Phase 1 of refactoring SystemServer.Dan Morrill2013-04-042-49/+49
|/ / /
* | | Merge "MediaDrm API update" into jb-mr2-devJeff Tinker2013-04-021-37/+243
|\ \ \ | |/ / | | / | |/ |/|
| * MediaDrm API updateJeff Tinker2013-04-011-37/+243
* | MTP: Implement date created field in GetObjectInfoMike Lockwood2013-04-011-1/+2
|/
* Load crypto plugins from additional shared librariesJeff Tinker2013-03-221-1/+1
* 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
* | Merge "Implementing MediaDrm APIs" into jb-mr2-devJeff Tinker2013-03-204-0/+878
|\ \ | |/ |/|
| * Implementing MediaDrm APIsJeff Tinker2013-03-134-0/+878
* | remove uses of Surface in favor of IGraphicBufferProducerMathias Agopian2013-03-121-1/+1
|/
* Java API for MediaMuxerztenghui2013-03-113-0/+240
* fix JNI use of incStrong/decStrongMathias Agopian2013-03-061-4/+4
* Implement Surface input to MediaCodec.Andy McFadden2013-03-042-0/+57
* Camera and MediaRecorder: Support AppOpsEino-Ville Talvala2013-02-251-2/+13
* Refactoring: Rename SurfaceTextureClient to SurfaceMathias Agopian2013-02-153-7/+6
* Surface doens't have an identity anymoreMathias Agopian2013-02-141-1/+1
* split Surface in two classes: SurfaceControl and SurfaceMathias Agopian2013-02-142-59/+8
* am 789e3fa0: am 9f03d4f9: Merge "Revert "use utf8_length() instead of local f...Marco Nelissen2013-02-121-5/+48
|\
| * 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
* | | am edde28fd: am 5d5526aa: Merge "Handle errors from AudioEffect::queryNumberE...James Dong2012-12-281-2/+5
|\ \ \ | |/ /
| * | Merge "Handle errors from AudioEffect::queryNumberEffects"James Dong2012-12-211-2/+5
| |\ \
| | * | Handle errors from AudioEffect::queryNumberEffectsPeter Karlsson2012-11-161-2/+5
* | | | Merge "Don't create weird ByteBuffers"Marco Nelissen2012-12-191-2/+17
|\ \ \ \
| * | | | Don't create weird ByteBuffersMarco Nelissen2012-12-191-2/+17
* | | | | Rename ISurfaceTexture and SurfaceTextureAndy McFadden2012-12-183-16/+16
|/ / / /
* | | | 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
* | | | | am 800c8ab6: am 2644494a: Merge changes I8462f040,Ie471f40fAndreas Huber2012-11-303-0/+64
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | MediaCodec: Allow getting the codec info directlyMartin Storsjo2012-11-141-0/+22
| * | | MediaCodec: Allow getting the chosen component nameMartin Storsjo2012-11-142-0/+42
| |/ /
* | | am 58ed5d74: am 768d9e1a: Merge "Correct executable bit for source files"Kenny Root2012-11-0714-0/+0
|\ \ \ | |/ /
| * | am 768d9e1a: Merge "Correct executable bit for source files"Kenny Root2012-11-0714-0/+0
| |\ \
| | * | Correct executable bit for source filesKenny Root2012-11-0714-0/+0
* | | | Remove obsolete references to libmedia_nativeGlenn Kasten2012-10-303-5/+2
|/ / /
* | | Throw an exception instead of crash when a surface does not have a binding su...James Dong2012-10-041-0/+5
* | | MtpDatabase: Use actual file size instead of media database size columnMike Lockwood2012-09-121-27/+29
* | | Add plumbing for new surface flinger display API.Jeff Brown2012-08-272-2/+2
* | | Let apps provide a custom data source for extractorsMarco Nelissen2012-08-242-0/+102
|/ /
* | am 26f8ce83: Merge "To avoid the JNI memory leaks in video editor codes"Jean-Baptiste Queru2012-08-203-0/+17
|\ \
| * | To avoid the JNI memory leaks in video editor codeswfeng62012-08-173-0/+17
* | | am 4da3769d: Merge "mediacodec: Don\'t crash if trying to open a codec that d...Jean-Baptiste Queru2012-08-131-1/+4
|\ \ \ | |/ /
generated by cgit v1.1 at 2025-01-09 19:27:39 +0000