Commit Graph

Select branches

Hide Pull Requests

klp

vic-widevine-release

Mono Color

• 1a536310fc Merge "Remove unused functions from mips stub" Fred Gylys-Colwell 2016-01-13 21:01:28 +00:00
• 8858333d9b Merge "Clean up wvdrm log spam during movie playback" Jeff Tinker 2016-01-13 20:02:33 +00:00
• d36ddf661e Clean up wvdrm log spam during movie playback Jeff Tinker 2016-01-13 12:01:55 -08:00
• 97e826412d Add cipher mode and pattern encryption support Rahul Frias 2016-01-07 15:31:08 -08:00
• aaed45dedf Merge "Modify initialization data to support HLS" Rahul Frias 2016-01-12 20:51:12 +00:00
• 4aedea8512 Support AES-CBC sample encryption in MediaDrm Jeff Tinker 2015-12-18 12:00:35 -08:00
• 355471c408 Modify initialization data to support HLS Rahul Frias 2016-01-07 13:06:42 -08:00
• 53463f292d Merge "Remove unused code from test methods" Rahul Frias 2016-01-07 18:36:13 +00:00
• 0adf6e7b53 Remove unused code from test methods Rahul Frias 2016-01-04 19:05:01 -08:00
• 42d96c362d Remove unused methods Rahul Frias 2016-01-04 18:40:58 -08:00
• 3e8d137656 Remove unused functions from mips stub Fred Gylys-Colwell 2016-01-04 13:26:33 -08:00
• 3c5acad498 Merge "Level 3 OEMCrypto library" Fred Gylys-Colwell 2016-01-04 19:49:09 +00:00
• 0ba6383126 DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours am: e525aad042 -s ours am: b58de75756 -s ours am: 12c6b681e5 -s ours am: 4d84216089 -s ours am: 62c9688118 -s ours am: 0c660f33ef -s ours am: b7be833e68 -s ours am: 168c9bec9b -s ours am: 7a7b7e1192 -s ours am: 143637f463 -s ours am: 0b450d7114 -s ours am: 69d90c3c07 -s ours am: d0e006f7b5 -s ours Kyle Alexander 2015-12-18 21:35:38 +00:00
• d0e006f7b5 DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours am: e525aad042 -s ours am: b58de75756 -s ours am: 12c6b681e5 -s ours am: 4d84216089 -s ours am: 62c9688118 -s ours am: 0c660f33ef -s ours am: b7be833e68 -s ours am: 168c9bec9b -s ours am: 7a7b7e1192 -s ours am: 143637f463 -s ours am: 0b450d7114 -s ours am: 69d90c3c07 -s ours Kyle Alexander 2015-12-18 21:31:34 +00:00
• 69d90c3c07 DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours am: e525aad042 -s ours am: b58de75756 -s ours am: 12c6b681e5 -s ours am: 4d84216089 -s ours am: 62c9688118 -s ours am: 0c660f33ef -s ours am: b7be833e68 -s ours am: 168c9bec9b -s ours am: 7a7b7e1192 -s ours am: 143637f463 -s ours am: 0b450d7114 -s ours Kyle Alexander 2015-12-18 21:09:15 +00:00
• 0b450d7114 DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours am: e525aad042 -s ours am: b58de75756 -s ours am: 12c6b681e5 -s ours am: 4d84216089 -s ours am: 62c9688118 -s ours am: 0c660f33ef -s ours am: b7be833e68 -s ours am: 168c9bec9b -s ours am: 7a7b7e1192 -s ours am: 143637f463 -s ours Kyle Alexander 2015-12-18 21:07:19 +00:00
• 143637f463 DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours am: e525aad042 -s ours am: b58de75756 -s ours am: 12c6b681e5 -s ours am: 4d84216089 -s ours am: 62c9688118 -s ours am: 0c660f33ef -s ours am: b7be833e68 -s ours am: 168c9bec9b -s ours am: 7a7b7e1192 -s ours Kyle Alexander 2015-12-18 21:04:39 +00:00
• 7a7b7e1192 DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours am: e525aad042 -s ours am: b58de75756 -s ours am: 12c6b681e5 -s ours am: 4d84216089 -s ours am: 62c9688118 -s ours am: 0c660f33ef -s ours am: b7be833e68 -s ours am: 168c9bec9b -s ours Kyle Alexander 2015-12-18 21:01:44 +00:00
• 168c9bec9b DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours am: e525aad042 -s ours am: b58de75756 -s ours am: 12c6b681e5 -s ours am: 4d84216089 -s ours am: 62c9688118 -s ours am: 0c660f33ef -s ours am: b7be833e68 -s ours Kyle Alexander 2015-12-18 20:59:05 +00:00
• b7be833e68 DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours am: e525aad042 -s ours am: b58de75756 -s ours am: 12c6b681e5 -s ours am: 4d84216089 -s ours am: 62c9688118 -s ours am: 0c660f33ef -s ours Kyle Alexander 2015-12-18 20:56:56 +00:00
• 0c660f33ef DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours am: e525aad042 -s ours am: b58de75756 -s ours am: 12c6b681e5 -s ours am: 4d84216089 -s ours am: 62c9688118 -s ours Kyle Alexander 2015-12-18 20:54:33 +00:00
• 62c9688118 DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours am: e525aad042 -s ours am: b58de75756 -s ours am: 12c6b681e5 -s ours am: 4d84216089 -s ours Kyle Alexander 2015-12-18 20:46:30 +00:00
• 4d84216089 DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours am: e525aad042 -s ours am: b58de75756 -s ours am: 12c6b681e5 -s ours Kyle Alexander 2015-12-18 20:44:32 +00:00
• 12c6b681e5 DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours am: e525aad042 -s ours am: b58de75756 -s ours Kyle Alexander 2015-12-18 20:42:43 +00:00
• b58de75756 DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours am: e525aad042 -s ours Kyle Alexander 2015-12-18 20:40:32 +00:00
• e525aad042 DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours Kyle Alexander 2015-12-18 20:38:36 +00:00
• 1735b367f3 Level 3 OEMCrypto library Fred Gylys-Colwell 2015-12-18 08:29:56 -08:00
• a235a61e28 Merge "Close session before terminate" Fred Gylys-Colwell 2015-12-17 19:41:38 +00:00
• cc8af7b82b Merge "Replace deprecated APIs." Edwin Wong 2015-12-17 19:14:31 +00:00
• 1744b5a779 Update stub file for mips 64 build Fred Gylys-Colwell 2015-12-16 19:35:10 -08:00
• 8bf6a6f2d0 Merge changes I518ef46b,I2c2c1c1d Fred Gylys-Colwell 2015-12-17 02:37:24 +00:00
• d173791ccc Replace deprecated APIs. Edwin Wong 2015-12-16 17:43:26 -08:00
• 4a37b21a22 Close session before terminate Fred Gylys-Colwell 2015-12-16 17:26:26 -08:00
• ce6d392041 Unit Tests for Security Patch Level Fred Gylys-Colwell 2015-12-16 13:27:36 -08:00
• 8e4ad69cf0 Updating asset names link in sample player readme DO NOT MERGE am: ba25949152 am: 032652fa0f -s ours am: 83ac4b052f am: 20cec67597 am: e55e341dd0 am: 220d45baa0 -s ours Aaron Vaage 2015-12-16 23:44:44 +00:00
• 5cfb0a7477 Updating asset names link in sample player readme DO NOT MERGE am: 62c80f89ba am: 72618085fc am: 313f07a1b9 am: d7d30f75bd -s ours Aaron Vaage 2015-12-16 23:44:38 +00:00
• 220d45baa0 Updating asset names link in sample player readme DO NOT MERGE am: ba25949152 am: 032652fa0f -s ours am: 83ac4b052f am: 20cec67597 am: e55e341dd0 Aaron Vaage 2015-12-16 22:53:46 +00:00
• e55e341dd0 Updating asset names link in sample player readme DO NOT MERGE am: ba25949152 am: 032652fa0f -s ours am: 83ac4b052f am: 20cec67597 Aaron Vaage 2015-12-16 22:36:31 +00:00
• d7d30f75bd Updating asset names link in sample player readme DO NOT MERGE am: 62c80f89ba am: 72618085fc am: 313f07a1b9 Aaron Vaage 2015-12-16 14:32:41 -08:00
• 313f07a1b9 Updating asset names link in sample player readme DO NOT MERGE am: 62c80f89ba am: 72618085fc Aaron Vaage 2015-12-16 22:20:19 +00:00
• 20cec67597 Updating asset names link in sample player readme DO NOT MERGE am: ba25949152 am: 032652fa0f -s ours am: 83ac4b052f Aaron Vaage 2015-12-16 14:16:07 -08:00
• 83ac4b052f Updating asset names link in sample player readme DO NOT MERGE am: ba25949152 am: 032652fa0f -s ours Aaron Vaage 2015-12-16 22:11:14 +00:00
• 032652fa0f Updating asset names link in sample player readme DO NOT MERGE am: ba25949152 Aaron Vaage 2015-12-16 22:06:33 +00:00
• 72618085fc Updating asset names link in sample player readme DO NOT MERGE am: 62c80f89ba Aaron Vaage 2015-12-16 22:06:32 +00:00
• 17faabee44 Fail early in oemcrypto unit tests Fred Gylys-Colwell 2015-12-16 13:23:39 -08:00
• 99941b86b6 DO NOT MERGE ANYWHERE Update license tests to use Widevine license service klp Kyle Alexander 2015-12-14 15:03:15 -08:00
• 12db6099d2 Merge "Merge CE Device Changes" Fred Gylys-Colwell 2015-12-10 21:45:24 +00:00
• ba25949152 Updating asset names link in sample player readme DO NOT MERGE Aaron Vaage 2015-12-09 09:47:06 -08:00
• 62c80f89ba Updating asset names link in sample player readme DO NOT MERGE Aaron Vaage 2015-12-09 10:05:55 -08:00
• 0dc746a380 OEMCrypto v11 Documentation and Headers Fred Gylys-Colwell 2015-12-09 13:51:18 -08:00
• a99825b7aa Unit Test for OEMCrypto to Reject Future Key Control Block Fred Gylys-Colwell 2015-12-09 09:58:36 -08:00
• 6d7dcb8cba Updates to OEMCrytpo Mock Fred Gylys-Colwell 2015-12-05 11:39:26 -08:00
• e4513f4a59 Merge CE Device Changes Fred Gylys-Colwell 2015-12-07 14:12:46 -08:00
• 6886b1fa12 Add HDCP, HEVC and VP9 content samples to ExoPlayer Kyle Alexander 2015-11-23 15:27:47 -08:00
• c1894e8fa4 Remove usage reports upon factory reset of device. Edwin Wong 2015-11-20 17:34:34 -08:00
• a53589c6fc Rename the internal copy of gmock. am: 2b2337bb3c am: 841aa35591 Tim Kilbourn 2015-11-20 00:16:02 +00:00
• 841aa35591 Rename the internal copy of gmock. am: 2b2337bb3c Tim Kilbourn 2015-11-19 23:01:10 +00:00
• 2b2337bb3c Rename the internal copy of gmock. Tim Kilbourn 2015-05-14 17:05:59 -07:00
• 1c1108c6ef Update Widevine Android Version Number for M-MR1 (DO NOT MERGE) am: c2ce8f974f am: 51468fd612 -s ours John "Juce" Bruce 2015-10-28 19:41:46 +00:00
• 51468fd612 Update Widevine Android Version Number for M-MR1 (DO NOT MERGE) am: c2ce8f974f John "Juce" Bruce 2015-10-28 19:38:03 +00:00
• c2ce8f974f Update Widevine Android Version Number for M-MR1 (DO NOT MERGE) John "Juce" Bruce 2015-10-27 11:03:20 -07:00
• c8d0ddadf5 Extractors are now binderized Marco Nelissen 2015-09-22 15:14:43 -07:00
• 64ad54fdb0 Update Widevine Android Version Number to 4.0 John "Juce" Bruce 2015-10-23 15:10:19 -07:00
• c7bb93375b resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68 am: 1afb1066cc am: 2253f6c392 am: 10b2b36a1e am: de6d223b82 am: 3b3b609173 am: 3efbeb28d7 am: c37606b47b am: d1b284b21c am: 220816c7e2 Edwin Wong 2015-10-20 05:08:24 +00:00
• 2099e2a52b resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d am: 2ee45a97b0 am: ac1854b989 am: fc1240bdc2 am: 4c2eb98d09 am: a69baa961a am: fdc1ab381d am: 90d6be0170 am: 21f2393af0 Edwin Wong 2015-10-20 05:08:21 +00:00
• 220816c7e2 resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68 am: 1afb1066cc am: 2253f6c392 am: 10b2b36a1e am: de6d223b82 am: 3b3b609173 am: 3efbeb28d7 am: c37606b47b am: d1b284b21c Edwin Wong 2015-10-20 05:06:43 +00:00
• 21f2393af0 resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d am: 2ee45a97b0 am: ac1854b989 am: fc1240bdc2 am: 4c2eb98d09 am: a69baa961a am: fdc1ab381d am: 90d6be0170 Edwin Wong 2015-10-20 05:06:40 +00:00
• d1b284b21c resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68 am: 1afb1066cc am: 2253f6c392 am: 10b2b36a1e am: de6d223b82 am: 3b3b609173 am: 3efbeb28d7 am: c37606b47b Edwin Wong 2015-10-20 04:59:31 +00:00
• 90d6be0170 resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d am: 2ee45a97b0 am: ac1854b989 am: fc1240bdc2 am: 4c2eb98d09 am: a69baa961a am: fdc1ab381d Edwin Wong 2015-10-20 04:59:28 +00:00
• c37606b47b resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68 am: 1afb1066cc am: 2253f6c392 am: 10b2b36a1e am: de6d223b82 am: 3b3b609173 am: 3efbeb28d7 Edwin Wong 2015-10-20 04:57:44 +00:00
• fdc1ab381d resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d am: 2ee45a97b0 am: ac1854b989 am: fc1240bdc2 am: 4c2eb98d09 am: a69baa961a Edwin Wong 2015-10-20 04:57:41 +00:00
• 3efbeb28d7 resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68 am: 1afb1066cc am: 2253f6c392 am: 10b2b36a1e am: de6d223b82 am: 3b3b609173 Edwin Wong 2015-10-20 04:31:52 +00:00
• a69baa961a resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d am: 2ee45a97b0 am: ac1854b989 am: fc1240bdc2 am: 4c2eb98d09 Edwin Wong 2015-10-20 04:30:09 +00:00
• 3b3b609173 resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68 am: 1afb1066cc am: 2253f6c392 am: 10b2b36a1e am: de6d223b82 Edwin Wong 2015-10-20 04:28:23 +00:00
• 4c2eb98d09 resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d am: 2ee45a97b0 am: ac1854b989 am: fc1240bdc2 Edwin Wong 2015-10-20 04:26:43 +00:00
• de6d223b82 resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68 am: 1afb1066cc am: 2253f6c392 am: 10b2b36a1e Edwin Wong 2015-10-20 04:26:42 +00:00
• fc1240bdc2 resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d am: 2ee45a97b0 am: ac1854b989 Edwin Wong 2015-10-20 04:24:53 +00:00
• 10b2b36a1e resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68 am: 1afb1066cc am: 2253f6c392 Edwin Wong 2015-10-20 04:24:53 +00:00
• ac1854b989 resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d am: 2ee45a97b0 Edwin Wong 2015-10-20 04:23:06 +00:00
• 2253f6c392 resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68 am: 1afb1066cc Edwin Wong 2015-10-20 04:23:06 +00:00
• 2ee45a97b0 resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d Edwin Wong 2015-10-20 04:21:24 +00:00
• 1afb1066cc resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68 Edwin Wong 2015-10-20 04:14:58 +00:00
• d5a1d5d58d resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 Edwin Wong 2015-10-20 04:13:17 +00:00
• ee415b7b68 resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 Edwin Wong 2015-10-20 04:13:17 +00:00
• 5754438dc1 resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 Edwin Wong 2015-10-20 04:11:35 +00:00
• 94dab9e905 resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 Edwin Wong 2015-10-20 04:11:35 +00:00
• 655574d968 resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 Edwin Wong 2015-10-20 04:08:24 +00:00
• 9617db4d71 resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e Edwin Wong 2015-10-20 04:08:23 +00:00
• f78b0e780e resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. Edwin Wong 2015-10-19 20:59:36 -07:00
• 27133e7a03 resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d Edwin Wong 2015-10-20 02:59:35 +00:00
• c0b8030851 resolve merge conflicts of 769288d009 to jb-mr1.1-docs. Edwin Wong 2015-10-19 18:32:07 -07:00
• f7c043f32d resolve merge conflicts of fea63b4062 to jb-mr1-dev. Edwin Wong 2015-10-19 18:22:48 -07:00
• 072cf7e711 Add level 3 libs and address build warnings Rahul Frias 2015-10-07 11:07:43 -07:00
• f19bb98fb0 Update Sample Player Readme Fred Gylys-Colwell 2015-10-09 14:13:33 -07:00
• 72e4a10a8b Merge "Additional merges from cdm master" Rahul Frias 2015-10-07 20:42:38 +00:00
• ad3908e731 Merge "Improve query performance" Rahul Frias 2015-10-07 16:51:34 +00:00
• d5557b42de Merge "Add XtsMediaTestCases.apk to google-tests.zip" Kyle Alexander 2015-10-06 21:57:29 +00:00
• 5aff60980e Add XtsMediaTestCases.apk to google-tests.zip Kyle Alexander 2015-10-05 11:47:20 -07:00
• e5dfb83e03 Improve query performance Rahul Frias 2015-10-05 15:22:20 -07:00
• 0fe3f79cc3 Additional merges from cdm master Rahul Frias 2015-10-05 11:30:03 -07:00