From c0d68083acac47a988e85d37a9aab8963e1c050f Mon Sep 17 00:00:00 2001
From: KongQun Yang <kqyang@google.com>
Date: Thu, 17 Jun 2021 17:44:00 -0700
Subject: [PATCH] Fix playready_extra_header_data

It should be enclosed in the <DATA> element.

https://docs.microsoft.com/en-us/playready/specifications/playready-header-specification

Fixes #961.
Fixes b/173146719.

Change-Id: I7d235a44afda4a0a301e7231dc8a4e87cce124be
---
 packager/media/base/playready_pssh_generator.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packager/media/base/playready_pssh_generator.cc b/packager/media/base/playready_pssh_generator.cc
index d6faee3f6f..6158418e73 100644
--- a/packager/media/base/playready_pssh_generator.cc
+++ b/packager/media/base/playready_pssh_generator.cc
@@ -32,7 +32,7 @@ const std::string kPlayHeaderObject_4_0 =
     "version=\"4.0.0.0\"><DATA>"
     "<PROTECTINFO><KEYLEN>16</KEYLEN><ALGID>AESCTR</ALGID></PROTECTINFO>"
     "<KID>$0</KID><CHECKSUM>$1</CHECKSUM>"
-    "</DATA>$2</WRMHEADER>";
+    "$2</DATA></WRMHEADER>";
 
 // For PlayReady clients 4.0+ that support CBC keys.
 const std::string kPlayHeaderObject_4_3 =
@@ -40,7 +40,7 @@ const std::string kPlayHeaderObject_4_3 =
     "xmlns=\"http://schemas.microsoft.com/DRM/2007/03/PlayReadyHeader\" "
     "version=\"4.3.0.0\"><DATA><PROTECTINFO><KIDS>"
     "<KID ALGID=\"AESCBC\" VALUE=\"$0\"></KID>"
-    "</KIDS></PROTECTINFO></DATA>$1</WRMHEADER>";
+    "</KIDS></PROTECTINFO>$1</DATA></WRMHEADER>";
 
 // Converts the key_id's endianness.
 std::vector<uint8_t> ConvertGuidEndianness(const std::vector<uint8_t>& input) {