From ac59b9ebc94018b216c657854ca5163c9d2e7f31 Mon Sep 17 00:00:00 2001 From: wjywbs Date: Thu, 30 Nov 2023 01:33:13 -0500 Subject: [PATCH] fix: Update to use official FairPlay UUID. (#1281) Reference: https://github.com/Dash-Industry-Forum/Identifiers/issues/119 and https://dashif.org/identifiers/content_protection/ --- packager/media/base/protection_system_ids.h | 8 +++----- packager/mpd/base/mpd_utils.cc | 7 +++---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/packager/media/base/protection_system_ids.h b/packager/media/base/protection_system_ids.h index 7948e7eceb..92dd923565 100644 --- a/packager/media/base/protection_system_ids.h +++ b/packager/media/base/protection_system_ids.h @@ -19,11 +19,9 @@ const uint8_t kCommonSystemId[] = {0x10, 0x77, 0xef, 0xec, 0xc0, 0xb2, 0x4d, 0x02, 0xac, 0xe3, 0x3c, 0x1e, 0x52, 0xe2, 0xfb, 0x4b}; -// Unofficial FairPlay system id extracted from -// https://forums.developer.apple.com/thread/6185. -const uint8_t kFairPlaySystemId[] = {0x29, 0x70, 0x1F, 0xE4, 0x3C, 0xC7, - 0x4A, 0x34, 0x8C, 0x5B, 0xAE, 0x90, - 0xC7, 0x43, 0x9A, 0x47}; +const uint8_t kFairPlaySystemId[] = {0x94, 0xCE, 0x86, 0xFB, 0x07, 0xFF, + 0x4F, 0x43, 0xAD, 0xB8, 0x93, 0xD2, + 0xFA, 0x96, 0x8C, 0xA2}; // Marlin Adaptive Streaming Specification – Simple Profile, V1.0. const uint8_t kMarlinSystemId[] = {0x5E, 0x62, 0x9A, 0xF5, 0x38, 0xDA, diff --git a/packager/mpd/base/mpd_utils.cc b/packager/mpd/base/mpd_utils.cc index 0f945f6538..d3acfdc266 100644 --- a/packager/mpd/base/mpd_utils.cc +++ b/packager/mpd/base/mpd_utils.cc @@ -333,12 +333,11 @@ namespace { // UUID for Marlin Adaptive Streaming Specification – Simple Profile from // https://dashif.org/identifiers/content_protection/. const char kMarlinUUID[] = "5e629af5-38da-4063-8977-97ffbd9902d4"; -// Unofficial FairPlay system id extracted from -// https://forums.developer.apple.com/thread/6185. -const char kFairPlayUUID[] = "29701fe4-3cc7-4a34-8c5b-ae90c7439a47"; +// String representation of media::kFairPlaySystemId. +const char kFairPlayUUID[] = "94ce86fb-07ff-4f43-adb8-93d2fa968ca2"; // String representation of media::kPlayReadySystemId. const char kPlayReadyUUID[] = "9a04f079-9840-4286-ab92-e65be0885f95"; -// It is RECOMMENDED to include the @value attribute with name and version "MSPR 2.0". +// It is RECOMMENDED to include the @value attribute with name and version "MSPR 2.0". // See https://docs.microsoft.com/en-us/playready/specifications/mpeg-dash-playready#221-general. const char kContentProtectionValueMSPR20[] = "MSPR 2.0";