summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Add support for common encryptionMarco Nelissen2013-04-083-0/+7
| | | | | | b/7465749 Change-Id: I5403b74a5ae428ad28b382863a09daafc400b137
* Merge "Implement async event callout from drm plugin to Java app" into ↵Jeff Tinker2013-04-052-0/+51
|\ | | | | | | jb-mr2-dev
| * Implement async event callout from drm plugin to Java appJeff Tinker2013-04-032-0/+51
| | | | | | | | Change-Id: I007f147d693664e777b8758be2bb8a4c7ec0236b
* | Merge "MediaDrm API update" into jb-mr2-devJeff Tinker2013-04-021-13/+49
|\ \ | |/
| * MediaDrm API updateJeff Tinker2013-04-011-13/+49
| | | | | | | | | | | | | | | | Clarify offline usage of sessions and keys and implement implement CryptoSession to support additional crypto use cases. Change-Id: I5d8000ce7e1dd7eba08969fc50296c9e1456c4fc
* | Merge "Camera: Add input side to camera3 HAL device" into jb-mr2-devEino-Ville Talvala2013-03-281-1/+19
|\ \
| * | Camera: Add input side to camera3 HAL deviceEino-Ville Talvala2013-03-271-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Stream creation/deletion - Request submission - Request thread loop - Add get() to CameraMetadata to allow HAL submission while retaining ownership. Change-Id: I271f72bcbe9557eded43cbcbfe789109857f8144
* | | ToneGenerator: fix truncated tonesEric Laurent2013-03-271-0/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first DTMF tone after a silent period is truncated. This is because the phone app starts and stops the tone when the user presses and releases the key. This combined to the fact that the tones use the low latency path and that when the output stream exists standby there is a period of several milliseconds during which no audio is mixed until the stream is "warmed up". The result is that much less audio is generated than the actual key press duration. The fix consists in storing the tone start time and making sure that the number of samples generated corresponds at least to the time difference between the tone start and stop commands. Bug 6607077 Change-Id: I070d20dd8600c25a9e5d5a60c1d3313b7917b00d
* | Merge "Camera: Add hotplug support (for fixed # of cameras)" into jb-mr2-devIgor Murashkin2013-03-271-5/+6
|\ \ | |/ |/|
| * Camera: Add hotplug support (for fixed # of cameras)Igor Murashkin2013-03-261-5/+6
| | | | | | | | | | | | | | * Minor: also change addListener to fire the current status upon subscription * Minor: STATUS_AVAILABLE is now an alias for STATUS_PRESENT and deprecated Change-Id: I254608a7332095e3ef201ffea64cff156cfc1b3e
* | Identify network servers and clients with a OS version related stringAndreas Huber2013-03-261-0/+3
| | | | | | | | | | | | and put the logic to create that string in one location instead of many... Change-Id: I1f729f2e7376cd3b45eea0e48f7bd10084b41b39
* | Merge "Load crypto plugins from additional shared libraries" into jb-mr2-devJeff Tinker2013-03-251-1/+1
|\ \ | |/ |/|
| * 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. Change-Id: I7f6638f29171f91609fc2d944396365568630b56
* | Merge "ICameraServiceListener.h: Add STATUS_ENUMERATING enum" into jb-mr2-devIgor Murashkin2013-03-221-2/+21
|\ \ | |/ |/|
| * ICameraServiceListener.h: Add STATUS_ENUMERATING enumIgor Murashkin2013-03-211-2/+21
| | | | | | | | Change-Id: I41a9f358f63a19e7b746a9ccf24722001e5e7475
* | Merge "Add the presentation rotation support" into jb-mr2-devztenghui2013-03-201-2/+12
|\ \
| * | Add the presentation rotation supportztenghui2013-03-151-2/+12
| |/ | | | | | | | | | | bug:7991013 Change-Id: I10cb034b432876c724baa4974efcb3d67b8a99b6
* | Merge "Implementing MediaDrm APIs" into jb-mr2-devJeff Tinker2013-03-202-0/+91
|\ \ | |/ |/|
| * Implementing MediaDrm APIsJeff Tinker2013-03-132-0/+91
| | | | | | | | Change-Id: I9ff8eeb7d0c383b5c0c68cd54eb54ce7d2d22fe6
* | Merge "Make limitations of MPEG4Writer explicit" into jb-mr2-devTenghui Zhu2013-03-141-0/+6
|\ \
| * | Make limitations of MPEG4Writer explicitJames Dong2013-03-141-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o No more than 2 tracks will be supported o No more than one video and/or one audio tracks will be supported o Only take video and/or audio track (for instance, no text tracks) o If there is no track before start() is called, bail out. At the same time, make sure the errors from addSource() report to addTrack(), not to start(). Bug: 7991013 Change-Id: I1ca35aaeb75b5448d75ed2c6c10dd12ecea720ab
* | | Merge "remove uses of Surface in favor or IGraphicBufferProducer" into ↵Mathias Agopian2013-03-137-14/+8
|\ \ \ | |_|/ |/| | | | | jb-mr2-dev
| * | remove uses of Surface in favor or IGraphicBufferProducerMathias Agopian2013-03-127-14/+8
| | | | | | | | | | | | Change-Id: I13d7a9553aa335bca790a3a59d389d7533c83d57
* | | Squashed commit of the following:Andreas Huber2013-03-121-0/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit f4edf442741886cdbe071e2d15f6e6247269f7c5 Author: Andreas Huber <andih@google.com> Date: Tue Mar 12 09:09:18 2013 -0700 Pass additional flags to the sink, use TCP by default in wolfiecast mode. Change-Id: I41e11a2375d4199656e45c4f149d8441d0016092 commit 6302602ed280a38287f507159abfb40a1da38c5a Author: Andreas Huber <andih@google.com> Date: Tue Mar 12 08:51:58 2013 -0700 tweaks Change-Id: Ie29e422d7258be522f4bb1f6c5afcf74c937e547 commit a38a860e4979ba563cadbaafa21b084439449d26 Author: Andreas Huber <andih@google.com> Date: Mon Mar 11 16:57:43 2013 -0700 Report average lateness all the way from NuPlayerRenderer... Change-Id: I2e7700703ae656515e44b9c25610d26c75778111 commit a7d49b11675ea88be4029dd8451d1649db94571d Author: Andreas Huber <andih@google.com> Date: Mon Mar 11 14:54:19 2013 -0700 Make TimeSyncer smarter, enable TunnelRenderer Change-Id: I27377a60cd8feb01589da456967fddd34532c20e commit 0f214c8ef68179f7b61512c37040939554013151 Author: Andreas Huber <andih@google.com> Date: Thu Mar 7 15:57:56 2013 -0800 convert source timestamps to sink timestamps, report lateness. Change-Id: I051a60fbbceca2f7b508ae3dac6e01e402bae39e commit 04a4f8e16bad09157b5615a5fa45310438955832 Author: Andreas Huber <andih@google.com> Date: Thu Mar 7 09:00:28 2013 -0800 Sync time between sink and source. Change-Id: Ie8b4d75c957aa48310e7c81d1279761b9f821efe commit aebe20e6184e3636a99082f8ece08e708015cb8d Author: Andreas Huber <andih@google.com> Date: Wed Mar 6 09:03:12 2013 -0800 play with back pressure Change-Id: I51eb69257e6a79e76f5f9c75ff99d8adbd083947 Change-Id: Ifdf57228667fed7fc71c5090a2c3f7cea1037c5c
* | (Camera)ProCamera: Remove unused functions from binder interfaceIgor Murashkin2013-03-114-44/+18
|/ | | | Change-Id: I0582268cef6e84b630bc87c8a03dcd69d54c440d
* Merge "Clean up the native code to match Java update" into jb-mr2-devztenghui2013-03-081-2/+17
|\
| * Clean up the native code to match Java updateztenghui2013-03-081-2/+17
| | | | | | | | | | | | | | | | | | 1. Add flags to match the java side change. 2. Update the interface. bug:7991013 Change-Id: I8ffe84c466b2a68e2e1e48b35b78db9e44640265
* | Merge "Correct MediaCodec + Surface behavior" into jb-mr2-devAndy McFadden2013-03-062-0/+5
|\ \
| * | Correct MediaCodec + Surface behaviorAndy McFadden2013-03-052-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assorted tweaks: - Allow signalEndOfInputStream() before ACodec is in Executing state (added message to two more states). - Return an error if signalEndOfInputStream() is called a second time on the same stream. - Require AndroidOpaque color format in createInputSurface(). - Disallow dequeueInputBuffer() after an input surface has been created (boolean flag in MediaCodec tracks it). - Discard input surface when encoder is re-configure()ed (drop OMXNodeInstance's ref when we go back to Loaded). Bug 7991062 Change-Id: Iff30f3036e14eb5a2f6536910dcf11aba33031ee
* | | Merge "Add template class SingleStateQueue" into jb-mr2-devGlenn Kasten2013-03-062-0/+132
|\ \ \ | |/ / |/| |
| * | Add template class SingleStateQueueGlenn Kasten2013-03-052-0/+132
| | | | | | | | | | | | Change-Id: If7e2bc9b2a216524ee9cbb68682e2634933b4973
* | | Merge "Implement Surface input to MediaCodec." into jb-mr2-devAndy McFadden2013-03-054-0/+65
|\ \ \ | |/ / |/| |
| * | Implement Surface input to MediaCodec.Andy McFadden2013-03-044-0/+65
| |/ | | | | | | | | | | | | | | | | Also, renamed a CHECK_INTERFACE macro that was clashing with the Binder version. Bug 7991062 Change-Id: If5e6ed0a06d9f67975497676e4b05abe3aa3d6c0
* | Miscellaneous cleanupGlenn Kasten2013-03-041-1/+1
|/ | | | | | | | | | Abbreviation framesReady to fRdy for new systrace. Put inline const on one line. Use local copy of mState in state. Improve logging. Line length 100. Change-Id: I8201c3ce0e53fd464fd33d02544e52c342d40b68
* media.log cleanupGlenn Kasten2013-03-011-2/+2
| | | | | | | | | | | | | | Remove almost all of the specific logs, but leave the media.log logging infrastructure in place for the next time we need it. Re-apply a few good changes that were reverted earlier: - check logf format vs. argument list compatibility - distinguish potentially modified and actually modified tracks in FastMixer - fix benign bug where sq->end() was called more than once - fix a build warning Bug: 6490974 Change-Id: I02d3e83646c738acaebb415bd0d6b548638b4ef5
* ProCamera: Add CpuConsumer asynchronous mode supportIgor Murashkin2013-02-281-0/+7
| | | | | | Bug: 8290146 Bug: 8291751 Change-Id: I25423a2b8a70ac7169911b1c7b482aa17190fe0f
* Camera: Drop ProCamera connections when a Camera connection happensIgor Murashkin2013-02-284-3/+88
| | | | | | | * Also adds an ICameraServiceListener with available/not available statuses Bug: 8291653 Change-Id: I24680f1a2dc109510caf451cf7c7bd180b670d84
* Merge "camera_client: refactor Camera/ProCamera commonalities into ↵Igor Murashkin2013-02-274-106/+170
|\ | | | | | | BasicCamera" into jb-mr2-dev
| * camera_client: refactor Camera/ProCamera commonalities into BasicCameraIgor Murashkin2013-02-264-106/+170
| | | | | | | | Change-Id: Ie10a4094522d49683657665fe94ab0b7ccd280e9
* | Revert "Logging to investigate a crash"Glenn Kasten2013-02-271-11/+1
|/ | | | This reverts commit f0ff908da019a44115109f1b4d1b6864b35a8a29.
* CameraService and Stagefright: Support AppOpsEino-Ville Talvala2013-02-257-14/+52
| | | | | | | | | | | | | Camera: - Signal to AppOpsService when camera usage starts and stops - Listen to permissions revocations and act on them - Currently just kill camera connection when permissions lost Stagefright: - Pass on client name, UID to camera as needed Bug: 8181262 Change-Id: I9e33c9d05e9daa77dbb2d795045d08eb887ec8f0
* ProCamera: Fix waitForFrameBuffer not handling multiple outstanding framesIgor Murashkin2013-02-221-3/+14
| | | | | | | | | | | If the CpuConsumer triggered multiple onFrameAvailable callbacks in between a single waitForFrameBuffer call, the old code would only handle 1 callback. This meant on two subsequent waitForFrameBuffer calls the second would always timeout when two buffers were already available to be unlocked. Bug: 8238112 Change-Id: Ibefca35005ac5c408e5ada97ec4a4344a9e3e497
* ProCamera: add waitForFrameBuffer/waitForFrameResult blocking callsIgor Murashkin2013-02-221-1/+44
| | | | Change-Id: I851d41aeecaa15245d5b9d622132e8706d6e292c
* ProCamera: Add getInfo for getting static metadata (and a test)Igor Murashkin2013-02-222-1/+6
| | | | Change-Id: I3b87dfbc621d98bf41f37a892a1012baf85b5166
* Camera: ProCamera - implement onResultReceived callback for metadata callbacksIgor Murashkin2013-02-222-6/+18
| | | | Change-Id: I46775402b007244bc383d6343a620eebbd492aad
* Camera: ProCamera - add createStreamCpu and unit testIgor Murashkin2013-02-221-12/+74
| | | | Change-Id: I468172dbfdd78510b273bf9d119c950cbeda7ea3
* Camera: Change ProCamera to take IGraphicBufferProducerIgor Murashkin2013-02-221-4/+5
| | | | Change-Id: Iec62eead6d179aa5486f7719143340976bb76e7d
* Camera: ProCamera2Client - add createStream (service is stubbed) and unit testIgor Murashkin2013-02-222-1/+11
| | | | Change-Id: I1ae7ba9b24f5883c214c19a7ed0eaf0c802d69c1
* Camera: ProCamera - add createStream stub and unit test for itIgor Murashkin2013-02-221-0/+41
| | | | Change-Id: Ic05130e63f4f2c0c3278ba348b192992169f105f
* Camera: ProClient add asynchronous locks and suchIgor Murashkin2013-02-222-2/+13
| | | | Change-Id: I551e5e5e76d9be733fab5224beaa7309268c0f38