| 32494f5438db362e96b69e5fda7b2fd34633b562 |
|
27-Feb-2018 |
Adam Stone <blueeyes@google.com> |
Fixes serialization of vendor metrics
Uses an updated proto model that's more efficient for serialization.
Test: Unit tests, google play and CTS tests.
Bug: 73724218
Change-Id: I936bc18216c0c67de580424b4c62344d94be6b38
/frameworks/av/media/libmedia/include/media/DrmHal.h
|
| 4f8f900d3cb8ee117980705ac5df250f9df63bfc |
|
27-Feb-2018 |
TreeHugger Robot <treehugger-gerrit@google.com> |
Merge "Move mediadrm-related headers"
|
| 7d2c6e8be2c9a4f3c1364d243856a345f17f851e |
|
17-Feb-2018 |
Jeff Tinker <jtinker@google.com> |
Move mediadrm-related headers
Relocate drm and crypto headers from media
to mediadrm to have finer grained ownership
bug:73556221
Change-Id: I7d1b5944f261f9b1fdeed7605e4c0b4b4ca43e1a
/frameworks/av/media/libmedia/include/media/DrmHal.h
|
| 7dfe28f246bce404778f94e977b52699adfcb4ea |
|
15-Feb-2018 |
Jeff Tinker <jtinker@google.com> |
Fix missing check of hidl return status
closeAllSessions() was calling into the hidl interface closeSession
directly, and neglected to check the return status which resulted in
an abort. Instead, call the DrmHal::closeSession() method which handles
the hidl return status correctly.
Test: gts media tests
bug:72400509
Change-Id: I697997eb73ef6d8746fe695509671c4695124cee
/frameworks/av/media/libmedia/include/media/DrmHal.h
|
| fb679e38bbc91614faa917024adddeb51ff07d0a |
|
07-Feb-2018 |
Adam Stone <blueeyes@google.com> |
Add logging support for FW metrics
Adds proto serialization and logging support for media drm framework metrics.
Bug: 64001676
Test: Ran CTS tests, unit tests and Google Play.
Change-Id: Ie350ac93caa6b35610eb63e4acc860c8e8a5cf5b
/frameworks/av/media/libmedia/include/media/DrmHal.h
|
| 8cc97b178bc6c744eaeef526eca7a4e3f24a1a0e |
|
13-Feb-2018 |
Adam Stone <blueeyes@google.com> |
Merge changes from topic "media-drm-fix-list-metrics"
* changes:
Fix Metrics with PersistableBundle support
Fix DrmHal implementation to return all metrics
|
| e307dc4e7b2c9d3c4018a755db687309cf590369 |
|
11-Feb-2018 |
Jeff Tinker <jtinker@google.com> |
Revert "Revert "Update drm hal to find drm@1.1 factories""
This reverts commit d3eece8aa39560e8458ba8231b8684d99f11ee6b.
Change-Id: I15ca1dba1a384ccc026406f0a9a02c2598873456
/frameworks/av/media/libmedia/include/media/DrmHal.h
|
| 41d279a7f3bc55a63b510d4dce07e18964cda152 |
|
11-Feb-2018 |
Jeff Tinker <jtinker@google.com> |
Revert "Revert "Fix MediaDrm security level APIs""
This reverts commit 5f5e43fa83551a3636b92871bd2ad6b260a8815b.
Change-Id: I72d585fd3768730eef6ad9effdbda81b32418dea
/frameworks/av/media/libmedia/include/media/DrmHal.h
|
| 5f5e43fa83551a3636b92871bd2ad6b260a8815b |
|
11-Feb-2018 |
Tobias Thierer <tobiast@google.com> |
Revert "Fix MediaDrm security level APIs"
This reverts commit 56134cc9e790f39b3b10a18b701b0607c20b6154.
Reason for revert: Build cop here. The CL topic that I'm reverting broke several builds: Drm.h's openSession(Vector<uint8_t> &sessionId) hides overloaded virtual function openSession(DrmPlugin::SecurityLevel securityLevel, ..) from IDrm.h.
https://android-build.googleplex.com/builds/submitted/4598692/full-eng/latest/view/logs/build_error.log
Change-Id: I0de7738748ab793249df68bcbf18232d6a2d120a
/frameworks/av/media/libmedia/include/media/DrmHal.h
|
| 637b7855829920114a8863b93fe52203b7471eea |
|
30-Jan-2018 |
Adam Stone <blueeyes@google.com> |
Fix DrmHal implementation to return all metrics
This change in DrmHal allows us to transfer a PersistableBundle containing
previously unavailable metrics.
Bug: 64001676
Test: CTS test for metrics and GPlay test
Change-Id: I1fa87c76dd980a3f91b4e2d02b37329f6c0a88ec
/frameworks/av/media/libmedia/include/media/DrmHal.h
|
| 56134cc9e790f39b3b10a18b701b0607c20b6154 |
|
05-Feb-2018 |
Jeff Tinker <jtinker@google.com> |
Fix MediaDrm security level APIs
Vendors implementing the newly added MediaDrm.setSecurityLevel
HAL found that it was difficult to implement properly. Also the
semantics are somewhat ambiguous from the Java platform API
level. This CL binds the security level assignment to openSession
which clarifies the API for apps as well as making it more
natural to implement in HAL modules.
bug:72831697
bug:64001680
test: VtsHalDrmV1_1TargetTest, GTS media tests
Change-Id: Iaa07727be86ec2bc92be907d5a48c92136dc2014
/frameworks/av/media/libmedia/include/media/DrmHal.h
|
| 15177d7eab8c2300b4f1d577267e528bd7e4eedc |
|
25-Jan-2018 |
Jeff Tinker <jtinker@google.com> |
Add new secure stop methods
Methods are needed to release a secure stop by ID and
return a list of secure stops.
Tests: gts media tests
bug:67361434
bug:64001680
Change-Id: If6cb180cb4d2e3b655028955d105aee0cb8d70b6
/frameworks/av/media/libmedia/include/media/DrmHal.h
|
| cea91ce60260d7ebb94449ad7674150fdc227886 |
|
23-Jan-2018 |
Adam Stone <blueeyes@google.com> |
Adds most remaining framework metrics
Adds nearly all of the remaining specified framework level metrics.
Also adds a basic unit test to verify that metrics are exported
correctly. A follow-up CL will update the CTS test to touch all metric
values in DrmHal.
BUG: 64001676
Test: New unit test. Smoke tested with GPlay/Walleye.
Change-Id: I4df90675ae304d3c62b7886537328b3d848fd77c
/frameworks/av/media/libmedia/include/media/DrmHal.h
|
| f0e618d0ee16c63f918c7bb87ec1ff264d177746 |
|
18-Jan-2018 |
Adam Stone <blueeyes@google.com> |
Add EventMetric and a single use case.
Adds an EventMetric class, associated unit tests, and an instance of the
EventMetric to DrmHal. Also added a unit test for CounterMetric and
created a class to hold all of the future metric instances.
BUG: 64001676
Test: Added and ran unit tests. Also added a CTS test case.
Change-Id: Ic94bedd5f8293a58a939613a4ae69ce656a772be
/frameworks/av/media/libmedia/include/media/DrmHal.h
|
| aaf87dd09686bdb47df0a638b622a4c2ea37a331 |
|
08-Jan-2018 |
Adam Stone <blueeyes@google.com> |
Add CounterMetric and a single use case.
This adds a new class CounterMetric which is used to hold metric
information. It also adds a single use case for recording and
reporting a counter metric.
BUG: 64001676
Test: Added and ran a new test for the specific CounterMetric use case.
Change-Id: I39cab8328f135e579f80b6c2fab721da5f569795
/frameworks/av/media/libmedia/include/media/DrmHal.h
|
| c42670b837dc6e0d63dad891f66735fd7cb3d969 |
|
23-Jan-2018 |
TreeHugger Robot <treehugger-gerrit@google.com> |
Merge "Implement new MediaDrm methods"
|
| 6d998b67be330843f633a563c23c606593060165 |
|
18-Dec-2017 |
Jeff Tinker <jtinker@google.com> |
Implement new MediaDrm methods
Methods for querying HDCP, security levels and
number of sessions
bug:64001680
bug:33657579
Test: cts: MediaDrmMockTest, ClearKeySystemTest
gts: GtsMediaTestCases
Change-Id: I7c84df02ec33d305b6bd5ac7479922f87aa64863
/frameworks/av/media/libmedia/include/media/DrmHal.h
|
| ab394d13bab3a84f23677357576cee7a6f0c7899 |
|
22-Dec-2017 |
Adam Stone <blueeyes@google.com> |
Add support for getMetrics to IDrm
Adds support for the new getMetrics call to the IDrm interface and the
DrmHal implementation. The implementation currently returns a dummy
metric collection. Follow-up CLs will flesh out the implementation.
Bug: 64001676
Test: Ran the new unit test created in a related CL; ran Google Play.
Change-Id: Ia6a3af5b59a30ca55267f7e3ba278a510fc8c81e
/frameworks/av/media/libmedia/include/media/DrmHal.h
|
| 33ecc4f6b0e53ea7088ff4f151323e29183070c5 |
|
04-Apr-2017 |
John W. Bruce <juce@google.com> |
Marshal Metrics
Because DRM Plugins will not be allowed to call the AMI API under
Treble, the mediadrmservice will need to marshal the metrics out of the
plugin in protobuf format and report them to the AMI API instead. This
patch implements the pulling and interpreting of metrics from DRM
Plugins.
Bug: 36497276
Test: Played Google Play Movies, verified that playback still worked and
Widevine metrics appeared in a dump of the system media metrics.
Change-Id: If07717c1b87022bc1fcdedfbc62b9193899742d5
/frameworks/av/media/libmedia/include/media/DrmHal.h
|
| 6133281c9b06c1d1176eca7f07401bba1067081e |
|
16-May-2017 |
Jeff Tinker <jtinker@google.com> |
Close all open drm sessions before destroying a plugin.
MediaDrm relies on each plugin to close its open sessions
when the plugin is destroyed. This change ensures that all
sessions will be closed even if the plugin does not do it.
b/38323088
Change-Id: I8b6e36182f3b3bc765963819101868fc46001527
/frameworks/av/media/libmedia/include/media/DrmHal.h
|
| 8253f44c3d0d8a7003dd2e6f728f9e3d63927727 |
|
18-Apr-2017 |
Steven Moreland <smoreland@google.com> |
Fix libmedia includes.
Test: works with BOARD_VNDK_VERSION := current
Bug: 33241851
Change-Id: Idb6319563dfe83807d32ee54eb2fe66346c9f54a
/frameworks/av/media/libmedia/include/media/DrmHal.h
|