Commit Graph

  • 9a16115975 MediaDrm API update Jeff Tinker 2013-03-30 16:30:21 -07:00
  • f1cb05e6b7 Add Widevine jb-mr1 libraries for x86 (DO NOT MERGE) Rahul Frias 2013-03-29 10:00:48 -07:00
  • 67e5153805 Add Widevine jb-mr1 libraries for x86 (DO NOT MERGE) Rahul Frias 2013-03-29 09:45:52 -07:00
  • 1d535c5a11 am fe06ceec: Separate unit and end-to-end tests from the top level makefie. Edwin Wong 2013-03-28 16:36:00 -07:00
  • fe06ceec14 Separate unit and end-to-end tests from the top level makefie. Edwin Wong 2013-03-26 10:49:34 -07:00
  • 954ee5eb07 am 1a8aa0dd: Initial import of Widevine Common Encryption DRM engine Jeff Tinker 2013-03-26 10:42:23 -07:00
  • 1a8aa0dd05 Initial import of Widevine Common Encryption DRM engine Jeff Tinker 2013-03-21 17:39:02 -07:00
  • e2aa0025ed am 38334efb: Fix build break Jeff Tinker 2013-03-20 19:46:43 +00:00
  • 38334efbe7 Fix build break Jeff Tinker 2013-03-20 12:37:06 -07:00
  • de914cef6b am ba14f26d: (-s ours) am 627d5384: am 52ab6791: am f2183676: am ac144954: (-s ours) am bdf5e473: (-s ours) Reconcile with jb-mr1-release - do not merge Jean-Baptiste Queru 2013-03-11 20:21:26 +00:00
  • ba14f26d7b am 627d5384: am 52ab6791: am f2183676: am ac144954: (-s ours) am bdf5e473: (-s ours) Reconcile with jb-mr1-release - do not merge Jean-Baptiste Queru 2013-03-11 13:13:15 -07:00
  • 627d5384fa am 52ab6791: am f2183676: am ac144954: (-s ours) am bdf5e473: (-s ours) Reconcile with jb-mr1-release - do not merge Jean-Baptiste Queru 2013-03-11 13:00:47 -07:00
  • 52ab679198 am f2183676: am ac144954: (-s ours) am bdf5e473: (-s ours) Reconcile with jb-mr1-release - do not merge Jean-Baptiste Queru 2013-03-11 12:56:11 -07:00
  • f2183676ce am ac144954: (-s ours) am bdf5e473: (-s ours) Reconcile with jb-mr1-release - do not merge Jean-Baptiste Queru 2013-03-11 12:47:36 -07:00
  • ac14495401 am bdf5e473: (-s ours) Reconcile with jb-mr1-release - do not merge Jean-Baptiste Queru 2013-03-11 12:37:34 -07:00
  • bdf5e47391 Reconcile with jb-mr1-release - do not merge Jean-Baptiste Queru 2013-03-11 12:28:39 -07:00
  • 526ff3f260 Merge "Add More Logging to Sample Player" Jeff Tinker 2013-02-09 00:00:52 +00:00
  • 0d5a8ccc7a Move OEMCrypto Mock files to Clear Key Library Fred Gylys-Colwell 2013-01-31 09:22:22 -08:00
  • b8ff509887 Add More Logging to Sample Player Fred Gylys-Colwell 2012-09-14 14:03:37 -07:00
  • 8ab3b10971 Fix UniquePtr Calls Fred Gylys-Colwell 2012-12-21 10:47:41 -08:00
  • fede3bffdd Add DecryptCTR to OEMCrypto Mock Fred Gylys-Colwell 2012-12-14 19:03:25 -08:00
  • 04bfbb0198 Initial Clear Key DRM Engine John "Juce" Bruce 2012-12-10 13:54:43 -08:00
  • d5aa1e41d3 Threading Contract and Error Messages Fred Gylys-Colwell 2012-12-04 12:57:56 -08:00
  • 03d43a5d2d Merge "Separate OEMCrypto DASH from Legacy OEMCrypto" Fred Gylys-Colwell 2012-12-04 14:32:34 -08:00
  • 4529037bd8 Separate OEMCrypto DASH from Legacy OEMCrypto Fred Gylys-Colwell 2012-12-03 14:39:31 -08:00
  • eebba73ce1 Merge "Add ContentDecryptionModule API" Edwin Wong 2012-12-04 12:31:39 -08:00
  • d74290cc9f Update OEMCrypto.h Fred Gylys-Colwell 2012-12-03 13:29:56 -08:00
  • 9a7e424596 Add ContentDecryptionModule API Rahul Frias 2012-11-28 17:49:47 -08:00
  • 8199f94e35 Merge "Add Mock OEMCrypto Stub" Fred Gylys-Colwell 2012-11-30 14:17:33 -08:00
  • 684eb227d4 Add Mock OEMCrypto Stub Fred Gylys-Colwell 2012-11-27 18:33:11 -08:00
  • 35585d4f8f am 4810c96e: am ec683063: am 7bd6a810: Merge "Update Widevine Libraries Version 4.5.0.10088" into jb-mr1.1-dev Fred Gylys-Colwell 2012-11-27 18:44:10 -08:00
  • 4810c96e6f am ec683063: am 7bd6a810: Merge "Update Widevine Libraries Version 4.5.0.10088" into jb-mr1.1-dev Fred Gylys-Colwell 2012-11-27 17:15:02 -08:00
  • ec68306390 am 7bd6a810: Merge "Update Widevine Libraries Version 4.5.0.10088" into jb-mr1.1-dev Fred Gylys-Colwell 2012-11-27 17:13:18 -08:00
  • 7bd6a81067 Merge "Update Widevine Libraries Version 4.5.0.10088" into jb-mr1.1-dev Fred Gylys-Colwell 2012-11-27 17:10:55 -08:00
  • 27bb877763 Add OEMCrypto.h Header Fred Gylys-Colwell 2012-11-27 15:12:34 -08:00
  • 225c70eeed Create Skeleton Directory Tree for DASH Fred Gylys-Colwell 2012-11-26 14:10:23 -08:00
  • 213df62b66 am fa43e4fb: (-s ours) am 7142b3d6: am d0c2e46e: am 63f5ec89: (-s ours) am 583b50d5: Widevine library Version 4.5.0.1 AES 601_AndroidOS_J_MR0; DO NOT MERGE Edwin Wong 2012-11-16 11:37:25 -08:00
  • fa43e4fbbb am 7142b3d6: am d0c2e46e: am 63f5ec89: (-s ours) am 583b50d5: Widevine library Version 4.5.0.1 AES 601_AndroidOS_J_MR0; DO NOT MERGE Edwin Wong 2012-11-16 10:06:36 -08:00
  • 7142b3d60c am d0c2e46e: am 63f5ec89: (-s ours) am 583b50d5: Widevine library Version 4.5.0.1 AES 601_AndroidOS_J_MR0; DO NOT MERGE Edwin Wong 2012-11-16 10:04:05 -08:00
  • d0c2e46e42 am 63f5ec89: (-s ours) am 583b50d5: Widevine library Version 4.5.0.1 AES 601_AndroidOS_J_MR0; DO NOT MERGE Edwin Wong 2012-11-16 10:00:20 -08:00
  • 63f5ec8953 am 583b50d5: Widevine library Version 4.5.0.1 AES 601_AndroidOS_J_MR0; DO NOT MERGE Edwin Wong 2012-11-16 09:57:46 -08:00
  • 583b50d5d3 Widevine library Version 4.5.0.1 AES 601_AndroidOS_J_MR0; DO NOT MERGE Edwin Wong 2012-11-15 14:51:13 -08:00
  • 9477a252d3 Update Widevine Libraries Version 4.5.0.10088 Fred Gylys-Colwell 2012-11-09 12:50:44 -08:00
  • 536517cfa7 merge in jb-mr1-release history after reset to jb-mr1-dev The Android Automerger 2012-10-23 23:36:27 -07:00
  • 5971f35ca3 am da9633d4: am 7fc32e3d: am aac68688: Update Widevine Libraries Version 4.5.0.10087 Jeff Tinker 2012-10-23 21:46:40 -07:00
  • da9633d448 am 7fc32e3d: am aac68688: Update Widevine Libraries Version 4.5.0.10087 Jeff Tinker 2012-10-23 21:44:17 -07:00
  • 7fc32e3dab am aac68688: Update Widevine Libraries Version 4.5.0.10087 Jeff Tinker 2012-10-23 21:41:03 -07:00
  • aac6868830 Update Widevine Libraries Version 4.5.0.10087 Jeff Tinker 2012-10-23 12:33:51 -07:00
  • e8cad9485c Cannot Rewind WVM in MediaCodec Mode John "Juce" Bruce 2012-10-09 15:17:49 -07:00
  • 2316ae8825 am 991ad721: (-s ours) am 8584706e: am 607d9110: am f4ca146c: (-s ours) am 87fa1829: Revert "Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE)" Fred Gylys-Colwell 2012-10-05 14:00:36 -07:00
  • 991ad72120 am 8584706e: am 607d9110: am f4ca146c: (-s ours) am 87fa1829: Revert "Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE)" Fred Gylys-Colwell 2012-10-05 13:58:56 -07:00
  • 8584706e03 am 607d9110: am f4ca146c: (-s ours) am 87fa1829: Revert "Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE)" Fred Gylys-Colwell 2012-10-05 13:57:07 -07:00
  • 607d91108f am f4ca146c: (-s ours) am 87fa1829: Revert "Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE)" Fred Gylys-Colwell 2012-10-05 13:54:55 -07:00
  • f4ca146ca9 am 87fa1829: Revert "Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE)" Fred Gylys-Colwell 2012-10-05 13:52:23 -07:00
  • f1da185ed4 [WVDRM] Fix effectively-unlimited memory usage John "Juce" Bruce 2012-10-03 17:51:21 -07:00
  • 87fa182968 Revert "Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE)" Fred Gylys-Colwell 2012-10-04 12:57:27 -07:00
  • 4daa746052 am 4fe8875d: am 3f2bf742: am c671e404: Merge "[WVDRM] Fix effectively-unlimited memory usage" into jb-mr1-dev John "Juce" Bruce 2012-10-04 12:28:31 -07:00
  • 4fe8875d14 am 3f2bf742: am c671e404: Merge "[WVDRM] Fix effectively-unlimited memory usage" into jb-mr1-dev John "Juce" Bruce 2012-10-04 11:41:01 -07:00
  • 3f2bf742c1 am c671e404: Merge "[WVDRM] Fix effectively-unlimited memory usage" into jb-mr1-dev John "Juce" Bruce 2012-10-04 11:39:09 -07:00
  • c671e40432 Merge "[WVDRM] Fix effectively-unlimited memory usage" into jb-mr1-dev John "Juce" Bruce 2012-10-04 11:37:32 -07:00
  • 2ce9ab8e67 [WVDRM] Fix effectively-unlimited memory usage John "Juce" Bruce 2012-10-03 17:51:21 -07:00
  • 5563d9be8a merge in jb-mr1-release history after reset to jb-mr1-dev The Android Automerger 2012-10-03 07:01:13 -07:00
  • 7c6e14d3e4 am c0fe94c6: am 50ae157c: am b1a1aa7b: Update Widevine Libraries Version 4.5.0.10086 Fred Gylys-Colwell 2012-10-02 15:10:59 -07:00
  • c0fe94c661 am 50ae157c: am b1a1aa7b: Update Widevine Libraries Version 4.5.0.10086 Fred Gylys-Colwell 2012-10-02 15:09:11 -07:00
  • 50ae157c85 am b1a1aa7b: Update Widevine Libraries Version 4.5.0.10086 Fred Gylys-Colwell 2012-10-02 15:07:26 -07:00
  • b1a1aa7b86 Update Widevine Libraries Version 4.5.0.10086 Fred Gylys-Colwell 2012-10-02 13:43:35 -07:00
  • 056fa76db3 merge in jb-mr1-release history after reset to jb-mr1-dev The Android Automerger 2012-10-02 07:01:17 -07:00
  • 2d141c3891 am bcb3bb18: am 9e5531c8: am 71422e7a: Merge "[WVDRM] Fix for stuttering on low bandwidth" into jb-mr1-dev Jeff Tinker 2012-10-02 01:31:34 -07:00
  • bcb3bb18da am 9e5531c8: am 71422e7a: Merge "[WVDRM] Fix for stuttering on low bandwidth" into jb-mr1-dev Jeff Tinker 2012-10-02 01:30:36 -07:00
  • 9e5531c8c4 am 71422e7a: Merge "[WVDRM] Fix for stuttering on low bandwidth" into jb-mr1-dev Jeff Tinker 2012-10-02 01:28:53 -07:00
  • 71422e7a2a Merge "[WVDRM] Fix for stuttering on low bandwidth" into jb-mr1-dev Jeff Tinker 2012-10-02 01:26:13 -07:00
  • 1657b9f67a am 33f02f4c: am e0a62971: am 624f38bb: Merge "Revert "When Running in MediaCodec Mode, Widevine Freezes If You Rewind"" into jb-mr1-dev Edwin Wong 2012-10-01 15:26:04 -07:00
  • 33f02f4c6c am e0a62971: am 624f38bb: Merge "Revert "When Running in MediaCodec Mode, Widevine Freezes If You Rewind"" into jb-mr1-dev Edwin Wong 2012-10-01 15:23:52 -07:00
  • e0a6297163 am 624f38bb: Merge "Revert "When Running in MediaCodec Mode, Widevine Freezes If You Rewind"" into jb-mr1-dev Edwin Wong 2012-10-01 15:21:15 -07:00
  • 624f38bb0c Merge "Revert "When Running in MediaCodec Mode, Widevine Freezes If You Rewind"" into jb-mr1-dev Edwin Wong 2012-10-01 15:20:10 -07:00
  • 54993c50e9 [WVDRM] Fix for stuttering on low bandwidth Jeff Tinker 2012-10-01 13:08:11 -07:00
  • 9df3962aa3 am 9b65c0b7: am f0349e52: am 59e30852: Update Widevine Libraries Version 4.5.0.10085 Fred Gylys-Colwell 2012-10-01 13:47:02 -07:00
  • 9b65c0b74a am f0349e52: am 59e30852: Update Widevine Libraries Version 4.5.0.10085 Fred Gylys-Colwell 2012-10-01 10:27:06 -07:00
  • f0349e5225 am 59e30852: Update Widevine Libraries Version 4.5.0.10085 Fred Gylys-Colwell 2012-10-01 10:24:40 -07:00
  • 59e30852dd Update Widevine Libraries Version 4.5.0.10085 Fred Gylys-Colwell 2012-09-20 15:28:03 -07:00
  • ca21c93f66 Revert "When Running in MediaCodec Mode, Widevine Freezes If You Rewind" Edwin Wong 2012-09-27 13:54:51 -07:00
  • 0ce4a3155d am 9ff76e70: Merge from jb-mr1-aah-dev Jean-Baptiste Queru 2012-09-28 15:52:46 -07:00
  • 9ff76e7015 Merge from jb-mr1-aah-dev Jean-Baptiste Queru 2012-09-28 14:48:19 -07:00
  • 18f9dccb46 merge in jb-mr1-release history after reset to jb-mr1-dev The Android Automerger 2012-09-27 07:01:46 -07:00
  • 6df02b1e98 am 4fffa0ff: Fixed mediacodec mode\'s fatal error when eos is encountered. Edwin Wong 2012-09-26 22:50:05 -07:00
  • d264a2ad55 am 4fffa0ff: Fixed mediacodec mode\'s fatal error when eos is encountered. Edwin Wong 2012-09-26 22:48:33 -07:00
  • 4fffa0ff6a Fixed mediacodec mode's fatal error when eos is encountered. Edwin Wong 2012-09-25 23:05:05 -07:00
  • e396075c34 merge in jb-mr1-release history after reset to jb-mr1-dev The Android Automerger 2012-09-25 07:02:04 -07:00
  • dadcf0c492 am 4e3efb41: Keep local file open for DrmManagerService::acquireDrmInfo(). Gene Morgan 2012-09-24 10:10:36 -07:00
  • 28dac9d034 am 4e3efb41: Keep local file open for DrmManagerService::acquireDrmInfo(). Gene Morgan 2012-09-24 10:08:35 -07:00
  • 4e3efb415b Keep local file open for DrmManagerService::acquireDrmInfo(). Gene Morgan 2012-09-21 11:23:15 -07:00
  • 77da47c4cd am 845e53e6: Update Widevine Libraries Version 4.5.0.10082 Fred Gylys-Colwell 2012-09-21 13:34:02 -07:00
  • ab8c97b194 am 8cd5d091: Allow DRM client to pass the FD of an open file to the DRM server. Gene Morgan 2012-09-21 13:34:02 -07:00
  • 0afc221250 merge in jb-mr1-release history after reset to jb-mr1-dev The Android Automerger 2012-09-21 07:01:58 -07:00
  • f329eaff4d am 845e53e6: Update Widevine Libraries Version 4.5.0.10082 Fred Gylys-Colwell 2012-09-20 20:31:08 -07:00
  • 08c9cc199e am 8cd5d091: Allow DRM client to pass the FD of an open file to the DRM server. Gene Morgan 2012-09-20 20:31:07 -07:00
  • 845e53e684 Update Widevine Libraries Version 4.5.0.10082 Fred Gylys-Colwell 2012-09-17 14:56:35 -07:00
  • 8cd5d09119 Allow DRM client to pass the FD of an open file to the DRM server. Gene Morgan 2012-09-04 15:52:32 -07:00
  • c09344ebe3 merge in jb-mr1-release history after reset to jb-mr1-dev The Android Automerger 2012-09-19 07:02:51 -07:00
  • 69d2a7c651 am b092b158: Merge "When Running in MediaCodec Mode, Widevine Freezes If You Rewind" into jb-mr1-dev John "Juce" Bruce 2012-09-18 14:49:16 -07:00