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

2610 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
The Android Automerger
1a67b379ac merge in ics-release history after reset to master 2012-01-10 07:03:03 -08:00
The Android Automerger
6a58f84d71 merge in ics-release history after reset to master 2012-01-09 07:04:03 -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
The Android Automerger
07db2b783b merge in ics-release history after reset to master 2012-01-05 07:02:17 -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
Jeff Tinker
c9c2ebc9bf am f66301bd: Report correct decrypted video length to OMX codec 
* commit 'f66301bddb27f6dc5abb0fa0b4d368d7ff6c6840':
  Report correct decrypted video length to OMX codec
 2012-01-04 13:21:47 -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
The Android Automerger
7e2f1dd588 merge in ics-release history after reset to master 2011-12-15 07:02:19 -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
3b4e1f62db 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:50:16 -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
The Android Automerger
3b9e8d70ab merge in ics-release history after reset to master 2011-12-13 07:02:29 -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
f9bda12fb3 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 11:22:39 -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
The Android Automerger
ceae33195f merge in ics-release history after reset to master 2011-12-12 07:03:19 -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
a7b87a13f7 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-08 00:14:38 -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
The Android Automerger
4709d20db0 merge in ics-release history after reset to master 2011-11-16 07:03:47 -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
cfe6d80c2d 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:01:17 -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
The Android Automerger
9d8aa491fb merge in ics-release history after reset to master 2011-11-14 07:01:30 -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
3236ad55c5 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:26:10 -08:00
The Android Automerger
2af6071dff merge in ics-release history after reset to master 2011-11-13 07:04:45 -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
b71151ce43 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 15:13:45 +00:00
Edwin Wong
53067679d2 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 15:12:07 +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
The Android Automerger
9756123106 merge in ics-release history after reset to master 2011-11-10 07:03:23 -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
Jeff Tinker
67ec23c8b9 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-08 18:17:21 +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
Ed Heyl
3c5851ed9f keep previous history after reset to mr1 plus aah changes (ics-aah-wip) 2011-10-28 19:06:08 +00:00
Ed Heyl
9905bc8f11 undo reset to ics-mr1 until we have a better method 2011-10-26 21:53:31 +00:00
Ed Heyl
790c1ec177 reset to ics-mr1, but keep history 2011-10-26 18:50:37 +00:00
The Android Automerger
ca5f1e9a9c merge in ics-release history after reset to master 2011-10-26 09:56:56 -07:00
Jeffrey Tinker
96a0122828 am 6482fc32: am 80daed61: am 82d675f1: [DRM] Terminate HTTPClient thread after content type sniff 
* commit '6482fc3269f884c1c3dd922e8eff9d84de3c97c9':
  [DRM] Terminate HTTPClient thread after content type sniff
 2011-10-26 08:28:45 -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