Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit d58f05f

Browse files
committed
Change content protection UUID behavior and keep a legacy method
1 parent 1b5e7a8 commit d58f05f

File tree

5 files changed

+19
-18
lines changed

5 files changed

+19
-18
lines changed

‎examples/live.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ func main() {
1212

1313
audioAS, _ := m.AddNewAdaptationSetAudio(mpd.DASH_MIME_TYPE_AUDIO_MP4, true, 1, "und")
1414

15-
audioAS.AddNewContentProtectionRootFixedUUID("08e367028f33436ca5dd60ffe5571e60")
15+
audioAS.AddNewContentProtectionRoot("08e367028f33436ca5dd60ffe5571e60")
1616
audioAS.AddNewContentProtectionSchemeWidevineWithPSSH()
1717
audioAS.AddNewContentProtectionSchemePlayready("mgIAAAEAAQCQAjwAVwBSAE0ASABFAEEARABFAFIAIAB4AG0AbABuAHMAPQAiAGgAdAB0AHAAOgAvAC8AcwBjAGgAZQBtAGEAcwAuAG0AaQBjAHIAbwBzAG8AZgB0AC4AYwBvAG0ALwBEAFIATQAvADIAMAAwADcALwAwADMALwBQAGwAYQB5AFIAZQBhAGQAeQBIAGUAYQBkAGUAcgAiACAAdgBlAHIAcwBpAG8AbgA9ACIANAAuADAALgAwAC4AMAAiAD4APABEAEEAVABBAD4APABQAFIATwBUAEUAQwBUAEkATgBGAE8APgA8AEsARQBZAEwARQBOAD4AMQA2ADwALwBLAEUAWQBMAEUATgA+ADwAQQBMAEcASQBEAD4AQQBFAFMAQwBUAFIAPAAvAEEATABHAEkARAA+ADwALwBQAFIATwBUAEUAQwBUAEkATgBGAE8APgA8AEsASQBEAD4AQQBtAGYAagBDAFQATwBQAGIARQBPAGwAMwBXAEQALwA1AG0AYwBlAGMAQQA9AD0APAAvAEsASQBEAD4APABDAEgARQBDAEsAUwBVAE0APgBCAEcAdwAxAGEAWQBaADEAWQBYAE0APQA8AC8AQwBIAEUAQwBLAFMAVQBNAD4APABMAEEAXwBVAFIATAA+AGgAdAB0AHAAOgAvAC8AcABsAGEAeQByAGUAYQBkAHkALgBkAGkAcgBlAGMAdAB0AGEAcABzAC4AbgBlAHQALwBwAHIALwBzAHYAYwAvAHIAaQBnAGgAdABzAG0AYQBuAGEAZwBlAHIALgBhAHMAbQB4ADwALwBMAEEAXwBVAFIATAA+ADwALwBEAEEAVABBAD4APAAvAFcAUgBNAEgARQBBAEQARQBSAD4A")
1818

@@ -21,7 +21,7 @@ func main() {
2121

2222
videoAS, _ := m.AddNewAdaptationSetVideo(mpd.DASH_MIME_TYPE_VIDEO_MP4, "progressive", true, 1)
2323

24-
videoAS.AddNewContentProtectionRootFixedUUID("08e367028f33436ca5dd60ffe5571e60")
24+
videoAS.AddNewContentProtectionRoot("08e367028f33436ca5dd60ffe5571e60")
2525
videoAS.AddNewContentProtectionSchemeWidevineWithPSSH()
2626
videoAS.AddNewContentProtectionSchemePlayready("mgIAAAEAAQCQAjwAVwBSAE0ASABFAEEARABFAFIAIAB4AG0AbABuAHMAPQAiAGgAdAB0AHAAOgAvAC8AcwBjAGgAZQBtAGEAcwAuAG0AaQBjAHIAbwBzAG8AZgB0AC4AYwBvAG0ALwBEAFIATQAvADIAMAAwADcALwAwADMALwBQAGwAYQB5AFIAZQBhAGQAeQBIAGUAYQBkAGUAcgAiACAAdgBlAHIAcwBpAG8AbgA9ACIANAAuADAALgAwAC4AMAAiAD4APABEAEEAVABBAD4APABQAFIATwBUAEUAQwBUAEkATgBGAE8APgA8AEsARQBZAEwARQBOAD4AMQA2ADwALwBLAEUAWQBMAEUATgA+ADwAQQBMAEcASQBEAD4AQQBFAFMAQwBUAFIAPAAvAEEATABHAEkARAA+ADwALwBQAFIATwBUAEUAQwBUAEkATgBGAE8APgA8AEsASQBEAD4AQQBtAGYAagBDAFQATwBQAGIARQBPAGwAMwBXAEQALwA1AG0AYwBlAGMAQQA9AD0APAAvAEsASQBEAD4APABDAEgARQBDAEsAUwBVAE0APgBCAEcAdwAxAGEAWQBaADEAWQBYAE0APQA8AC8AQwBIAEUAQwBLAFMAVQBNAD4APABMAEEAXwBVAFIATAA+AGgAdAB0AHAAOgAvAC8AcABsAGEAeQByAGUAYQBkAHkALgBkAGkAcgBlAGMAdAB0AGEAcABzAC4AbgBlAHQALwBwAHIALwBzAHYAYwAvAHIAaQBnAGgAdABzAG0AYQBuAGEAZwBlAHIALgBhAHMAbQB4ADwALwBMAEEAXwBVAFIATAA+ADwALwBEAEEAVABBAD4APAAvAFcAUgBNAEgARQBBAEQARQBSAD4A")
2727

‎examples/ondemand.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ func main() {
1111

1212
audioAS, _ := m.AddNewAdaptationSetAudio(mpd.DASH_MIME_TYPE_AUDIO_MP4, true, 1, "und")
1313

14-
audioAS.AddNewContentProtectionRootFixedUUID("08e367028f33436ca5dd60ffe5571e60")
14+
audioAS.AddNewContentProtectionRoot("08e367028f33436ca5dd60ffe5571e60")
1515
audioAS.AddNewContentProtectionSchemeWidevineWithPSSH()
1616
audioAS.AddNewContentProtectionSchemePlayready("mgIAAAEAAQCQAjwAVwBSAE0ASABFAEEARABFAFIAIAB4AG0AbABuAHMAPQAiAGgAdAB0AHAAOgAvAC8AcwBjAGgAZQBtAGEAcwAuAG0AaQBjAHIAbwBzAG8AZgB0AC4AYwBvAG0ALwBEAFIATQAvADIAMAAwADcALwAwADMALwBQAGwAYQB5AFIAZQBhAGQAeQBIAGUAYQBkAGUAcgAiACAAdgBlAHIAcwBpAG8AbgA9ACIANAAuADAALgAwAC4AMAAiAD4APABEAEEAVABBAD4APABQAFIATwBUAEUAQwBUAEkATgBGAE8APgA8AEsARQBZAEwARQBOAD4AMQA2ADwALwBLAEUAWQBMAEUATgA+ADwAQQBMAEcASQBEAD4AQQBFAFMAQwBUAFIAPAAvAEEATABHAEkARAA+ADwALwBQAFIATwBUAEUAQwBUAEkATgBGAE8APgA8AEsASQBEAD4AQQBtAGYAagBDAFQATwBQAGIARQBPAGwAMwBXAEQALwA1AG0AYwBlAGMAQQA9AD0APAAvAEsASQBEAD4APABDAEgARQBDAEsAUwBVAE0APgBCAEcAdwAxAGEAWQBaADEAWQBYAE0APQA8AC8AQwBIAEUAQwBLAFMAVQBNAD4APABMAEEAXwBVAFIATAA+AGgAdAB0AHAAOgAvAC8AcABsAGEAeQByAGUAYQBkAHkALgBkAGkAcgBlAGMAdAB0AGEAcABzAC4AbgBlAHQALwBwAHIALwBzAHYAYwAvAHIAaQBnAGgAdABzAG0AYQBuAGEAZwBlAHIALgBhAHMAbQB4ADwALwBMAEEAXwBVAFIATAA+ADwALwBEAEEAVABBAD4APAAvAFcAUgBNAEgARQBBAEQARQBSAD4A")
1717

@@ -21,7 +21,7 @@ func main() {
2121

2222
videoAS, _ := m.AddNewAdaptationSetVideo(mpd.DASH_MIME_TYPE_VIDEO_MP4, "progressive", true, 1)
2323

24-
videoAS.AddNewContentProtectionRootFixedUUID("08e367028f33436ca5dd60ffe5571e60")
24+
videoAS.AddNewContentProtectionRoot("08e367028f33436ca5dd60ffe5571e60")
2525
videoAS.AddNewContentProtectionSchemeWidevineWithPSSH()
2626
videoAS.AddNewContentProtectionSchemePlayready("mgIAAAEAAQCQAjwAVwBSAE0ASABFAEEARABFAFIAIAB4AG0AbABuAHMAPQAiAGgAdAB0AHAAOgAvAC8AcwBjAGgAZQBtAGEAcwAuAG0AaQBjAHIAbwBzAG8AZgB0AC4AYwBvAG0ALwBEAFIATQAvADIAMAAwADcALwAwADMALwBQAGwAYQB5AFIAZQBhAGQAeQBIAGUAYQBkAGUAcgAiACAAdgBlAHIAcwBpAG8AbgA9ACIANAAuADAALgAwAC4AMAAiAD4APABEAEEAVABBAD4APABQAFIATwBUAEUAQwBUAEkATgBGAE8APgA8AEsARQBZAEwARQBOAD4AMQA2ADwALwBLAEUAWQBMAEUATgA+ADwAQQBMAEcASQBEAD4AQQBFAFMAQwBUAFIAPAAvAEEATABHAEkARAA+ADwALwBQAFIATwBUAEUAQwBUAEkATgBGAE8APgA8AEsASQBEAD4AQQBtAGYAagBDAFQATwBQAGIARQBPAGwAMwBXAEQALwA1AG0AYwBlAGMAQQA9AD0APAAvAEsASQBEAD4APABDAEgARQBDAEsAUwBVAE0APgBCAEcAdwAxAGEAWQBaADEAWQBYAE0APQA8AC8AQwBIAEUAQwBLAFMAVQBNAD4APABMAEEAXwBVAFIATAA+AGgAdAB0AHAAOgAvAC8AcABsAGEAeQByAGUAYQBkAHkALgBkAGkAcgBlAGMAdAB0AGEAcABzAC4AbgBlAHQALwBwAHIALwBzAHYAYwAvAHIAaQBnAGgAdABzAG0AYQBuAGEAZwBlAHIALgBhAHMAbQB4ADwALwBMAEEAXwBVAFIATAA+ADwALwBEAEEAVABBAD4APAAvAFcAUgBNAEgARQBBAEQARQBSAD4A")
2727

‎mpd/mpd.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -349,8 +349,9 @@ func (period *Period) addAdaptationSet(as *AdaptationSet) error {
349349
// Adds a ContentProtection tag at the root level of an AdaptationSet.
350350
// This ContentProtection tag does not include signaling for any particular DRM scheme.
351351
// defaultKIDHex - Default Key ID as a Hex String.
352-
// Deprecated: This function improperly formats UUIDs, use AddNewContentProtectionRootFixedUUID instead.
353-
func (as *AdaptationSet) AddNewContentProtectionRoot(defaultKIDHex string) (*CENCContentProtection, error) {
352+
//
353+
// NOTE: this is only here for Legacy purposes. This will create an invalid UUID.
354+
func (as *AdaptationSet) AddNewContentProtectionRootLegacyUUID(defaultKIDHex string) (*CENCContentProtection, error) {
354355
if len(defaultKIDHex) != 32 || defaultKIDHex == "" {
355356
return nil, ErrInvalidDefaultKID
356357
}
@@ -375,7 +376,7 @@ func (as *AdaptationSet) AddNewContentProtectionRoot(defaultKIDHex string) (*CEN
375376
// Adds a ContentProtection tag at the root level of an AdaptationSet.
376377
// This ContentProtection tag does not include signaling for any particular DRM scheme.
377378
// defaultKIDHex - Default Key ID as a Hex String.
378-
func (as *AdaptationSet) AddNewContentProtectionRootFixedUUID(defaultKIDHex string) (*CENCContentProtection, error) {
379+
func (as *AdaptationSet) AddNewContentProtectionRoot(defaultKIDHex string) (*CENCContentProtection, error) {
379380
if len(defaultKIDHex) != 32 || defaultKIDHex == "" {
380381
return nil, ErrInvalidDefaultKID
381382
}

‎mpd/mpd_read_write_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ func LiveProfile() *MPD {
148148

149149
audioAS, _ := m.AddNewAdaptationSetAudio("7357", DASH_MIME_TYPE_AUDIO_MP4, VALID_SEGMENT_ALIGNMENT, VALID_START_WITH_SAP, VALID_LANG)
150150

151-
audioAS.AddNewContentProtectionRootFixedUUID("08e367028f33436ca5dd60ffe5571e60")
151+
audioAS.AddNewContentProtectionRoot("08e367028f33436ca5dd60ffe5571e60")
152152
audioAS.AddNewContentProtectionSchemeWidevineWithPSSH(getValidWVHeaderBytes())
153153
audioAS.AddNewContentProtectionSchemePlayreadyWithPSSH(VALID_PLAYREADY_PRO)
154154

@@ -159,7 +159,7 @@ func LiveProfile() *MPD {
159159

160160
videoAS, _ := m.AddNewAdaptationSetVideo("7357", DASH_MIME_TYPE_VIDEO_MP4, VALID_SCAN_TYPE, VALID_SEGMENT_ALIGNMENT, VALID_START_WITH_SAP)
161161

162-
videoAS.AddNewContentProtectionRootFixedUUID("08e367028f33436ca5dd60ffe5571e60")
162+
videoAS.AddNewContentProtectionRoot("08e367028f33436ca5dd60ffe5571e60")
163163
videoAS.AddNewContentProtectionSchemeWidevineWithPSSH(getValidWVHeaderBytes())
164164
videoAS.AddNewContentProtectionSchemePlayreadyWithPSSH(VALID_PLAYREADY_PRO)
165165

@@ -203,7 +203,7 @@ func HbbTVProfile() *MPD {
203203

204204
audioAS, _ := m.AddNewAdaptationSetAudio("7357", DASH_MIME_TYPE_AUDIO_MP4, VALID_SEGMENT_ALIGNMENT, VALID_START_WITH_SAP, VALID_LANG)
205205

206-
audioAS.AddNewContentProtectionRootFixedUUID("08e367028f33436ca5dd60ffe5571e60")
206+
audioAS.AddNewContentProtectionRoot("08e367028f33436ca5dd60ffe5571e60")
207207
audioAS.AddNewContentProtectionSchemeWidevineWithPSSH(getValidWVHeaderBytes())
208208
audioAS.AddNewContentProtectionSchemePlayreadyWithPSSH(VALID_PLAYREADY_PRO)
209209

@@ -215,7 +215,7 @@ func HbbTVProfile() *MPD {
215215

216216
videoAS, _ := m.AddNewAdaptationSetVideo("7357", DASH_MIME_TYPE_VIDEO_MP4, VALID_SCAN_TYPE, VALID_SEGMENT_ALIGNMENT, VALID_START_WITH_SAP)
217217

218-
videoAS.AddNewContentProtectionRootFixedUUID("08e367028f33436ca5dd60ffe5571e60")
218+
videoAS.AddNewContentProtectionRoot("08e367028f33436ca5dd60ffe5571e60")
219219
videoAS.AddNewContentProtectionSchemeWidevineWithPSSH(getValidWVHeaderBytes())
220220
videoAS.AddNewContentProtectionSchemePlayreadyWithPSSH(VALID_PLAYREADY_PRO)
221221

@@ -259,7 +259,7 @@ func OnDemandProfile() *MPD {
259259

260260
audioAS, _ := m.AddNewAdaptationSetAudio("7357", DASH_MIME_TYPE_AUDIO_MP4, VALID_SEGMENT_ALIGNMENT, VALID_START_WITH_SAP, "und")
261261

262-
audioAS.AddNewContentProtectionRootFixedUUID("08e367028f33436ca5dd60ffe5571e60")
262+
audioAS.AddNewContentProtectionRoot("08e367028f33436ca5dd60ffe5571e60")
263263
audioAS.AddNewContentProtectionSchemeWidevineWithPSSH(getValidWVHeaderBytes())
264264
audioAS.AddNewContentProtectionSchemePlayreadyWithPSSH(VALID_PLAYREADY_PRO)
265265

@@ -269,7 +269,7 @@ func OnDemandProfile() *MPD {
269269

270270
videoAS, _ := m.AddNewAdaptationSetVideo("7357", DASH_MIME_TYPE_VIDEO_MP4, VALID_SCAN_TYPE, VALID_SEGMENT_ALIGNMENT, VALID_START_WITH_SAP)
271271

272-
videoAS.AddNewContentProtectionRootFixedUUID("08e367028f33436ca5dd60ffe5571e60")
272+
videoAS.AddNewContentProtectionRoot("08e367028f33436ca5dd60ffe5571e60")
273273
videoAS.AddNewContentProtectionSchemeWidevineWithPSSH(getValidWVHeaderBytes())
274274
videoAS.AddNewContentProtectionSchemePlayreadyWithPSSH(VALID_PLAYREADY_PRO)
275275

‎mpd/mpd_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -245,11 +245,11 @@ func TestAddAdaptationSetErrorNil(t *testing.T) {
245245
require.Equal(t, ErrAdaptationSetNil, err)
246246
}
247247

248-
func TestAddNewContentProtectionRoot_Deprecated(t *testing.T) {
248+
func TestAddNewContentProtectionRoot_Legacy(t *testing.T) {
249249
m := NewMPD(DASH_PROFILE_LIVE, VALID_MEDIA_PRESENTATION_DURATION, VALID_MIN_BUFFER_TIME)
250250
s, _ := m.AddNewAdaptationSetVideo("7357", DASH_MIME_TYPE_VIDEO_MP4, VALID_SCAN_TYPE, VALID_SEGMENT_ALIGNMENT, VALID_START_WITH_SAP)
251251

252-
cp, err := s.AddNewContentProtectionRoot(VALID_DEFAULT_KID_HEX)
252+
cp, err := s.AddNewContentProtectionRootLegacyUUID(VALID_DEFAULT_KID_HEX)
253253
require.Nil(t, err)
254254
require.NotNil(t, cp)
255255
expectedCP := &CENCContentProtection{
@@ -266,7 +266,7 @@ func TestAddNewContentProtectionRoot(t *testing.T) {
266266
m := NewMPD(DASH_PROFILE_LIVE, VALID_MEDIA_PRESENTATION_DURATION, VALID_MIN_BUFFER_TIME)
267267
s, _ := m.AddNewAdaptationSetVideo("7357", DASH_MIME_TYPE_VIDEO_MP4, VALID_SCAN_TYPE, VALID_SEGMENT_ALIGNMENT, VALID_START_WITH_SAP)
268268

269-
cp, err := s.AddNewContentProtectionRootFixedUUID(VALID_DEFAULT_KID_HEX)
269+
cp, err := s.AddNewContentProtectionRoot(VALID_DEFAULT_KID_HEX)
270270
require.Nil(t, err)
271271
require.NotNil(t, cp)
272272
expectedCP := &CENCContentProtection{
@@ -306,7 +306,7 @@ func TestAddNewContentProtectionRootErrorInvalidLengthDefaultKID(t *testing.T) {
306306
m := NewMPD(DASH_PROFILE_LIVE, VALID_MEDIA_PRESENTATION_DURATION, VALID_MIN_BUFFER_TIME)
307307
s, _ := m.AddNewAdaptationSetVideo("7357", DASH_MIME_TYPE_VIDEO_MP4, VALID_SCAN_TYPE, VALID_SEGMENT_ALIGNMENT, VALID_START_WITH_SAP)
308308

309-
cp, err := s.AddNewContentProtectionRootFixedUUID("invalidkid")
309+
cp, err := s.AddNewContentProtectionRoot("invalidkid")
310310
require.NotNil(t, err)
311311
require.Equal(t, ErrInvalidDefaultKID, err)
312312
require.Nil(t, cp)
@@ -316,7 +316,7 @@ func TestAddNewContentProtectionRootErrorEmptyDefaultKID(t *testing.T) {
316316
m := NewMPD(DASH_PROFILE_LIVE, VALID_MEDIA_PRESENTATION_DURATION, VALID_MIN_BUFFER_TIME)
317317
s, _ := m.AddNewAdaptationSetVideo("7357", DASH_MIME_TYPE_VIDEO_MP4, VALID_SCAN_TYPE, VALID_SEGMENT_ALIGNMENT, VALID_START_WITH_SAP)
318318

319-
cp, err := s.AddNewContentProtectionRootFixedUUID("")
319+
cp, err := s.AddNewContentProtectionRoot("")
320320
require.NotNil(t, err)
321321
require.Equal(t, ErrInvalidDefaultKID, err)
322322
require.Nil(t, cp)

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /