Commit Graph

269 Commits

Author SHA1 Message Date
Jeff Tinker
4de22cf3f7 am df066c06: (-s ours) Widevine library update for Jellybean DO NOT MERGE
* commit 'df066c06345eb544238061afd444db1cddb5b651':
  Widevine library update for Jellybean DO NOT MERGE
2012-05-22 21:13:13 -07:00
Jeff Tinker
df066c0634 Widevine library update for Jellybean DO NOT MERGE
This release contains widevine library version 4.5.0-7201

Fix NPE in videos app due to missing license status
Resolve SIGPIPE fault in mediaserver

Change-Id: Ib51f4ca5560d3e50363ed4933e07e29e8ab74c7c
related-to-bug: 6512128
related-to-bug: 6528820
2012-05-22 17:36:25 -07:00
Jean-Baptiste Queru
f6f4507186 am 34b997be: liboemcrypto only exists in vendor/ builds
* commit '34b997be967ed0d44703fd4b567750f0597de6b2':
  liboemcrypto only exists in vendor/ builds
2012-05-21 14:31:13 -07:00
James Dong
fdbb5fa10d am f7ce4a9b: Merge "Add bandwidth to adaptive log" into jb-dev
* commit 'f7ce4a9b9aacd01b0a47439a1c33f4e9ace24c5c':
  Add bandwidth to adaptive log
2012-05-21 12:39:33 -07:00
Jeff Tinker
318d335e63 Merge commit 'cf425f5b' into manualmerge
Conflicts:
	proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L1.so
	proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L3.so

Change-Id: I786fa1f8da270acb8d48c515f8fb2f6eb83f9783
2012-05-21 12:32:53 -07:00
Fred Gylys-Colwell
9cb8f2b91b am 382a5286: Merge "Fix HLS Live Playback with Widevine DRM." into jb-dev
* commit '382a5286b5c8ccfd6fe501ed5bd53cc8630b9de4':
  Fix HLS Live Playback with Widevine DRM.
2012-05-21 11:51:38 -07:00
Jean-Baptiste Queru
34b997be96 liboemcrypto only exists in vendor/ builds
Bug: 6521860
Change-Id: I62f7106cbc31015ee382f6901460dd3c46832813
2012-05-18 16:37:50 -07:00
Jeff Tinker
5658b8dc13 resolved conflicts for merge of 98c35aa4 to master
Change-Id: I32de004b575729f9b1852517ad5df71395e0ae69
2012-05-18 05:17:44 -07:00
Fred Gylys-Colwell
b8dbc29f7a am 87718450: Fix Show Rights for HLS content
* commit '87718450ac16621b17ec1cda9e3695b6d1f05b5c':
  Fix Show Rights for HLS content
2012-05-17 20:56:54 -07:00
James Dong
f7ce4a9b9a Merge "Add bandwidth to adaptive log" into jb-dev 2012-05-17 08:34:24 -07:00
Jeff Tinker
cf425f5bbc Fix file descriptor leak in WV library
In ICS we overloaded the curl fd close callout to enable
attributing bandwidth usage to the proper app instead of
the OS.  When you use the curl close callout, you are
expected to explicitly close the file, curl does not do
it for you.  This change adds an explicit fd close on the
curl callout.

Includes widevine library 4.5.0.7147

Change-Id: Ie22e6186f88b55a96e06f63e07f2746349aeae4e
related-to-bug: 6500752
2012-05-17 06:59:58 -07:00
Jeff Tinker
1c084694fe Add bandwidth to adaptive log
Change-Id: I79bf860db76bbdc6020d617f918cafb1f73d54de
related-to-bug: 6500173
2012-05-17 06:41:27 -07:00
Fred Gylys-Colwell
382a5286b5 Merge "Fix HLS Live Playback with Widevine DRM." into jb-dev 2012-05-16 20:29:08 -07:00
Fred Gylys-Colwell
ff793bcaf0 Fix HLS Live Playback with Widevine DRM.
In WVMExtractorImpl.cpp, a structure of type WVCallbacks was not initialized.
In version 4.5.0 of the Widevine library, this is just a struct (not a class)
so it does not have a constructor method.  This record was being set with
garbage default values and was causing problems setting up playback.  This may
have caused other stability issues after we reverted to 4.5.0.  In the future,
when we push forward to version 6.0 of the Widevine library, this change should
be removed.

In WVMediaSource.cpp, a flag was set to strip off the ATDS headers.  This was
redundent, and causing seg faults, for live stream.

related-to-bug: 6454710

Change-Id: I3edeb40c731021b2f31f639416188d4a1c002cc5
2012-05-16 20:12:28 -07:00
Jeff Tinker
98c35aa4ec Merge "Fix native fault in WVMMediaSource::DecryptCallback" into jb-dev 2012-05-16 19:49:58 -07:00
Jeff Tinker
e9c40a625c Fix native fault in WVMMediaSource::DecryptCallback
This change resolves a lifetime issue between the media extractor
and media sources.  The extractor was being passed as a context
object to a callout in the WV libs.  In some cases, a pointer to
the extractor would be delivered to the callout after the extractor
had been released.  This change assigns the responsibility of the
lifetime of the context object to the media source, to ensure that
a ref is always held on the context object during the lifetime of
the media source.

Change-Id: Ic7a57a1c8496a4798fe590ec356b8a19a4f69967
related-to-bug: 6502322
2012-05-16 19:08:25 -07:00
Fred Gylys-Colwell
87718450ac Fix Show Rights for HLS content
In WVMDrmPlugin.cpp, the supported suffixes was only .wvm.  I changed this to
include .m3u8, .vob, .smil, and the empty extension.  This allows the
WVMDrmPlugin to register itself as handling these files.  If the plugin is not
registered, the "show rights" feature will not query the plugin.

related-to-bug: 6507440

Change-Id: Ib655760e46cfa4125d21beb9ff77e38b444ddc5a
2012-05-16 17:38:21 -07:00
James Dong
c477bb957f am 79e250e9: If number of audio channels returned is 0, report an error
* commit '79e250e999b7002dc39fa8ee31630fabde6132a8':
  If number of audio channels returned is 0, report an error
2012-05-15 18:14:16 -07:00
James Dong
79e250e999 If number of audio channels returned is 0, report an error
related-to-bug: 6500580

Change-Id: I55cab0bde30841c31f671d03f99c59d337fea564
2012-05-15 17:54:59 -07:00
Jeff Tinker
d538414920 am 35064be9: (-s ours) Revert Widevine 6.0.0 -> 4.5.0 libraries
* commit '35064be9c6002d5714d76e5af0ab876bfa4df725':
  Revert Widevine 6.0.0 -> 4.5.0 libraries
2012-05-15 11:37:21 -07:00
Jeff Tinker
35064be9c6 Revert Widevine 6.0.0 -> 4.5.0 libraries
DO NOT MERGE

Source and library changes to roll back to 4.5.0, including
maintaining the DRM HAL support.

Includes Widevine libraries 4.5.0-7111

Change-Id: I420c6990748e95ad7516ecb2397ebf7707a157f4
related-to-bug: 6492434
2012-05-14 15:06:13 -07:00
Jeff Tinker
3db47ef723 am c7214ed1: [WVDRM] Fix buffering gets stuck late into movies
* commit 'c7214ed13e60abda1757cdf6ec23e42ef40662b4':
  [WVDRM] Fix buffering gets stuck late into movies
2012-05-09 01:55:09 -07:00
Jeff Tinker
c7214ed13e [WVDRM] Fix buffering gets stuck late into movies
Includes Widevine libraries version 6.0.0.7036

Change-Id: I84a6d6853b999571bb7cde812cd44b31436ae972
related-to-bug: 6449713
2012-05-07 18:35:22 -07:00
Jeff Tinker
31906d8b50 am 62e455e6: Merge "Fix WV CryptoPlugin exports invalid entrypoint" into jb-dev
* commit '62e455e6f2a04fddc09027a25837df5c72869cf5':
  Fix WV CryptoPlugin exports invalid entrypoint
2012-05-05 23:14:24 -07:00
Jeff Tinker
62e455e6f2 Merge "Fix WV CryptoPlugin exports invalid entrypoint" into jb-dev 2012-05-05 23:09:24 -07:00
Jeff Tinker
905db3c493 am 4bd9c256: Merge "Widevine library update 6.0.0-7012" into jb-dev
* commit '4bd9c25643d258fb0b33e85abe8352944e3481e7':
  Widevine library update 6.0.0-7012
2012-05-04 22:41:18 -07:00
Jeff Tinker
4bd9c25643 Merge "Widevine library update 6.0.0-7012" into jb-dev 2012-05-04 22:36:01 -07:00
Jeff Tinker
0b993f0ae4 Widevine library update 6.0.0-7012
This widevine library release includes fixes for the
following defects:

6422432 Unable to watch video due to stream buffering
5543268 DRM: Stuttering in playback of HD movie rental
6444359 [WVDRM] Excessively long startup on movie playback in JellyBean
6448147 [WVDRM] Short and Long Clocks are Identical
5571083 Lot of stuttering when on mobile network

Change-Id: I0ad4e8dbfc73df81e708591158d4c6189048f154
related-to-bug: 6422432
related-to-bug: 5543268
related-to-bug: 6444359
related-to-bug: 6448147
related-to-bug: 5571083
2012-05-04 22:06:03 -07:00
Jeff Tinker
d35a541636 Fix WV CryptoPlugin exports invalid entrypoint
Change-Id: I812fbdb4035953385166105506be865c1eee6812
related-to-bug: 6440292
2012-05-03 16:05:45 -07:00
Jean-Baptiste Queru
5b42863796 Merge "liboemcrypto only exists in vendor/ builds" 2012-05-03 06:28:00 -07:00
Jean-Baptiste Queru
85acf5d879 liboemcrypto only exists in vendor/ builds
Change-Id: I62f7106cbc31015ee382f6901460dd3c46832813
2012-05-02 18:03:03 -07:00
Jeff Tinker
1eaccb6669 Fix intermittent native fault in Widevine
Change-Id: I19e0b19eb9e53ca19dea10a46cf286fb091d7542
related-to-bug: 6432496
2012-05-02 13:10:29 -07:00
Jeff Tinker
e3c3350281 Fix Widevine error reporting in JellyBean
Includes Widevine library version 6.0.0-6969

Change-Id: I4a606cd730251bfa449f67e8214c3cb411bd3311
related-to-bug: 6429947
2012-05-02 12:22:02 -07:00
Jeff Tinker
92dda7e094 Fix android build for Widevine L3 devices (crespo, trygon)
This patch includes Widevine libraries Version 6.0.0-6859
for L3 devices.

Change-Id: Iddc667393ffe9bd06dc665a8ed3a52f35fb93516
related-to-bug: 6428219
2012-05-01 17:46:22 -07:00
Jeff Tinker
b48d5e3ab9 Merge "Part of fix for build break - missing WVCryptoPlugin.h in full_tuna build" into jb-dev 2012-05-01 17:07:31 -07:00
Jeff Tinker
cb5f8fa7eb Part of fix for build break - missing WVCryptoPlugin.h in full_tuna build
Change-Id: I7c4212bf2970eddc3c00d6da00af39f73f199964

related-to-bug: 6427841
2012-05-01 16:54:00 -07:00
Jeff Tinker
3397e72468 Fix offline license requests and error events
Corrected a regression in error event reporting and a
mismatch in asset paths during rights acquisition.

Also requires https://android-git.corp.google.com/g/#/c/185898/

Contains Widevine libraries version 6.0.0-6957

Change-Id: I4a7603a86feaf437673fc73f0cccb6065dbcce67
related-to-bug: 6414503
2012-05-01 15:46:14 -07:00
Jeff Tinker
ec2d703970 Fix ERROR_IO due to timeout on video stream and corrupt samples
This change applies to the wv extractor when used in conjunction
with new MediaCodec model.

Change-Id: I999990ff41d35641110a58472f1cdb8c4c7db02e
related-to-bug: 5986621
2012-05-01 13:10:42 -07:00
Jeff Tinker
d4241dddd3 Merge "Add CryptoPluginMode to WV extractor" into jb-dev 2012-04-27 08:27:31 -07:00
Andreas Huber
6473768dcb [WVDRM] Support new Java API crypto HAL
Implements WV crypto plugin core lib build

Change-Id: I4f3fb06a4a9cf7c9c663d3dcee9cfd2c2900ebc2
related-to-bug: 5986621
2012-04-26 18:11:12 -07:00
Jeff Tinker
a9f82e979f Add CryptoPluginMode to WV extractor
Allows the WV extractor to run in a mode that is compatible with
the DRM CryptoPlugin HAL API, where decryption is deferred
until the encrypted data is sent through the CryptoPlugin to
the codec.

This patch does:
 (1) Adds a flag mCryptoPluginMode that controls this behavior
     [Note: need framework support to enable/disable this]
 (2) Accumulates information in track metadata to delineate
     crypto unit boundaries for the CryptoPlugin

related-to-bug: 5986621

Change-Id: I3318d5cde38c7b02a7bdb56aca9aece852c9781c
2012-04-26 14:50:28 -07:00
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
791becda35 Merge "[WVDRM] Reorg of binary libs into proc-specific folders" 2012-04-11 14:43:27 -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
2ed002aded am 39c68596: am 176a13e8: Merge "Fix for HLS live streaming" into ics-mr1
* commit '39c685965741638e3561fe2423b8861984f2a7f1':
  Fix for HLS live streaming
2012-04-09 23:03:21 -07:00
Jeff Tinker
39c6859657 am 176a13e8: Merge "Fix for HLS live streaming" into ics-mr1
* commit '176a13e8ccdaad196c1f738e89bdcbfc0fc90c80':
  Fix for HLS live streaming
2012-04-09 23:00:57 -07:00
Jeff Tinker
176a13e8cc Merge "Fix for HLS live streaming" into ics-mr1 2012-04-09 22:56:36 -07:00