From d34a331ef545fdb22835998e1661c039248f8341 Mon Sep 17 00:00:00 2001
From: Rintaro Kuroiwa <rkuroiwa@google.com>
Date: Fri, 10 Jan 2014 12:04:09 -0800
Subject: [PATCH] Add fields in ContentProtection to match MPD spec

Because we need to have all meta info in the MediaInfo protobuf, we need
full 'ContentProtection' element.

Change-Id: I714ff5b8d7baa2ae0d169a59005210a63da315b5
---
 mpd/base/media_info.proto | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/mpd/base/media_info.proto b/mpd/base/media_info.proto
index 14dadec0f2..1ed90cd6ed 100644
--- a/mpd/base/media_info.proto
+++ b/mpd/base/media_info.proto
@@ -38,16 +38,28 @@ message MediaInfo {
     optional string language = 2;
   }
 
-  message ContentProtection {
-    optional bytes key_id = 1;
-    optional bytes pssh = 2;
+  message ContentProtectionXml {
+    message AttributeNameValuePair {
+      optional string name = 1;
+      optional string value = 2;
+    }
+
+    message Element {
+      repeated AttributeNameValuePair attributes = 1;
+      repeated Element subelements = 2;
+    }
+
+    optional string scheme_id_uri = 1;
+    optional string value = 2;
+    repeated AttributeNameValuePair attributes = 3;
+    repeated Element subelements = 4;
   }
 
   optional uint32 bandwidth = 1;
   repeated VideoInfo video_info = 2;
   repeated AudioInfo audio_info = 3;
   repeated TextInfo text_info = 4;
-  repeated ContentProtection content_protections = 5;
+  repeated ContentProtectionXml content_protections = 5;
 
   // This is the reference time scale if there are multiple VideoInfo and/or
   // AudioInfo.