Commit Graph

25 Commits

Author SHA1 Message Date
Lajos Molnar
d5f85fd131 Really fix stop() in samplePlayer when using MediaCodec mode
Make getBufferPercentage() and getPosition() work when the
media is reset.

Change-Id: I7d696fd9b5c62b42aa0d29348e73f1f5755eb075
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 9516405
2013-06-28 08:07:02 -07:00
Lajos Molnar
39fa902e87 Fix stop() in samplePlayer when using MediaCodec mode
When stopping media, getBufferPercentage() and getPosition() may
still be called by MediaController, unless we disable it.

Change-Id: I947fbfb2de724bdcb3121ca9fb204c8bea2a84b2
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 9516405
2013-06-27 14:00:16 -07:00
Marco Nelissen
d758945249 Fix build
Change-Id: Ife1a8494d5a02985f8bd7fdd28130486aad34d3b
2013-05-10 08:28:15 -07:00
Fred Gylys-Colwell
b8ff509887 Add More Logging to Sample Player
Because the Widevine Sample Play is frequently used to report bugs, it is
helpful to have users' actions logged.  This change prints to the android log
whenever the user changes settings, clicks play, full screen, acquire rights,
etc.

This code does not change the build and is not delivered to customers.  It is
delivered to vendors.

Change-Id: I62c34c2f1683af881a3c326a48f039b463ca3e8e
2012-12-21 16:35:03 -08:00
Gene Morgan
4e3efb415b Keep local file open for DrmManagerService::acquireDrmInfo().
Bug: 7208979
Change-Id: I1b7798929f55b956e43bb9ed1a0f41dec9342be4
2012-09-21 17:50:10 -07:00
Gene Morgan
8cd5d09119 Allow DRM client to pass the FD of an open file to the DRM server.
This allows a DRM client to open a locally-cached file on behalf of the
DRM server so the DRM server no longer requires the sdcard_r permission
to access the file's metadata.  Specifically, this adds an optional
attribute FileDescriptorKey to the DrmInfoRequest.

This change is dependent on this Widevine CL:
https://widevine-internal-review.googlesource.com/#/c/1330/

Relevant bug reports:
bug: 6426185

Change-Id: Ia7bcb2455c7a55fa4c7c7061de4d672957c7ac0a
2012-09-20 11:42:09 -07:00
Fred Gylys-Colwell
da4abe2680 Add InfoListener to Widevine Test Application
In order to test the MediaPlayer info events, an OnInfoListener was added to
the VideoPlayerView class.  It is set to listen to events coming from the
videoView.  This allows testers to verify that events are occuring.

Note: This change was made by Alexander Oliphant who does not have write
permission to commit to the Android tree.

Change-Id: Ia2faa927b4fe2850e15644bd332e50601a424c4a
2012-09-13 16:40:34 -07:00
Edwin Wong
196fe01488 Add GetVersion API to query the client plugin version.
Includes Widevine libraries 4.5.0.8097

Change-Id: I7590d5a60f300f6686887f62ae127b86f76e6f94
related-to-bug: 6000505
2012-08-10 18:23:54 -07:00
Edwin Wong
c4d88be1fb Fixed: screen time out during streaming in mediacodec mode.
Also, print log to indicate if the device is provisioned or not.

Change-Id: I674e2fe4531cc79b4bf307939c4b08ba19207244
related-to-bug: 6821614
2012-08-05 16:31:25 -07:00
Edwin Wong
e9f5431e78 Revert Widevine 6.0.0 -> 4.5.0 libraries
Includes Widevine libraries Version 4.5.0.7809

Also fixed samplePlayer's MediaCodec mode not running and
WVDrmInfoRequestStatusKey returning incorrect value.

Change-Id: Ibcc6d313790670a908ada93be80d6bf55a67b4ed
related-to-bug: 6929628
related-to-bug: 6833718
related-to-bug: 6889322
2012-08-03 13:33:58 -07:00
Jeff Tinker
13fd014615 am 2e0fb6cf: Merge "Added a MediaCoded based video view to the widevine sample player app." into jb-dev
* commit '2e0fb6cfe50b40f9b1d065ed4a1a5976d4cfd276':
  Added a MediaCoded based video view to the widevine sample player app.
2012-06-14 10:34:23 -07:00
Andreas Huber
d5547b3aaa Added a MediaCoded based video view to the widevine sample player app.
Change-Id: I514fee7312c485aa5f7a8c6c0a42ce62e71d2578
2012-06-09 12:52:43 -07:00
Jeff Tinker
43b8f70836 Widevine library update 4.5.0.7251 DO NOT MERGE
Resolves timeout issues on CDN redirect delays.
Includes the client side changes to support SD-only
playback on unlocked/rooted L2/L3 devices.

Change-Id: Id962e08b67e4d29bd22d254a4967c71891b504c9
related-to-bug: 6512768
related-to-bug: 6234558
2012-05-25 18:05:15 -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
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
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
Edwin Wong
662dced941 Moved onPause from WidevineSamplePlayer class to VideoPlayerView class.
BUG: 5561197

Change-Id: I0486c04094e3535106726ef9902814315dd07522
2011-11-03 09:27:53 -07:00
Jeffrey Tinker
7bad756b1a Widevine demo app update
Fix the minSdkVersion and stop playback when switching apps from onPause

Change-Id: I7d465d34f6a60a2c620cf50b9c1e42bc1456aa82
2011-10-18 16:49:43 -07:00
Yohann Connell
baebdacb0a UI changes for smaller devices and GTV. Fix for defect 4616102.
Change-Id: Ida32671121d35de49894f91f6145a568ba9cfb77
2011-08-02 16:21:36 -07:00
Yohann Connell
b87bd55555 UI changes for smaller devices and GTV. Fix for defect 4616102.
Change-Id: I2fc37199eedfd779494cf9e5c87f53fb1081c1eb
2011-07-26 11:45:39 -07:00
Edwin Wong
c3c294866b Uploaded for Robin Connell. Fixed 4466580 Need widevine sample demo player support for adaptive streaming. Thumbnails now show and content plays for adaptive and oem content pages.
Change-Id: Id03c7cc01be78d7c5d3d7ca66d2a2773273af6fe
2011-06-01 16:33:10 -07:00
Jeffrey Tinker
66d9ff5fb5 Fix for 4198445 HC - Support for Widevine Live Streaming (adaptive)
Change-Id: Id3a8a997fb1186c6af6e94f2fc2d4788238a0452
2011-05-26 11:25:05 -07:00
Edwin Wong
a7d2e068b6 Fixed 4438229 Widevine extractor tries playing back non-WV .TS file over HTTP on HC MR1
Change-Id: If9b3e0469040b8c85b32a3196e995a38861a585b
2011-05-25 10:16:55 -07:00
Jeffrey Tinker
07b60098b3 Fix for b/4198446 HC - Support for Widevine Adaptive VOD
Fix for b/4075745 libWVStreamControlAPI crashes when dlopened() and dlclosed()
Added error logging to diagnose problems such as b/4430078 Playback of newly rented
    movie fails with "license expired"

Includes Widevine library build Version 4.5.0.3682

Change-Id: I5708bb3fb92f05a3dd1768620157a795ccebd57a
2011-05-23 18:05:39 -07:00
Gloria Wang
fc6f6134e9 Widevine sample player
For bug 4245169

Change-Id: Ie110d5603f19cd54878d2c4506e8ffad11207f10
2011-04-07 09:35:25 -07:00