KongQun Yang
0a564039ca
Cleanup namespace ending comment
...
(This is a merge of http://go/wvgerrit/13400 from the Widevine CDM
repository.)
Replace "}; // namespace" with "} // namespace":
ag -l --ignore-dir third_party "}; //" | \
while read f; do sed -r -i 's/\}; \/\//} \/\//' $f ; done
Replace "// unnamed namespace" with "// namespace":
ag -l --ignore-dir third_party "unnamed namespace" | \
while read f; do sed -r -i 's/unnamed namespace/namespace/' $f ; done
Change-Id: I50ece9a127ce669f15cd532dfae1dd741338a075
2015-03-09 13:05:25 -07:00
John "Juce" Bruce
a3b0d83d19
Run clang-format on Core
...
This copies over formatting changes from the Widevine CDM repository
that resulted from running clang-format with Google style on the
shared core/ directory. It also copies over some rewordings of log
messages that were made at the same time.
Aside from the changed log messages, this should not affect behavior
or functionality.
Change-Id: I69c57c188f7a79f30fa3517afeed17365929b6b6
2015-03-05 16:46:01 -08:00
Fred Gylys-Colwell
b5e8b87fed
Merge Changes from CDM repository
...
This CL merges the following changes from the Widevine repository:
Avoid CdmSession reinitialization
https://widevine-internal-review.googlesource.com/#/c/10530/
Fix timer-related unit tests.
https://widevine-internal-review.googlesource.com/#/c/10510/
Correct return statement
bug: 15590802
https://widevine-internal-review.googlesource.com/#/c/10553/
Usage reporting fixes
bug/15388863
https://widevine-internal-review.googlesource.com/#/c/10460/
Make public methods virtual
https://widevine-internal-review.googlesource.com/#/c/10500/
Fix the SetTimer contract in the CDM.
https://widevine-internal-review.googlesource.com/#/c/10493/
Move inline CDM methods, add OVERRIDE.
https://widevine-internal-review.googlesource.com/#/c/10475/
Simplify storage APIs related cleanup.
https://widevine-internal-review.googlesource.com/#/c/10473/
Duration values are not correctly reported when queried
b/15592374
https://widevine-internal-review.googlesource.com/#/c/10437/
Propagate IsKeyValid() through ContentDecryptionModule.
https://widevine-internal-review.googlesource.com/#/c/10483/
Minor clean up in config_test_env.
https://widevine-internal-review.googlesource.com/#/c/10440/
General clean up.
https://widevine-internal-review.googlesource.com/#/c/10441/
Refactor HttpSocket and simplify UrlRequest interface.
https://widevine-internal-review.googlesource.com/#/c/10410/
Install good keybox at end of unit tests
b/15385981
https://widevine-internal-review.googlesource.com/#/c/10374/
Privacy crypto fixes
b/15475012
https://widevine-internal-review.googlesource.com/#/c/10383/
Incorporate header files to resolve build issued based on customers feedback.
https://widevine-internal-review.googlesource.com/#/c/10420/
Support unprovisioning
b/12247651
https://widevine-internal-review.googlesource.com/#/c/10356/
Correct usage of Host::Allocate and Cdm::Decrypt.
https://widevine-internal-review.googlesource.com/#/c/10378/
Fix logging bug, arguments in wrong order.
https://widevine-internal-review.googlesource.com/#/c/10380/
Rename types that look like constants.
https://widevine-internal-review.googlesource.com/#/c/10379/
Fix offline test failures
b/13909635
https://widevine-internal-review.googlesource.com/#/c/10348/
Add -DUNIT_TEST to the unit test makefile for Android
https://widevine-internal-review.googlesource.com/#/c/10375/
Refactor privacy-crypto and add dummy version.
https://widevine-internal-review.googlesource.com/#/c/10353/
Remove References to Apiary
https://widevine-internal-review.googlesource.com/#/c/9924/
Delete oldest entry in usage table when full
bug: 15184824
https://widevine-internal-review.googlesource.com/#/c/10295/
Port DeviceFiles to iOS.
https://widevine-internal-review.googlesource.com/#/c/10355/
Make testing functions in DeviceFiles private.
https://widevine-internal-review.googlesource.com/#/c/10354/
Add RSA encryption to haystack
https://widevine-internal-review.googlesource.com/#/c/10280/
Add string and vector includes to CDM header.
https://widevine-internal-review.googlesource.com/#/c/10352/
First version of oemcrypto logging
https://widevine-internal-review.googlesource.com/#/c/10252/
Update Names of Secure Stop Methods
bug: 11987015
https://widevine-internal-review.googlesource.com/#/c/10152/
Adjust timing on the Usage Table unit test
https://widevine-internal-review.googlesource.com/#/c/10307/
Fix all compiler warnings in CDM source release.
https://widevine-internal-review.googlesource.com/#/c/10293/
Fix memset bug: args in wrong order
https://widevine-internal-review.googlesource.com/#/c/10292/
Partial revert of 'Remove refs to test prov server, Level3 support...'
https://widevine-internal-review.googlesource.com/#/c/10281/
Pack structure OEMCrypto_PST_Report
https://widevine-internal-review.googlesource.com/#/c/10243/
Remove refs to test prov server, Level3 support; remove dead code
https://widevine-internal-review.googlesource.com/#/c/10220/
Partial revert of 'Document data strings; clean up license server parameters.'
https://widevine-internal-review.googlesource.com/#/c/10188/
Document data strings; clean up license server parameters.
https://widevine-internal-review.googlesource.com/#/c/10120/
Fix broken build after partner branch merge.
https://widevine-internal-review.googlesource.com/#/c/10181/
TODO Cleanup - core/src, core/include
https://widevine-internal-review.googlesource.com/#/c/9965/
TODO Cleanup - cdm, chromium, core/test.
https://widevine-internal-review.googlesource.com/#/c/9419/
Remove unneeded properties.
https://widevine-internal-review.googlesource.com/#/c/10162/
Change-Id: If2bb9d743a562a3875bebb91933c0aaadea286b2
2014-06-27 18:59:56 +00:00
Jeff Tinker
0190f99fb3
Migration from jb-mr2 to master for Widevine CDM
...
Android development of the widevine CDM has been done
on the jb-mr2 branch of the cdm code base. This CL
contains a merge of that jb-mr2 work to CDM master, and
also reflects the evolution of the common Modular DRM
code base since jb-mr2 branched.
Change-Id: I1d7e1a12d092c00044a4298261146cb97808d4ef
2013-07-29 17:29:07 -07:00
Jeff Tinker
4cf8594a87
Replaces staging provisioning server url with production server url
...
The default provisioning server url now points to the production server.
Also switches to the real field provisioning system ID that works
only on the production servers, and updates the unit tests to work
properly with the prod servers.
Bug: 8724358
Merge of:
https://widevine-internal-review.googlesource.com/#/c/5270/
https://widevine-internal-review.googlesource.com/#/c/5550/
https://widevine-internal-review.googlesource.com/#/c/5321/
https://widevine-internal-review.googlesource.com/#/c/5501/
from the Widevine CDM repository
Change-Id: Iff1d7349c6a84bf30c6cdd534933ae747d5cff55
2013-05-09 15:54:33 -07:00
Jeff Tinker
1a8aa0dd05
Initial import of Widevine Common Encryption DRM engine
...
Builds libwvmdrmengine.so, which is loaded by the new
MediaDrm APIs to support playback of Widevine/CENC
protected content.
Change-Id: I6f57dd37083dfd96c402cb9dd137c7d74edc8f1c
2013-03-22 11:14:17 -07:00