widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
228 Commits 2 Branches 0 Tags
aaa8479c3424143d2829c7be9be257dd1cfa89f3
Commit Graph

183 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
aaa8479c34 Allow disabling the generic implementation. 
Some device like grouper have their own.

Change-Id: I3a2c7e00c1a3158bd4555fefea8c7cee3e426230
 2012-04-13 17:11:16 -07:00
Jeff Tinker
e3e41ac5fd Fix for x86 build error on lunch target vbox_x86-eng 
Excludes widevine drm libs from build for now, will
re-enable when the libs are available.

Change-Id: I51521afd073029bb0e5bcf0d00ea770c2bf18001
 2012-04-12 10:58:05 -07:00
Jeff Tinker
e91ac5af7a Merge "Remove the annoying WVStreamControl version prints from command line test apps" 2012-04-12 09:24:13 -07:00
Jeff Tinker
86ecba13ef Remove the annoying WVStreamControl version prints from command line test apps 
Change-Id: I946c4e62a68b2bf9a10ad957feb9424aa606755e
 2012-04-11 20:30:23 -07:00
Jeff Tinker
300d172ba4 [WVDRM] Reorg of binary libs into proc-specific folders 
Rahul's changes in preparation for adding x86 support

Change-Id: Ib51dfa72291857c44be37595be2205dd040fc0dd
related-to-bug: 6276794
 2012-04-10 17:26:58 -07:00
Jeff Tinker
9a7a7879f1 Merge "Upgrade of Widevine libraries from 4.5.0 to 6.0.0" 2012-04-06 18:11:18 -07:00
Jeff Tinker
462dc030f8 Upgrade of Widevine libraries from 4.5.0 to 6.0.0 
Upload for Dave Parsons

6.0.0 Widevine libraries contain the features required
to support multiple audio tracks and subtitles.  This
is establishing the baseline for those features.

Change-Id: If12074bb2e4364c8107339e2f69453c40698e91f
related-to-bug: 5880566
 2012-04-05 15:49:32 -07:00
Jeff Tinker
83be76c303 Merge "Fix an intermittent issue with HLS live streaming" 2012-04-05 12:02:45 -07:00
Jeff Tinker
efd3647691 /vendor/widevine portion of removing YouTube-specific error codes 
Multi-repository change. See also update to MediaErrors.h in
a separate CL.

related-to-bug: 5883949

Change-Id: I505486a86a87b690aa13f813f4b88edd386382ce
 2012-04-03 16:09:05 -07:00
Jeff Tinker
ba32a8ddb8 Fix an intermittent issue with HLS live streaming 
An uninitialized return code was causing intermittent
playback failure during Widevine HLS live playback

Change-Id: Ib45176e7f91e2b6ccf0eb4185c6d58d3be0229b4
related-to-bug: 6277231
 2012-04-02 22:10:04 -07:00
Jeff Tinker
c8a09dfe42 Protect against rollover of LICENSE_START_TIME when clock is set back 
Contains Widevine library version 4.5.0.6480

Change-Id: I735d4a07c38f0eb781f7c5338229b179fdc3a550
related-to-bug: 6202995
 2012-03-30 17:12:12 -07:00
James Dong
e9ff127d78 Makefile change because media and drm header files are relocated 
o related-to-bug: 6214141

Change-Id: I5d5e4169eb05f75c19c1598e05b72e251b2899fb
 2012-03-23 21:51:16 -07:00
Jeff Tinker
f71be04d59 Merge "Fix Widevine HLS live streaming" 2012-03-16 12:15:51 -07:00
Jeff Tinker
c5a49d2e73 Fix Widevine HLS live streaming 
Change-Id: I566b693f7f0e9a7b7c8111fb654f79bcd927e02d
related-to-bug: 6178393
 2012-03-15 17:34:58 -07:00
Jeff Tinker
835420c31d Fix videos app bandwidth accounting for streaming over 4G 
Attribute traffic on socket descriptors to UID of videos app

