summaryrefslogtreecommitdiffstats
path: root/media/jni
Commit message (Collapse)AuthorAgeFilesLines
* media: ImageReader throws OutOfResourcesException when out of buffersIgor Murashkin2013-08-271-3/+6
| | | | | Bug: 10507939 Change-Id: I34c66485695ad6141388be85903cbecb9ebaa5ab
* ImageReader: Fix API doc table misalignment issueZhijun He2013-08-231-1/+0
| | | | | | | Also cleanup unused macro in ImageReader. Bug: 10360518 Change-Id: I2332703c92df771a6339ff92069e92d50a6c5cd5
* Merge "Add ability to test supported content types to MediaDrm" into klp-devJeff Tinker2013-08-222-6/+11
|\
| * Add ability to test supported content types to MediaDrmJeff Tinker2013-08-212-6/+11
| | | | | | | | | | bug: 10244066 Change-Id: Ic96c2e23f36809faf1c88ede500f4bc2bad4142a
* | Merge "Fix JNI method called with exception pending" into klp-devJeff Tinker2013-08-161-4/+12
|\ \ | |/
| * Fix JNI method called with exception pendingJeff Tinker2013-08-161-4/+12
| | | | | | | | | | bug: 10313912 Change-Id: I8390905334f2e37f210adced52c31e7a431d4f55
* | media: Fix ImageReader only using maxImages=1 no matter whatIgor Murashkin2013-08-161-2/+17
|/ | | | | | | | | - No longer return null when some bad error happens - Throws OutOfResourcesException when images need to be closed - Throws IllegalStateException when an unknown internal error happens Bug: 10333400 Change-Id: Ia53a5dd33f9ce53abd036e080e6fcc4ded9b251d
* Merge "Expose MediaCodec.setParameters API to" into klp-devAndreas Huber2013-08-142-0/+30
|\
| * Expose MediaCodec.setParameters API toAndreas Huber2013-08-122-0/+30
| | | | | | | | | | | | | | | | - change video target bitrate on the fly - request sync frames - temporarily suspend feeding input buffers to the encoder Change-Id: If5cf1162b2eeb28ac08288ecfa9f0e9823dd972e
* | MediaCodecInfo.java: Added isFeatureSupported method to CodecCapabilitiesLajos Molnar2013-08-131-1/+7
|/ | | | | | | | | | | | | | | Added isFeatureSupported method to CodecCapabilities, so that applications can query whether codecs support various features. For now added one video-decoder feature: FEATURE_AdaptivePlayback Media playback applications can query it to see if the codec supports seamless resolution changes during decoding. Change-Id: I56b2cf1429f39f9b9e0243a990c95e7a64dd7ff7 Signed-off-by: Lajos Molnar <lajos@google.com> Related-to-bug: 7093648
* Manage jclass objects (and most jobjects) in jni code using ScopedLocalRefAndreas Huber2013-08-122-76/+101
| | | | | | | | | | | | for safer refcounting. Previously jclass objects were not DeleteLocalRef'ed at all, leading us to exhaust the local ref pool quickly in certain circumstances. This change also makes sure we properly serialize int64_t entries when converting from AMessage to HashMap and boosts thread priority for java-instantiated MediaCodecs slightly from NORMAL to FOREGROUND. Change-Id: I4ebdd8a5ca6b3442698c9f86fcc31af8c199aaf5
* Add more virtual display tests.Jeff Brown2013-08-071-2/+3
| | | | | | | | We can't test everything in CTS because some features require system permissions. So this is another copy of the CTS test with more stuff that we can build with the system cert. Change-Id: Ied5a456a0810d38d307b6dfbad0f770cb480b4ee
* Merge "Define error codes for MediaCodec.CryptoException"Jeff Tinker2013-08-072-3/+47
|\
| * Define error codes for MediaCodec.CryptoExceptionJeff Tinker2013-08-032-3/+47
| | | | | | | | | | | | | | | | | | | | | | Define specific failure cases so apps have the information they need to deal with these conditions. Also adds a new ResourceBusyException to MediaDrm Change-Id: Iaecf269d58108f28179974b05671bf29b9fe4b7d related-to-bug: 10157154 related-to-bug: 9695816
* | Clearly separate consumer and producer interfacesMathias Agopian2013-08-061-5/+19
| | | | | | | | | | Bug: 9265647 Change-Id: Ic68e91788d0a05251e1d2fb9f9d4de403c7099bf
* | Merge "Minor style cleanups."Jeff Brown2013-08-061-40/+49
|\ \
| * | Minor style cleanups.Jeff Brown2013-08-051-40/+49
| |/ | | | | | | | | | | | | | | | | | | | | | | A few changes to demonstrate a slightly cleaner way to write JNI code in the framework especially when multiple types are involved. We use this pattern in many other places outside of the media stack. Added more detail to the UnsupportedOperationException that occurs when buffer formats don't match. Change-Id: Ic894dc1bd71b387f1be6ea1798fa59e533e9574f
* | ImageReader: Add RGB format support.Zhijun He2013-08-061-0/+48
|/ | | | | Bug: 10155122 Change-Id: Id53d6ec815488e73bde6ca62b42c92d16bc813c9
* camera2: Implement CameraDevice#waitUntilIdleZhijun He2013-07-231-2/+2
| | | | | | Also cleanup some logging/comments. Change-Id: Id1a4dd853519802a2b74b8d2172095ba388329e6
* update to new Consumer APIsMathias Agopian2013-07-161-1/+1
| | | | Change-Id: I8649f3add40e0aeeeb0396b98e2cb93312e8e990
* always pass the BufferQueue explicitely to consumersMathias Agopian2013-07-121-1/+2
| | | | Change-Id: I32e380979a3f4c6b1dfb440cc5b5c3d30d7607db
* ImageReader: get correct jpeg size.Zhijun He2013-07-012-3/+38
| | | | | | | | | | | 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-263-0/+754
| | | | | | | Used for direct image data access from producer like camera or video decoder. Bug: 9254294 Change-Id: I1853af03f4487ac3585d86202f6140854471fa89
* Remove unused MediaPlayer methodsMarco Nelissen2013-06-131-44/+0
| | | | Change-Id: Id63fdde7d0e4f096d3bb9eb4da5e0f37eb9dea21
* am c41a0eff: am be22605d: Merge "Listen for HTTP proxy changes and propagate ↵Andreas Huber2013-06-031-1/+63
|\ | | | | | | | | | | | | the information to the media" into jb-mr2-dev * commit 'c41a0eff938f825ef235b92efa7a31c3b7f8bfb4': Listen for HTTP proxy changes and propagate the information to the media
| * Listen for HTTP proxy changes and propagate the information to the mediaAndreas Huber2013-05-311-1/+63
| | | | | | | | | | | | | | | | framework. related-to-bug: 8873723 Change-Id: I2a34343f8006fa1b1448a1f047458fd58fe14fda (cherry picked from commit bfe9154142428aa8abecaf943dfeffc55f411ea7)
* | am eaa9ce70: am 606ab470: Merge "Improve exception error messages to help ↵Jeff Tinker2013-05-221-32/+70
|\ \ | |/ | | | | | | | | | | diagnose app errors" into jb-mr2-dev * commit 'eaa9ce7064ad4978d5acaafd4e797b5186ff03de': Improve exception error messages to help diagnose app errors
| * Merge "Improve exception error messages to help diagnose app errors" into ↵Jeff Tinker2013-05-221-32/+70
| |\ | | | | | | | | | jb-mr2-dev
| | * Improve exception error messages to help diagnose app errorsJeff Tinker2013-05-211-32/+70
| | | | | | | | | | | | | | | | | | bug: 9072051 Change-Id: I45057951d1a62b1b4a996e85f01601239e1b7161
* | | am 09d6ad37: am 2161b7cb: Merge "Fix invalid keyType translation in ↵Jeff Tinker2013-05-221-5/+29
|\ \ \ | |/ / | | | | | | | | | | | | | | | MediaDrm.getKeyRequest" into jb-mr2-dev * commit '09d6ad37f790f1e135c4dbe71109b33ae29a94cc': Fix invalid keyType translation in MediaDrm.getKeyRequest
| * | Fix invalid keyType translation in MediaDrm.getKeyRequestJeff Tinker2013-05-211-5/+29
| |/ | | | | | | | | bug: 9070897 Change-Id: Ib9b4174e08b1c828d0204e0ab65bc3d7c2efcedf
* | am 9ba564c7: am 48f2b548: Merge "MediaDrm API: Add two exceptions to handle ↵Jeff Tinker2013-05-011-7/+8
|\ \ | |/ | | | | | | | | | | error path scenarios" into jb-mr2-dev * commit '9ba564c7e205c4b278be61eec773a90a94451251': MediaDrm API: Add two exceptions to handle error path scenarios
| * Merge "MediaDrm API: Add two exceptions to handle error path scenarios" into ↵Jeff Tinker2013-05-011-7/+8
| |\ | | | | | | | | | jb-mr2-dev
| | * MediaDrm API: Add two exceptions to handle error path scenariosJeff Tinker2013-04-301-7/+8
| | | | | | | | | | | | | | | bug: 8725707 Change-Id: Ia00c495ac591cc2993f4d11ad3480b59833d009e
* | | am 94264d52: am 2f4cc8ea: Merge "Fix a crash case" into jb-mr2-devMike J. Chen2013-05-011-5/+6
|\ \ \ | |/ / | | | | | | | | | * commit '94264d522efcc21ac749a6444fbea90916f575c9': Fix a crash case
| * | Fix a crash caseMike J. Chen2013-04-261-5/+6
| |/ | | | | | | | | | | | | | | | | | | | | There's a runtime check for a bad argument, but it is after the usage of the bad argument. Move the usage after the check. Bug 8687716 Change-Id: Iddfa457951bac69b436a430cda21b5d7a563107b Signed-off-by: Mike J. Chen <mjchen@google.com>
* | am a393c2a2: am c884a08e: Merge "Improve error handling for DRM errors ↵Jeff Tinker2013-04-181-0/+53
|\ \ | |/ | | | | | | | | | | reported by plugins" into jb-mr2-dev * commit 'a393c2a2f7a6a3153b82b1e43bfffa1a040d56b5': Improve error handling for DRM errors reported by plugins
| * Improve error handling for DRM errors reported by pluginsJeff Tinker2013-04-171-0/+53
| | | | | | | | | | Change-Id: I25df78f16379b32c54189949daa3ab9c91187375 related-to-bug: 8621516
* | am 4efe71ae: am 45d59a99: Merge "Make MediaDrm APIs public" into jb-mr2-devJeff Tinker2013-04-181-8/+8
|\ \ | |/ | | | | | | * commit '4efe71ae55db09a4e3d727175df97d5bcda0449c': Make MediaDrm APIs public
| * Make MediaDrm APIs publicJeff Tinker2013-04-171-8/+8
| | | | | | | | | | | | bug: 8603279 Change-Id: I9fab2673867ad413a084933cee7239d13e8b7893
* | resolved conflicts for merge of a976bddd to masterYing Wang2013-04-094-0/+4
|\ \ | |/ | | | | Change-Id: I64e1cbfb0eee891ce4d1eee40eefdcedcc501f7f
| * Add liblogYing Wang2013-04-094-0/+4
| | | | | | | | | | Bug: 8580410 Change-Id: I746aa8258866508c3a725d0773faf4518096548f
* | am d563cede: am c4ad3cb0: Merge "Add support for common encryption" into ↵Marco Nelissen2013-04-083-3/+40
|\ \ | |/ | | | | | | | | | | jb-mr2-dev * commit 'd563cede5cf4ca2647dcf00775dd0ed1dd08e792': Add support for common encryption
| * 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
* | | am 72e2307c: am 1e0f36cf: Merge "Implement async event callout from drm ↵Jeff Tinker2013-04-042-5/+159
|\ \ \ | |/ / | | | | | | | | | | | | | | | plugin to Java app" into jb-mr2-dev * commit '72e2307c6a84de5770dd1aa2943d3d609d29baf3': Implement async event callout from drm plugin to Java app
| * | 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
* | | | Phase 1 of refactoring SystemServer.Dan Morrill2013-04-042-49/+49
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | SystemServer is currently a monolithic class that brings up key system services. This change is the first phase of refactoring it to be more configurable. Specifically, it adds a set of on/off switches used to control startup of individual services. Future plans include finer grained controls and a more explicit and consistent startup sequence for these services. Change-Id: I7299f5ce7d7b74a34eb56dffb788366fbc058532
* | | Merge "MediaDrm API update" into jb-mr2-devJeff Tinker2013-04-021-37/+243
|\ \ \ | |/ / | | / | |/ |/|
generated by cgit v1.1 at 2025-03-15 11:33:24 +0000