| cd3b59c8ba5da18eb4f501b62f4e583027bc3e9d |
|
04-May-2017 |
Colin Cross <ccross@android.com> |
Merge "Convert libdrmframework and drmserver to Android.bp" am: a33999bab9 am: 5eb26eebfb
am: ed05809fcb
Change-Id: I112374bce87c4905eddb4883f7aad95d32b429c8
|
| 61d1c58c90e2491dd710688946f2a2cb2f42b837 |
|
29-Apr-2017 |
Colin Cross <ccross@android.com> |
Convert libdrmframework and drmserver to Android.bp
See build/soong/README.md for more information.
Also moves a few headers into the same library as their
implementation, and fixes a few includes to go through the
global frameworks/av/include path instead of manually adding
frameworks/av/include/drm.
Test: m -j checkbuild
Change-Id: I0c2d2f2262e7ed78d80a0d44795705c64b797ff0
/frameworks/av/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
|
| 4f79e5a8d8e3c78a64b7b98557799ce70ec7b19a |
|
29-Apr-2017 |
Colin Cross <ccross@android.com> |
Use %zu to print size_t
Test: m -j checkbuild
Change-Id: I93a1da7241169e0e08d310ad7fad68f227629be6
(cherry picked from commit cb8f367327286714617c0ccd7b356abd3a8aa15b)
/frameworks/av/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
|
| 1c2c96a5c2ae8dbc80b57323afd25336917b7e39 |
|
29-Apr-2017 |
Greg Kaiser <gkaiser@google.com> |
Merge "MockDrmCryptoPlugin: Don't truncate log output" am: 0e0e0819bd am: 3d065314ad
am: ad866fd08b
Change-Id: Ic0cc856a688b5d2e879e167ae018b574e692c0c1
|
| 0fe7807867001217e590d5eabf114c162438a819 |
|
26-Apr-2017 |
Greg Kaiser <gkaiser@google.com> |
MockDrmCryptoPlugin: Don't truncate log output
A function argument which is an array with a fixed size is not
actually a fixed size array, but rather just a pointer. Thus,
when we were using sizeof() for 'key' and 'iv', we were mostly
likely only logging the first 4 or 8 bytes of the array, and
not all 16.
We change this code so we're at least passing the correct size
to the arrayToString method, and thus logging all the bytes.
This API is still fragile, as there is nothing which assures
callers to decrypt are passing in arrays which are exactly 16
bytes. However, this API is equivalent to before, so we aren't
introducing any compatibility issues.
The compiler gave a warning about this.
Test: Compiled and confirmed there's no longer this compiler warning.
Change-Id: Ie3a32eef0882ea95bccc3e22ffcab7336779bd4c
/frameworks/av/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
|
| 68b3d9f49e68a11af5225175dc9e60ce88819e84 |
|
07-Jan-2017 |
Edwin Wong <edwinwong@google.com> |
Pass application packagename to drm plugin.
Pass application package name to createPlugin and createDrmPlugin.
The application packagename will be used as part of a unique
identifier for drm plugin.
Test: Play Movies.
Test: ANDROID_BUILD_TOP= ./android-gts/tools/gts-tradefed run gts -m
GtsMediaTestCases --test
com.google.android.media.gts.WidevineH264PlaybackTests#testL1With480P60
Verify the application's packagename is reachable in the drm plugin's
debug log.
bug: 27101531
Change-Id: I84fb09b591a7af63f6e20004e910112a4ce6ebac
/frameworks/av/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
|
| aee0669a7bdc1502a5e3d0752aaf84b0354a005e |
|
10-Aug-2016 |
Chih-Hung Hsieh <chh@google.com> |
Merge "Fix clang-tidy warnings in drm."
am: e055519839
Change-Id: I99159fb0391af796445ea24265d088d20d178077
|
| 8c0164ca98bcc76f3656fb1078033bffd4a387de |
|
09-Aug-2016 |
Chih-Hung Hsieh <chh@google.com> |
Fix clang-tidy warnings in drm.
* Add explicit keyword to conversion constructors.
Bug: 28341362
* Use const reference type for read-only parameters.
Bug: 30407689
* Use const reference type to avoid unnecessary copy.
Bug: 30413862
Test: build with WITH_TIDY=1
Change-Id: Idf1c48d7bfe3f0da20401cb3ff1983ec00be170d
/frameworks/av/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
|
| 18cb1eca504817b5b144a023ae2792d90e74c9a5 |
|
18-Dec-2015 |
Jeff Tinker <jtinker@google.com> |
Support AES-CBC sample encryption in MediaDrm
bug:23719082
Change-Id: I3028452f315122b65296881aed1fbf66c3ceeebc
/frameworks/av/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
|
| 6ca0256a1dcd85e1fa0a535347a9f0ecc57e284d |
|
09-Dec-2015 |
Jeff Tinker <jtinker@google.com> |
Remove unused MediaDrm.unprovisionDevice
bug:25726218
Change-Id: I6eb0ceb488c66c191897b3c190f5da1d71880c77
/frameworks/av/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
|
| 2fb25c873e1a7f346bd8c7c072a85ca6a74b0e95 |
|
01-Apr-2015 |
Jeff Tinker <jtinker@google.com> |
Add expiration update and keys change events
In support of unprefixed EME
bug: 19771612
bug: 19771431
Change-Id: Ib19d4c8db25f5b09f9a30ebd4992b668cad9bfc4
/frameworks/av/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
|
| d072c909d87f8150433860f6de4c11df6e09e2f9 |
|
16-Mar-2015 |
Jeff Tinker <jtinker@google.com> |
Report key request message type for unprefixed EME
bug: 19771299
Change-Id: I02f0a4532b5ea8a7e680d71f45ac0da06879f3d6
/frameworks/av/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
|
| 85c737a67e1b679251fce7f456ae79eefdc15e07 |
|
06-Nov-2014 |
Jeff Tinker <jtinker@google.com> |
Fix build, update mock drm plugin
Change-Id: I9b0f031e19d6d3359d74c17b4b521642bad37936
/frameworks/av/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
|
| c2320223222fe4507b6d67f6b8b4001d26c77a9c |
|
05-Aug-2014 |
Jeff Tinker <jtinker@google.com> |
Fix build break in mock drm plugin build
Change-Id: I8ae5d378df694360be3d76e06512e2ebc9fc0572
/frameworks/av/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
|
| f356a123bf966150965a1af1cb9bd6ff2ca020de |
|
02-Apr-2014 |
Jeff Tinker <jtinker@google.com> |
am 68d9d71a: Support CAST V2 Authentication in MediaDrm
* commit '68d9d71a792deed75d32fe13febc07c9c12c8449':
Support CAST V2 Authentication in MediaDrm
|
| 68d9d71a792deed75d32fe13febc07c9c12c8449 |
|
04-Mar-2014 |
Jeff Tinker <jtinker@google.com> |
Support CAST V2 Authentication in MediaDrm
Java API version
Update frameworks to enable support for CAST
V2 Authentication in the DRM Plugin.
Change-Id: I9066ada0edf8e0d777c503897d8c7fc7f76f2861
related-to-bug: 12702350
/frameworks/av/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
|
| 377b2ec9a2885f9b6405b07ba900a9e3f4349c38 |
|
03-Feb-2014 |
Kévin PETIT <kevin.petit@arm.com> |
Make frameworks/av 64-bit compatible
Contains the necessary changes to make frameworks/av build and work
on a 64-bit machine.
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Change-Id: I725feaae50ed8eee25ca2c947cf15aee1f395c43
/frameworks/av/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
|
| 34486800a022857b45c3882624449980c5cb6907 |
|
12-Sep-2013 |
Jeff Tinker <jtinker@google.com> |
Fix MediaDrm cts tests
Moving the build of the mock MediaDrm plugin back to
frameworks/av since it can't be installed by cts.
b/10668350
Change-Id: Id662bdb0775389b458f86a299392217f2d959422
/frameworks/av/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
|
| ee7e77d55d510725a314d8ed36dc730c21af6173 |
|
29-Aug-2013 |
Jeff Tinker <jtinker@google.com> |
fix MediaDrm.isCryptoSchemeSupported(uuid)
1. Don't expect plugins to support an empty mimeType in isContentTypeSupported
2. Move the cts test mock drm plugin to the cts tree so it is always used
b/10528466
Change-Id: I6023f6165b1e9d294986f7e5cd0896e056e376f1
/frameworks/av/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
|
| 9cf69e0fc110f17c28e988ed0f9bf91abfaf710d |
|
21-Aug-2013 |
Jeff Tinker <jtinker@google.com> |
Add ability to test supported content types to MediaDrm
bug: 10244066
Change-Id: I317f05b146db962c271893f6208890a5a6c396f1
/frameworks/av/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
|
| 423e33ce6569cb14ecf772e9670208517f7b30c4 |
|
09-Apr-2013 |
Jeff Tinker <jtinker@google.com> |
Added CTS test for secure stop APIs
bug: 8604418
Change-Id: I173fa1ec904ba11dc4cff0343462b3f4bac0d365
/frameworks/av/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
|
| c0d5f1f8405de861ed6f1725f26cd6601e7103ab |
|
02-Apr-2013 |
Jeff Tinker <jtinker@google.com> |
Implement async event callout from drm plugin to Java app
Change-Id: I007f147d693664e777b8758be2bb8a4c7ec0236b
/frameworks/av/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
|
| 4c63a239c404af1e055e5f9939939ab0fd09d98a |
|
31-Mar-2013 |
Jeff Tinker <jtinker@google.com> |
MediaDrm API update
Clarify offline usage of sessions and keys and implement
implement CryptoSession to support additional crypto use
cases.
Change-Id: I5d8000ce7e1dd7eba08969fc50296c9e1456c4fc
/frameworks/av/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
|
| 441a78d5e224e0d67f9b52fa9adc795c6944159b |
|
08-Feb-2013 |
Jeff Tinker <jtinker@google.com> |
Implementing MediaDrm APIs
Change-Id: I9ff8eeb7d0c383b5c0c68cd54eb54ce7d2d22fe6
/frameworks/av/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
|