Multi-repository commit, see also changes in frameworks/base/media.

Includes Widevine library version 4.5.0.6153

Change-Id: I5ddf1b7b758edc82d48a788fc30616d90cab4bd0
related-to-bug: 5434244
 2012-03-08 15:08:47 -08:00
Edwin Wong
8f4420fcea TYPE_ALL_RIGHTS_REMOVED must not be used as an error type. 
related-to-bug: 6060863

Change-Id: I9a3c4724c88dc5a642dfa936843d847a4ae53de3
 2012-03-02 15:06:23 -08:00
Edwin Wong
a4d2b1b37c Change portal used by test-wvplayer. 
related-to-bug: 6030747

Change-Id: I570d126750438f08bfdb0f29c71a6a9b5976c281
 2012-02-28 13:47:56 -08:00
Edwin Wong
96ccef64bb Fixed native crash observed on L3 devices by Jeff Tinker. 
Change-Id: If78b7e9b5b5f4b87c5b2c55f75a00704e8536ce6
related-to-bug: 5952202
 2012-02-08 17:25:29 -08:00
James Dong
bab8ed4582 Move away from MediaDebug and use ADebug instead 
Change-Id: Id904857259a5de0b77f09716315ceb8f665af4e0
 2012-02-08 15:17:27 -08:00
Edwin Wong
beb9b7b603 Add support to query through DrmInfoRequest::TYPE_REGISTRATION_INFO to check if a device is provisioned. 
Includes Widevine lib version: 4.5.0.5781 AES BR_PYTHON2

Change-Id: Id5e673b97e3ec80532e2d7f42aae687adfecc765
related-to-bug: 5152997
 2012-01-27 09:40:36 -08:00
Jeff Tinker
c3949b1967 Changed license headers from AOSP to Google copyright 
Change-Id: I3587e290cf49755e06354118fbf877d189508ce8
related-to-bug: 5833045
 2012-01-24 15:27:50 -08:00
Jeff Tinker
c634a709f9 am 65d4c7ab: Fix security hole and hang on movie playback 
* commit '65d4c7ab2031833cf82331aa375da0bdec282303':
  Fix security hole and hang on movie playback
 2012-01-23 09:18:02 -08:00
Jeff Tinker
65d4c7ab20 Fix security hole and hang on movie playback 
Security hole is in /data/drm world writable directories
Hang on movie playback was found on ASUS TF201

Sorry, can't make these independent since binary libs aren't
mergeable.

Contains Widevine library Version 4.5.0.5753

Change-Id: I01ddfc5b2390f15d5d187dd6581b0a01743f4a68
related-to-bug: 5834297
related-to-bug: 5874137
 2012-01-20 10:31:40 -08:00
James Dong
ec3d3d9f47 Remove excessive warning log message from IsWidevineMedia() method 
Change-Id: I0358541c10c9807332579c80a1111074b38a721e
 2012-01-17 10:52:11 -08:00
James Dong
9fd21a7798 Implement WV side of the separation of sniffing and decrypt session initialization. 
Further optimization may be done to further speed up a drm content playback session

related-to-bug: 5725548

Change-Id: Ife69deaf5d2d70bba812fe1a48d9268d8e9530f7
 2012-01-12 16:12:39 -08:00
Steve Block
7284b7e7f3 Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: I9b2273ef758c78d927591c1a0a9f988de739742c
 2012-01-08 10:17:01 +00:00
Steve Block
b443024341 Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE" 2012-01-05 14:08:24 -08:00
Jeff Tinker
ddf87803c7 am f66301bd: Report correct decrypted video length to OMX codec 
* commit 'f66301bddb27f6dc5abb0fa0b4d368d7ff6c6840':
  Report correct decrypted video length to OMX codec
 2012-01-04 21:51:51 -08:00
Steve Block
8d8df85113 Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/156801

Bug: 5449033
Change-Id: Ib8dfa140669788229a5a59d5849907c92393225c
 2012-01-04 20:06:42 +00:00
