| commit | 9084631dba8938942ddd8d4cb1e0f9149965ae8e | [log] [tgz] |
|---|---|---|
| author | Gloria Wang <gwang@google.com> | Mon Oct 25 12:23:35 2010 -0700 |
| committer | Android Code Review <code-review@android.com> | Mon Oct 25 12:23:35 2010 -0700 |
| tree | 0ba25dd389bab286b27c178e9598cea45cd1cbe6 | |
| parent | c5371fadf2753d074ef117685fed05b0140d6864 [diff] | |
| parent | d5770917a50a828cb4337c2a392b3e4a375624b9 [diff] |
Merge "DRM framework support: - add a sniffer for DRM files - add DRMSource and DRMExtractor for es_based DRM - add pread in FileSource.cpp for container_based DRM - add native DRM framework API calls in the player for DRM audio/video playback"