From 0401d62a3fc9f69718df93b1443170045d696f34 Mon Sep 17 00:00:00 2001
From: KongQun Yang <kqyang@google.com>
Date: Wed, 7 Feb 2018 13:24:42 -0800
Subject: [PATCH] Update documentation on Widevine DRM with more examples

Change-Id: I5230e8b138c4abda44c2fb54bc2f8b2d7d3e3b85
---
 docs/source/tutorials/raw_key.rst  |  1 +
 docs/source/tutorials/widevine.rst | 23 ++++++++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/docs/source/tutorials/raw_key.rst b/docs/source/tutorials/raw_key.rst
index aa5c6532d8..ce290a616e 100644
--- a/docs/source/tutorials/raw_key.rst
+++ b/docs/source/tutorials/raw_key.rst
@@ -98,6 +98,7 @@ Test vectors used in this tutorial
           --content-id 7465737420636f6e74656e74206964 --provider widevine_test
 
 .. include:: /options/drm_stream_descriptors.rst
+.. include:: /options/general_encryption_options.rst
 .. include:: /options/raw_key_encryption_options.rst
 
 pssh-box (Utility to generate PSSH boxes)
diff --git a/docs/source/tutorials/widevine.rst b/docs/source/tutorials/widevine.rst
index 74e1bb2685..96b04eb22f 100644
--- a/docs/source/tutorials/widevine.rst
+++ b/docs/source/tutorials/widevine.rst
@@ -37,7 +37,7 @@ Examples
 
 The examples below uses the H264 streams created in :doc:`encoding`.
 
-Here is an example with DASH. It can be applied to HLS in a similar way::
+* Here is an example with both DASH and HLS output::
 
     $ packager \
       in=h264_baseline_360p_600.mp4,stream=audio,output=audio.mp4 \
@@ -46,6 +46,25 @@ Here is an example with DASH. It can be applied to HLS in a similar way::
       in=h264_main_720p_3000.mp4,stream=video,output=h264_720p.mp4 \
       in=h264_high_1080p_6000.mp4,stream=video,output=h264_1080p.mp4 \
       --mpd_output h264.mpd \
+      --hls_master_playlist_output h264_master.m3u8 \
+      --enable_widevine_encryption \
+      --key_server_url https://license.uat.widevine.com/cenc/getcontentkey/widevine_test \
+      --content_id 7465737420636f6e74656e74206964 \
+      --signer widevine_test \
+      --aes_signing_key 1ae8ccd0e7985cc0b6203a55855a1034afc252980e970ca90e5202689f947ab9 \
+      --aes_signing_iv d58ce954203b7c9a9a9d467f59839249
+
+* Another example using 'cbcs' protection scheme::
+
+    $ packager \
+      in=h264_baseline_360p_600.mp4,stream=audio,output=audio.mp4 \
+      in=h264_baseline_360p_600.mp4,stream=video,output=h264_360p.mp4 \
+      in=h264_main_480p_1000.mp4,stream=video,output=h264_480p.mp4 \
+      in=h264_main_720p_3000.mp4,stream=video,output=h264_720p.mp4 \
+      in=h264_high_1080p_6000.mp4,stream=video,output=h264_1080p.mp4 \
+      --mpd_output h264.mpd \
+      --hls_master_playlist_output h264_master.m3u8 \
+      --protection_scheme cbcs \
       --enable_widevine_encryption \
       --key_server_url https://license.uat.widevine.com/cenc/getcontentkey/widevine_test \
       --content_id 7465737420636f6e74656e74206964 \
@@ -84,4 +103,6 @@ Here is the test crendential used in this tutorial.
     `Widevine <https://support.google.com/widevine/troubleshooter/6027072>`_ if
     you need something for production use.
 
+.. include:: /options/drm_stream_descriptors.rst
+.. include:: /options/general_encryption_options.rst
 .. include:: /options/widevine_encryption_options.rst