Steve Block
efe632956d Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/156016

Bug: 5449033
Change-Id: I2d28198c2fc4622a090f4d830cbb311fe522749c
 2012-01-03 22:33:09 +00:00
Jeff Tinker
f66301bddb Report correct decrypted video length to OMX codec 
Change-Id: I8f869cfbb0ee74d03d1b0cb14c422c4b78b3692d
related-to-bug: 5772593
 2011-12-16 16:10:32 -08:00
James Dong
4b10b77fa1 am 444dc2a8: Revert "Fix ANRs due to Widevine DRM plugin sniff taking too long." We need to do this because with this patch, SHA/MD5 module may get stuck and cause power consumption regression. 
* commit '444dc2a84539f100689642f5756e5e6d6e5cd705':
  Revert "Fix ANRs due to Widevine DRM plugin sniff taking too long." We need to do this because with this patch, SHA/MD5 module may get stuck and cause power consumption regression.
 2011-12-14 13:53:32 -08:00
James Dong
444dc2a845 Revert "Fix ANRs due to Widevine DRM plugin sniff taking too long." 
We need to do this because with this patch, SHA/MD5 module may get stuck and cause power consumption regression.

This reverts commit 95d4dc7776.

related-to-bug: 5739618
 2011-12-14 11:05:53 -08:00
Jeff Tinker
e6aa26e7cf am c00a26a0: Fix OMX codec error playing Widevine content on Nexus S 
* commit 'c00a26a05f59c352dc457a211284dc2c697ae2fd':
  Fix OMX codec error playing Widevine content on Nexus S
 2011-12-12 15:39:25 -08:00
Jeff Tinker
c00a26a05f Fix OMX codec error playing Widevine content on Nexus S 
Includes Widevine library version 4.5.0.5561

Change-Id: I9c69466bd7d055c64a3e8be0804793fe38977161
related-to-bug: 5699816
 2011-12-12 10:22:05 -08:00
Jeff Tinker
e314afcb95 am 95d4dc77: Fix ANRs due to Widevine DRM plugin sniff taking too long. 
* commit '95d4dc7776b0202f22bd743e1e2b86a444a247a3':
  Fix ANRs due to Widevine DRM plugin sniff taking too long.
 2011-12-09 14:25:42 -08:00
Jeff Tinker
95d4dc7776 Fix ANRs due to Widevine DRM plugin sniff taking too long. 
Add a Widevine-specific format sniffer to avoid having to
refetch data from the remote server.

related-to-bug: 5725548

Change-Id: I622e39930f8d243111e4731557b0df17c4e2651d
 2011-12-07 21:09:04 -08:00
Edwin Wong
01663c7e99 am 94edc18b: Fixed session not terminated when bandwidth goes below the supported encoded bitrate (preload error). 
* commit '94edc18bdeb3a4a1e044ee81bb1f64ccb31c4a8e':
  Fixed session not terminated when bandwidth goes below the supported encoded bitrate (preload error).
 2011-11-15 18:25:27 -08:00
Edwin Wong
94edc18bde Fixed session not terminated when bandwidth goes below the supported encoded bitrate (preload error). 
Change-Id: Ib7bddaaaac7d48df7f18fab0c5d486624abe3119
related-to-bug: 5564453
 2011-11-15 09:45:56 -08:00
Edwin Wong
b2ecb1899e am e8951bc6: Fixed 5207482, 5414035, 5489515 and 5489833; increase delay before converting 2014 warning to error Include Widevine library version 4.5.0.5244 
* commit 'e8951bc6843f66da6a8eae106c54e7a4d22904e9':
  Fixed 5207482, 5414035, 5489515 and 5489833; increase delay before converting 2014 warning to error Include Widevine library version 4.5.0.5244
 2011-11-13 16:27:59 -08:00
Edwin Wong
e8951bc684 Fixed 5207482, 5414035, 5489515 and 5489833; increase delay before converting 2014 warning to error 
Include Widevine library version 4.5.0.5244

