From f73f4bb7737e097383b7acd4f79c0441db040912 Mon Sep 17 00:00:00 2001
From: Rintaro Kuroiwa <rkuroiwa@google.com>
Date: Tue, 25 Feb 2014 16:24:51 -0800
Subject: [PATCH] Use default ContentProtection element specified by DASH for
 MP4

BUG: 13175714
TEST: media_event_unittest passes

Change-Id: I96a4ecaaf2a7152df21c1680949db74b6a47199f
---
 app/muxer_flags.h                             |  9 ++--
 .../vod_media_info_dump_muxer_listener.cc     | 53 +++++++++++++++----
 ...media_info_dump_muxer_listener_unittest.cc |  4 ++
 3 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/app/muxer_flags.h b/app/muxer_flags.h
index 12a055216a..97aa7ffaae 100644
--- a/app/muxer_flags.h
+++ b/app/muxer_flags.h
@@ -76,11 +76,12 @@ DEFINE_bool(output_media_info,
             "will be the name specified by output flag, suffixed with "
             "'.media_info'.");
 DEFINE_string(scheme_id_uri,
-              "",
+              "urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed",
               "This flag only applies if output_media_info is true. This value "
               "will be set in MediaInfo if the stream is encrypted. "
-              "Use scheme_id_uri when you generate an MPD. If the "
-              "stream is encrypted, MPD requires a <ContentProtection> "
-              "element which requires the schemeIdUri attribute.");
+              "If the stream is encrypted, MPD requires a <ContentProtection> "
+              "element which requires the schemeIdUri attribute. "
+              "Default value is Widevine PSSH system ID, and it is valid only "
+              "for ISO BMFF.");
 
 #endif  // APP_MUXER_FLAGS_H_
diff --git a/media/event/vod_media_info_dump_muxer_listener.cc b/media/event/vod_media_info_dump_muxer_listener.cc
index f08d0b8020..d8f18c4f02 100644
--- a/media/event/vod_media_info_dump_muxer_listener.cc
+++ b/media/event/vod_media_info_dump_muxer_listener.cc
@@ -20,6 +20,10 @@ namespace event {
 using dash_packager::MediaInfo;
 
 namespace {
+
+const char kEncryptedMp4Uri[] = "urn:mpeg:dash:mp4protection:2011";
+const char kEncryptedMp4Value[] = "cenc";
+
 bool IsAnyStreamEncrypted(const std::vector<StreamInfo*>& stream_infos) {
   typedef std::vector<StreamInfo*>::const_iterator Iterator;
   for (Iterator it = stream_infos.begin(); it != stream_infos.end(); ++it) {
@@ -29,6 +33,44 @@ bool IsAnyStreamEncrypted(const std::vector<StreamInfo*>& stream_infos) {
 
   return false;
 }
+
+// |user_scheme_id_uri| is the user specified schemeIdUri for ContentProtection.
+// This adds a default ContentProtection element if the container is MP4.
+// Returns true if a ContentProtectionXml is added to |media_info|, otherwise
+// false.
+bool AddContentProtectionElements(MuxerListener::ContainerType container_type,
+                                  const std::string& user_scheme_id_uri,
+                                  MediaInfo* media_info) {
+  DCHECK(media_info);
+
+  // DASH MPD spec specifies a default ContentProtection element for ISO BMFF
+  // (MP4) files.
+  const bool is_mp4_container = container_type == MuxerListener::kContainerMp4;
+  if (is_mp4_container) {
+    MediaInfo::ContentProtectionXml* mp4_protection =
+        media_info->add_content_protections();
+    mp4_protection->set_scheme_id_uri(kEncryptedMp4Uri);
+    mp4_protection->set_value(kEncryptedMp4Value);
+  }
+
+  if (!user_scheme_id_uri.empty()) {
+    MediaInfo::ContentProtectionXml* content_protection =
+        media_info->add_content_protections();
+    content_protection->set_scheme_id_uri(user_scheme_id_uri);
+  } else if (is_mp4_container) {
+    LOG(WARNING) << "schemeIdUri is not specified. Added default "
+                    "ContentProtection only.";
+  }
+
+  if (media_info->content_protections_size() == 0) {
+    LOG(ERROR) << "The stream is encrypted but no schemeIdUri specified for "
+                  "ContentProtection.";
+    return false;
+  }
+
+  return true;
+}
+
 }  // namespace
 
 VodMediaInfoDumpMuxerListener::VodMediaInfoDumpMuxerListener(File* output_file)
@@ -83,15 +125,8 @@ void VodMediaInfoDumpMuxerListener::OnMediaEnd(
   }
 
   if (is_encrypted) {
-    if (scheme_id_uri_.empty()) {
-      LOG(ERROR) << "The stream is encrypted but no schemeIdUri specified for "
-                    "ContentProtection.";
-      return;
-    }
-
-    MediaInfo::ContentProtectionXml* content_protection =
-        media_info.add_content_protections();
-    content_protection->set_scheme_id_uri(scheme_id_uri_);
+    // TODO(rkuroiwa): Use the return value to set error status.
+    AddContentProtectionElements(container_type_, scheme_id_uri_, &media_info);
   }
 
   SerializeMediaInfoToFile(media_info);
diff --git a/media/event/vod_media_info_dump_muxer_listener_unittest.cc b/media/event/vod_media_info_dump_muxer_listener_unittest.cc
index 15327441fe..88c7dc4425 100644
--- a/media/event/vod_media_info_dump_muxer_listener_unittest.cc
+++ b/media/event/vod_media_info_dump_muxer_listener_unittest.cc
@@ -269,6 +269,10 @@ TEST_F(VodMediaInfoDumpMuxerListenerTest, EncryptedStream_Normal) {
       "  time_scale: 10\n"
       "}\n"
       "content_protections {\n"
+      "  scheme_id_uri: \"urn:mpeg:dash:mp4protection:2011\"\n"
+      "  value: \"cenc\"\n"
+      "}\n"
+      "content_protections {\n"
       "  scheme_id_uri: \"http://foo.com/bar\"\n"
       "}\n"
       "init_range {\n"