| commit | 5a03d372952c83bc4e9cb7076aae9a1d5924c8fa | [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 | a298995a015476dc711bb2aa6287775665e02d2c | |
| parent | 68a821e3f1ca2d8e7dfced23620922e22c8c8b73 [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"