From ff5945688d66dda7da01a3bdabfa4b3ec65a31cf Mon Sep 17 00:00:00 2001
From: KongQun Yang <kqyang@google.com>
Date: Fri, 20 Jul 2018 13:31:35 -0700
Subject: [PATCH] Generate DASH IF IOP compliant mpd with mpd_generator by
 default

I.e. enable --generate_dash_if_iop_compliant_mpd in mpd_generator by
default.

It was enabled in the main packager binary in v1.6.1.

Change-Id: Icfb19758c52c107e8ab17d3fb581923fa291cc0a
---
 .../output.mpd                                            | 8 ++++----
 packager/mpd/util/mpd_writer.cc                           | 7 +++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/output.mpd b/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/output.mpd
index 1e0a65977b..8c1f7f723b 100644
--- a/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/output.mpd
+++ b/packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/output.mpd
@@ -3,11 +3,11 @@
 <MPD xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="urn:mpeg:dash:schema:mpd:2011 DASH-MPD.xsd" xmlns:cenc="urn:mpeg:cenc:2013" profiles="urn:mpeg:dash:profile:isoff-on-demand:2011" minBufferTime="PT2S" type="static" mediaPresentationDuration="PT2.7360665798187256S">
   <Period id="0">
     <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" par="16:9">
+      <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="31323334-3536-3738-3930-313233343536"/>
+      <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
+        <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
+      </ContentProtection>
       <Representation id="0" bandwidth="977743" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
-        <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="31323334-3536-3738-3930-313233343536"/>
-        <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
-          <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
-        </ContentProtection>
         <BaseURL>bear-640x360-video.mp4</BaseURL>
         <SegmentBase indexRange="1091-1158" timescale="30000">
           <Initialization range="0-1090"/>
diff --git a/packager/mpd/util/mpd_writer.cc b/packager/mpd/util/mpd_writer.cc
index e842dc86d9..b2cef7a4f6 100644
--- a/packager/mpd/util/mpd_writer.cc
+++ b/packager/mpd/util/mpd_writer.cc
@@ -19,10 +19,9 @@
 #include "packager/mpd/base/simple_mpd_notifier.h"
 
 DEFINE_bool(generate_dash_if_iop_compliant_mpd,
-            false,
-            "Try to generate DASH-IF IOPv3 compliant MPD. This is best effort "
-            "and does not guarantee compliance. Off by default until players "
-            "support IOP MPDs.");
+            true,
+            "Try to generate DASH-IF IOP compliant MPD. This is best effort "
+            "and does not guarantee compliance.");
 
 namespace shaka {