From 5a38dc9c12431cf694376441f4192c75a25b6168 Mon Sep 17 00:00:00 2001
From: Rintaro Kuroiwa <rkuroiwa@google.com>
Date: Mon, 24 Aug 2015 12:35:00 -0700
Subject: [PATCH] Put Role element before Representation

- Follwing the MPD schema.

Change-Id: I2aadf43be224c7fb565592b1814e4bec74ac4800
---
 packager/mpd/base/mpd_builder.cc          | 10 +++++-----
 packager/mpd/base/mpd_builder_unittest.cc | 24 +++++++++++++++++++----
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/packager/mpd/base/mpd_builder.cc b/packager/mpd/base/mpd_builder.cc
index 8e8dca27c7..7bddb8aa48 100644
--- a/packager/mpd/base/mpd_builder.cc
+++ b/packager/mpd/base/mpd_builder.cc
@@ -697,6 +697,11 @@ xml::ScopedXmlPtr<xmlNode>::type AdaptationSet::GetXml() {
           content_protection_elements_)) {
     return xml::ScopedXmlPtr<xmlNode>::type();
   }
+  for (std::set<Role>::const_iterator role_it = roles_.begin();
+       role_it != roles_.end(); ++role_it) {
+    adaptation_set.AddRoleElement("urn:mpeg:dash:role:2011",
+                                  RoleToText(*role_it));
+  }
 
   std::list<Representation*>::iterator representation_it =
       representations_.begin();
@@ -751,11 +756,6 @@ xml::ScopedXmlPtr<xmlNode>::type AdaptationSet::GetXml() {
   if (group_ >= 0)
     adaptation_set.SetIntegerAttribute("group", group_);
 
-  for (std::set<Role>::const_iterator role_it = roles_.begin();
-       role_it != roles_.end(); ++role_it) {
-    adaptation_set.AddRoleElement("urn:mpeg:dash:role:2011",
-                                  RoleToText(*role_it));
-  }
   return adaptation_set.PassScopedPtr();
 }
 
diff --git a/packager/mpd/base/mpd_builder_unittest.cc b/packager/mpd/base/mpd_builder_unittest.cc
index 8497286fa4..e306ba2e05 100644
--- a/packager/mpd/base/mpd_builder_unittest.cc
+++ b/packager/mpd/base/mpd_builder_unittest.cc
@@ -607,15 +607,24 @@ TEST_F(CommonMpdBuilderTest, AdaptationAddRoleElementMain) {
       << "Actual: " << mpd_output;
 }
 
-// Add Role and ContentProtection elements. Verify that ContentProtection appear
-// before Role.
-TEST_F(CommonMpdBuilderTest, AddContentProtectionAndRole) {
+// Add Role, ContentProtection, and Representation elements. Verify that
+// ContentProtection -> Role -> Representation are in order.
+TEST_F(CommonMpdBuilderTest, CheckContentProtectionRoleRepresentationOrder) {
   MpdBuilder mpd_builder(MpdBuilder::kStatic, MpdOptions());
   AdaptationSet* adaptation_set = mpd_builder.AddAdaptationSet("");
   adaptation_set->AddRole(AdaptationSet::kRoleMain);
   ContentProtectionElement any_content_protection;
   any_content_protection.scheme_id_uri = "any_scheme";
   adaptation_set->AddContentProtectionElement(any_content_protection);
+  const char kAudioMediaInfo[] =
+      "audio_info {\n"
+      "  codec: 'mp4a.40.2'\n"
+      "  sampling_frequency: 44100\n"
+      "  time_scale: 1200\n"
+      "  num_channels: 2\n"
+      "}\n"
+      "container_type: 1\n";
+  adaptation_set->AddRepresentation(ConvertToMediaInfo(kAudioMediaInfo));
 
   xml::ScopedXmlPtr<xmlNode>::type adaptation_set_xml(adaptation_set->GetXml());
   const char kExpectedOutput[] =
@@ -628,9 +637,16 @@ TEST_F(CommonMpdBuilderTest, AddContentProtectionAndRole) {
      "    profiles=\"urn:mpeg:dash:profile:isoff-on-demand:2011\"\n"
      "    mediaPresentationDuration=\"PT0S\">\n"
      "  <Period>\n"
-     "    <AdaptationSet id=\"0\" contentType=\"\">\n"
+     "    <AdaptationSet id=\"0\" contentType=\"audio\">\n"
      "      <ContentProtection schemeIdUri=\"any_scheme\"/>\n"
      "      <Role schemeIdUri=\"urn:mpeg:dash:role:2011\" value=\"main\"/>\n"
+     "      <Representation id=\"0\" bandwidth=\"0\" codecs=\"mp4a.40.2\"\n"
+     "       mimeType=\"audio/mp4\" audioSamplingRate=\"44100\">\n"
+     "        <AudioChannelConfiguration\n"
+     "         schemeIdUri=\n"
+     "          \"urn:mpeg:dash:23003:3:audio_channel_configuration:2011\"\n"
+     "         value=\"2\"/>\n"
+     "      </Representation>\n"
      "    </AdaptationSet>\n"
      "  </Period>\n"
      "</MPD>";