summaryrefslogtreecommitdiffstats
path: root/drm/libdrmframework/plugins
Commit message (Collapse)AuthorAgeFilesLines
* FwdLockConv.c: include what you use.Adam Langley2015-05-131-0/+1
| | | | | | | | | | | | | | This file needs stdlib.h for malloc, free and realloc, but was previously getting it only via the OpenSSL headers that it was including. BoringSSL, in the future, will be tider about what it includes via its headers and so this file will need to include stdlib.h itself. (cherry picked from commit 2544611b6f37e69955fe7161995b7bacf3ae8fba) Bug: 21085331 Change-Id: I864c679ba5a9f0041dd49d063ad1190ffa87b30a
* Remove superfluous OpenSSL include paths.Adam Langley2015-01-224-9/+3
| | | | | | | | The libcrypto and libssl modules (and their respective static and host versions) use LOCAL_EXPORT_C_INCLUDE_DIRS thus just including the module is sufficient. Change-Id: If9df76e6fefb7419cbb2fb33a0264626c748561e
* am bb9e396d: am 06f7d151: am 06da69d5: Merge "frameworks/av: convert ↵Colin Cross2014-01-281-1/+1
|\ | | | | | | | | | | | | LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH" * commit 'bb9e396d311ea38e958fb5b56efff7aea4eaed82': frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
| * frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATHColin Cross2014-01-271-1/+1
| | | | | | | | | | | | | | LOCAL_MODULE_PATH doesn't work for multiarch builds, replace it with LOCAL_MODULE_RELATIVE_PATH. Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e
| * Add liblogYing Wang2013-04-092-0/+2
| | | | | | | | | | Bug: 8580410 Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
| * Remove unnecessary lib dependencies in the FL makefileHenrik B Andersson2013-01-282-8/+0
| | | | | | | | Change-Id: Ia1e81a91b4b8dc1bf3558a4aa06e90a955c6fbe6
| * Fixed bugs where the content of buffer holding keys was cleared using a ↵Hung Nguyen2013-01-252-4/+9
| | | | | | | | | | | | | | | | wrong size in forward lock Modified by James Dong <jdong@google.com> Change-Id: Iaacfc79b2b26bdee7046d8555e3b4e0bc224c3c5
| * Fixed memory leakage in the DRM frameworkHung Nguyen2013-01-241-1/+2
| | | | | | | | Change-Id: Ib1276bec6cafb4e94f8f13b52e50e4987765eec4
* | Fixed file descriptor leak in FwdLockEngine::onGetOriginalMimeType.Robert Shih2013-11-081-0/+1
| | | | | | | | | | Bug: 11534051 Change-Id: I0ab56b0a96b30f721bcac1d1ccc6ca85c3271ef5
* | Add liblogYing Wang2013-04-092-0/+2
| | | | | | | | | | Bug: 8580410 Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
* | Remove unnecessary lib dependencies in the FL makefileHenrik B Andersson2013-01-282-8/+0
| | | | | | | | Change-Id: Ia1e81a91b4b8dc1bf3558a4aa06e90a955c6fbe6
* | Fixed bugs where the content of buffer holding keys was cleared using a ↵Hung Nguyen2013-01-252-4/+9
| | | | | | | | | | | | | | | | wrong size in forward lock Modified by James Dong <jdong@google.com> Change-Id: Iaacfc79b2b26bdee7046d8555e3b4e0bc224c3c5
* | Fixed memory leakage in the DRM frameworkHung Nguyen2013-01-241-1/+2
|/ | | | Change-Id: Ib1276bec6cafb4e94f8f13b52e50e4987765eec4
* Let getOriginalMimeType() take a fd passed from drm java applicationsJames Dong2012-08-108-34/+16
| | | | | | | | | This patch enables the drm framework to avoid opening files directly. As a result, the drm framework no longer needs the sdcard read permision. o related-to-bug: 6426185 Change-Id: Ib176c35ef4b1a1a405e8e954f19a7985266f2510
* Remove some unused forward lock codeJames Dong2012-08-082-61/+0
| | | | Change-Id: I94d01f6ad5b1676cc4d6a95807e166f3c25aa79c
* am e20435de: Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libs build under ↵James Dong2012-06-136-0/+570
|\ | | | | | | | | | | | | /frameworks/av/" into jb-dev * commit 'e20435de10f63af812da9d4f801b61a8817733a0': Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/
| * Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/James Dong2012-06-136-0/+570
| | | | | | | | | | Change-Id: I0a3af3e2abdedebd5934f3d941d01c32cfc75e26 related-to-bug: 6647465
* | Add a new API on DRM Framework for streamingKei Takahashi2012-05-232-0/+31
|/ | | | | | | | | | | | In case of DRM streaming, decrypt session can start just after receiving the header, and it doesn't need to wait for the entire content. However, current API of DRM framework only accepts file handle or URI. With this new API, DRM session can start without waiting for the entire content. Changes are made by SEMC and Sony. Change-Id: I74375fe127df636067f1c300ea91654ba3d1aa3c
* You don't need LOCAL_SHARED_LIBRARIES/LOCAL_STATIC_LIBRARIES to build a ↵Ying Wang2012-04-091-7/+0
| | | | | | static library. Change-Id: Ia2c4b4fb3b78cbe0d2856cec073b2c7f9c28d3cb
* Removed unnecessary include JNI from two drm Android.mk filesJames Dong2012-03-282-2/+0
| | | | Change-Id: I7b7a1acce4d6db748ff193270e73bc3582ba2380
* AV Android make files changesJames Dong2012-03-285-12/+8
| | | | | | | o plus a few file relocation: ActivityManager.cpp/h, SoundPool.h, etc o remove some runtime dependencies to libandroid, libandroid_runtime, etc Change-Id: I047a47c5fb361dd5cf85cd98798c39f629a75d10
* Merge "make sure that lower-case mime and file suffix is used to check ↵James Dong2012-03-141-5/+8
|\ | | | | | | against the supported ones"
| * make sure that lower-case mime and file suffix is used to check against the ↵James Dong2012-03-131-5/+8
| | | | | | | | | | | | supported ones Change-Id: I6a20832f6a2dfb8554dbddef0dee87cc21c05c80
* | Merge "Fixed a buffer overflow bug in DrmPassthruPlugin"James Dong2012-03-141-2/+8
|\ \
| * | Fixed a buffer overflow bug in DrmPassthruPluginJames Dong2012-03-131-2/+8
| |/ | | | | | | Change-Id: I8df2a90409c9266a094a1a0904a5ff76ec483d16
* | Turned off log spamming from DrmPassthruPluginJames Dong2012-03-131-28/+28
|/ | | | Change-Id: I2cecdba49cf044d2aafd8aa404d27df311cad401
* Merge "Avoid checking supported mime types or file suffixes in multiple places"James Dong2012-03-123-53/+55
|\
| * Avoid checking supported mime types or file suffixes in multiple placesJames Dong2012-03-093-53/+55
| | | | | | | | Change-Id: I47d24070c7bda385cd1d7fa1f6a75dbb1f82b476
* | Added an failure log message when the fwdlock engine fails to open a given file.James Dong2012-03-091-1/+8
|/ | | | Change-Id: I0e7f60b61f03fde046fc1ad668b28cdee635898b
* Separate sniffing from session initializationJames Dong2012-01-122-6/+55
| | | | | | | | | | | | This avoid lengthy/duplicate sniffing for drm plugins when a decrypt session is opened o The change is backward compatibile in that no update is required for existing drm plug-ins if they do not plan to provide separate sniffer/extractor related-to-bug: 5725548 Change-Id: I7fc4caf82d77472da4e2bc7b5d31060fb54fd84c
* Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-081-11/+11
| | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
* Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-032-28/+28
| | | | | | | See https://android-git.corp.google.com/g/156016 Bug: 5449033 Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
* Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGESteve Block2011-10-261-1/+1
| | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
* resolved conflicts for merge of 845fdba7 to masterGloria Wang2011-08-046-183/+257
|\ | | | | | | Change-Id: I716b6ceb03bd733f9e7f49008112c8f2c53ad9ce
| * am 8a6fb50d: am 4e197ea8: am e15a73ee: Merge "Bug fixes in OMA DRM v1 ↵Gloria Wang2011-08-046-183/+257
| |\ | | | | | | | | | | | | | | | | | | Forward Lock Agent" * commit '8a6fb50d69ec40a413b117bc9145a97ec427852f': Bug fixes in OMA DRM v1 Forward Lock Agent
| | * Bug fixes in OMA DRM v1 Forward Lock AgentHenrik B Andersson2011-08-046-183/+257
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A couple of fixes in the Forward Lock Agent. The DRM Framework isn't thread safe so the Forward Lock Agent needs to protect the private structures. Base64-encoded content with LF-only instead of CRLF line breaks is now accepted. A fix for non-standard boundary characters. The debug prints are also turned off as default. Change-Id: I8ab417231380fbe1c371d18a147773ceabc6f69f
* | | Fix for bug 4371230.Gloria Wang2011-07-251-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Generate unique ID for each DrmManagerClient in native side - Fix the bug where multiple clients could use the same ID - Return the correct unique ID back to Java - Add a flag in the unique ID to separate native client and Java client Change-Id: Ia4574b6b0a526f2335a65380975dc62f9a6e7f9b
* | | Remove the simulator target from all makefiles.Jeff Brown2011-07-111-8/+2
| | | | | | | | | | | | | | | | | | Bug: 5010576 Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
* | | Fix a memory leak in the Forward Lock plugin.Gloria Wang2011-06-211-0/+13
| | | | | | | | | | | | | | | | | | For bug 4770217. Change-Id: I14f4d4ead524c661e68a20738e7a50e4d8fd92ea
* | | To remove log spam in the Forward Lock DRM plugin.Gloria Wang2011-06-141-30/+30
| | | | | | | | | | | | | | | | | | Fix for bug 4619159. Change-Id: Id4984aade4cceb59a1fdf904949f62535decd2a4
* | | Duplicated fileDesc is not closed when input file is not forward-lock content.Gloria Wang2011-06-131-1/+4
| | | | | | | | | | | | | | | | | | Fix for bug 4606053. Change-Id: I1b45457d8cdc75d268631911f46ce6ec931b1770
* | | Merge "Bug fixes of DRM framework."Gloria Wang2011-03-151-1/+0
|\ \ \
| * | | Bug fixes of DRM framework.Gloria Wang2011-03-151-1/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add death listener to clean-up drmserver appropriately when drmserver died. - Remove "static" declaration of mUniqueIdVector because it was not needed to be static variable. - Remove "class DrmContentIds;" because the class does not exist. - contentPath in saveRights() could be empty because it is not required by some DRM schemes. - Fix naming convention to use sXXX for static variables. - Fix typo Change-Id: I7d440488fc074c200f1009d1bafafeffebd690b2
* | | frameworks/base: remove LOCAL_PRELINK_MODULEIliyan Malchev2011-03-142-2/+2
|/ / | | | | | | | | Change-Id: I54dd62ebef47e7690afa5a858f3cad941b135481 Signed-off-by: Iliyan Malchev <malchev@google.com>
* | Move all Widevine code which have dependency on vendor modules to ↵Gloria Wang2011-02-188-1204/+0
| | | | | | | | | | | | vendor/widevine Change-Id: If75bce539bae02117fb4f628be64e3a7363375e9
* | - Update from WidevineGloria Wang2011-02-188-0/+1204
| | | | | | | | | | | | - Bug fixes Change-Id: I494cfe145e7aad36f3d8c68841cab847487dd85b
* | rename /system/lib/drm/plugins/native/ to /system/lib/drm-plugin/Gloria Wang2011-01-181-1/+1
| | | | | | | | Change-Id: I043489cb81e53ed7cd5abd9769004da5ecd4d91d
* | am 1dac4cdd: am a220a297: Merge "Initial OMA DRM forward lock contribution"Gloria Wang2011-01-1327-0/+5370
|\ \ | |/ | | | | | | * commit '1dac4cdd6faba15426a0b37a7a615c04f5a35394': Initial OMA DRM forward lock contribution
| * Initial OMA DRM forward lock contributionPravat Dalbehera2011-01-0527-0/+5370
| | | | | | | | | | | | | | | | | | | | | | | | OMA DRM forward lock agent is plugged into the Open DRM framework. Forward lock agent implementation contains: - Forward lock engine to communicate with framework - Converter to encrypt the original file into a special format - Decoder to feed the decrypted data for rendering - Lightweight unique key-encryption mechanism - Documentation Change-Id: Id828ebc30b8147b58b14960a73571648bc01ae94
* | Remove empty Widevine make filesGloria Wang2010-11-241-27/+0
| | | | | | | | Change-Id: I0e58070231d00a13da4c46e7c8c4b824c5c12263
generated by cgit v1.1 at 2024-05-20 07:59:29 +0000