5489833 - live stream aborts early
  ignore continuity counter error warning (status=2014)

5414035 Telstra content cannot play, duplicate of 5489515
5489515 cannot play Disney content
  Telstra content has 4 bytes of AudioSpecificConfig instead of 2
  Disney content has 5 byte AudioSpecificConfig whereas 2 bytes appears to be correct for AAC-LC

5207482 SIGSEGV happens on pressing "Show Rights" during playback of expired movies

Change-Id: Iacc0d02d328c228d28b8cc8be93e63fe9f8b4600
related-to-bug: 5207482
related-to-bug: 5414035
related-to-bug: 5489515
related-to-bug: 5489833
 2011-11-10 17:36:05 -08:00
Edwin Wong
2987f9b71f am 523caa4c: Merge "Moved onPause from WidevineSamplePlayer class to VideoPlayerView class. BUG: 5561197" into ics-mr1 
* commit '523caa4c940cb13b05d2c4ce2fd1f12cfbe7be24':
  Moved onPause from WidevineSamplePlayer class to VideoPlayerView class. BUG: 5561197
 2011-11-10 19:39:26 +00:00
Edwin Wong
2f6a27e20f am d8e21430: Merge "Adjusts seeks too close to the end in WV_Play, which allows processing of end-of-program markers. Uploaded WV libs 4.5.0.5066 for Thomas Inskip. Fixed movies not restting to beginning after fastforward to end." into ics-mr1 
* commit 'd8e2143022157c44465bae4d124642db540332fa':
  Adjusts seeks too close to the end in WV_Play, which allows processing of end-of-program markers. Uploaded WV libs 4.5.0.5066 for Thomas Inskip. Fixed movies not restting to beginning after fastforward to end.
 2011-11-10 19:39:25 +00:00
Edwin Wong
523caa4c94 Merge "Moved onPause from WidevineSamplePlayer class to VideoPlayerView class. BUG: 5561197" into ics-mr1 2011-11-10 07:11:49 -08:00
Edwin Wong
d8e2143022 Merge "Adjusts seeks too close to the end in WV_Play, which allows processing of end-of-program markers. Uploaded WV libs 4.5.0.5066 for Thomas Inskip. Fixed movies not restting to beginning after fastforward to end." into ics-mr1 2011-11-10 07:09:58 -08:00
Jeff Tinker
b860f7ab7e am 5fe2e2fd: Upload Ed Schacker\'s fix for ANR on expired assets 
* commit '5fe2e2fdb759b4102a1614e761a0db8eecc3aa27':
  Upload Ed Schacker's fix for ANR on expired assets
 2011-11-09 14:34:20 +00:00
Edwin Wong
662dced941 Moved onPause from WidevineSamplePlayer class to VideoPlayerView class. 
BUG: 5561197

Change-Id: I0486c04094e3535106726ef9902814315dd07522
 2011-11-03 09:27:53 -07:00
Jeff Tinker
5fe2e2fdb7 Upload Ed Schacker's fix for ANR on expired assets 
Bug: 5207528
Change-Id: I59b531d744da2046bb0698c4e45f031c3c476114
 2011-11-01 10:16:50 -07:00
Edwin Wong
111050c07d Adjusts seeks too close to the end in WV_Play, which allows processing of end-of-program markers. 
Uploaded WV libs 4.5.0.5066 for Thomas Inskip. Fixed movies not restting to beginning after fastforward to end.

BUG: 5489972
Change-Id: Iad4b2933b47b6614db8e9d75c9d6a5f3f4bc3201
 2011-10-28 13:45:14 -07:00
Jeffrey Tinker
6482fc3269 am 80daed61: am 82d675f1: [DRM] Terminate HTTPClient thread after content type sniff 
* commit '80daed61a501498eb237a492d55441062132a518':
  [DRM] Terminate HTTPClient thread after content type sniff
 2011-10-26 15:27:19 +00:00