Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- VVC test content (testpic_2s_vvc)
- New `--writemissingrepdata` CLI option to generate RepData files only for representations that lack them (Issue #271)
- Version field in RepData structure to support future format evolution
- Support for DASH-IF Certurl ContentProtection element

### Fixed

Expand Down
27 changes: 27 additions & 0 deletions cmd/livesim2/app/handler_livesim_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"strings"
"testing"

"github.com/Dash-Industry-Forum/livesim2/pkg/drm"
"github.com/Dash-Industry-Forum/livesim2/pkg/logging"
"github.com/stretchr/testify/require"
)
Expand All @@ -24,6 +25,12 @@ func TestParamToMPD(t *testing.T) {
}
err := logging.InitSlog(cfg.LogLevel, cfg.LogFormat)
require.NoError(t, err)

// Load DRM configuration for tests
drmCfg, err := drm.ReadDrmConfig("testdata/drm.json")
require.NoError(t, err)
cfg.DrmCfg = drmCfg

server, err := SetupServer(context.Background(), &cfg)
require.NoError(t, err)
ts := httptest.NewServer(server.Router)
Expand Down Expand Up @@ -75,6 +82,26 @@ func TestParamToMPD(t *testing.T) {
`<dashif:Laurl xmlns:dashif="https://dashif.org/CPS" licenseType="EME-1.0">`,
},
},
{
desc: "CPIX-based DRM with Widevine, PlayReady, and FairPlay",
mpd: "testpic_2s/Manifest.mpd",
params: "drm_EZDRM-1-key-cbcs-test/",
wantedStatusCode: http.StatusOK,
//nolint:lll
wantedInMPD: []string{
// Widevine
`<ContentProtection schemeIdUri="urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed"`,
`<dashif:Laurl xmlns:dashif="https://dashif.org/CPS" licenseType="EME-1.0">https://widevine-dash.ezdrm.com/proxy?pX=FFFFFF</dashif:Laurl>`,
// PlayReady with both LaURL and CertificateURL
`<ContentProtection schemeIdUri="urn:uuid:9a04f079-9840-4286-ab92-e65be0885f95"`,
`<dashif:Laurl xmlns:dashif="https://dashif.org/CPS" licenseType="EME-1.0">https://playready.ezdrm.com/cency/preauth.asp?pX=FFFFFF</dashif:Laurl>`,
`<dashif:Certurl xmlns:dashif="https://dashif.org/CPS">https://na-wv.ezdrm.com/demo/video/eleisure.cer</dashif:Certurl>`,
// FairPlay with both LaURL and CertificateURL
`<ContentProtection schemeIdUri="urn:uuid:94ce86fb-07ff-4f43-adb8-93d2fa968ca2"`,
`<dashif:Laurl xmlns:dashif="https://dashif.org/CPS" licenseType="EME-1.0">https://us-dev.ezdrm.com/fps</dashif:Laurl>`,
`<dashif:Certurl xmlns:dashif="https://dashif.org/CPS">https://na-fps.ezdrm.com/demo/video/eleisure.cer</dashif:Certurl>`,
},
},
{
desc: "MPD with Patch",
mpd: "testpic_6s/Manifest.mpd",
Expand Down
5 changes: 5 additions & 0 deletions cmd/livesim2/app/livempd.go
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,11 @@ func LiveMPD(a *asset, mpdName string, cfg *ResponseConfig, drmCfg *drm.DrmConfi
Value: drmSys.SmoothStreamingProtectionHeaderData,
}
}
certURL := d.URLs[drmSystem].CertificateURL
if certURL != "" {
cu := m.CerturlType{Value: m.AnyURI(certURL)}
cp.Certurls = []m.CerturlType{cu}
}
as.ContentProtections = append(as.ContentProtections, cp)
}
}
Expand Down
35 changes: 35 additions & 0 deletions cmd/livesim2/app/testdata/cpix_1key_cbcs_test.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<cpix:CPIX xmlns:cpix="urn:dashif:org:cpix" xmlns:pskc="urn:ietf:params:xml:ns:keyprov:pskc" contentId="livesim2-0001" version="2.3">
<cpix:ContentKeyList>
<cpix:ContentKey explicitIV="ASNFZ4mrze8BI0VniavN7w==" kid="01234567-89ab-cdef-0123-456789abcdef" commonEncryptionScheme="cbcs">
<cpix:Data>
<pskc:Secret>
<pskc:PlainValue>MTIzNDU2Nzg5YWJjZGVmCg==</pskc:PlainValue>
</pskc:Secret>
</cpix:Data>
</cpix:ContentKey>
</cpix:ContentKeyList>
<cpix:DRMSystemList>
<cpix:DRMSystem kid="01234567-89ab-cdef-0123-456789abcdef" systemId="edef8ba9-79d6-4ace-a3c8-27dcd51d21ed">
<cpix:PSSH>AAAAP3Bzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAAB8SEAEjRWeJq83vASNFZ4mrze8aBWV6ZHJtSPPGiZsG</cpix:PSSH>
<cpix:PSSHData>EhABI0VniavN7wEjRWeJq83vGgVlemRybUjj3JWbBg==</cpix:PSSHData>
<cpix:ContentProtectionData>PHBzc2ggeG1sbnM9InVybjptcGVnOmNlbmM6MjAxMyI+QUFBQVAzQnpjMmdBQUFBQTdlK0xxWG5XU3M2anlDZmMxUjBoN1FBQUFCOFNFQUVqUldlSnE4M3ZBU05GWjRtcnplOGFCV1Y2WkhKdFNQUEdpWnNHPC9wc3NoPg==</cpix:ContentProtectionData>
<cpix:HLSSignalingData playlist="media">I0VYVC1YLUtFWTpNRVRIT0Q9U0FNUExFLUFFUyxLRVlJRD0weDAxMjM0NTY3ODlBQkNERUYwMTIzNDU2Nzg5QUJDREVGLFVSST0iZGF0YTp0ZXh0L3BsYWluO2Jhc2U2NCxBQUFBUDNCemMyZ0FBQUFBN2UrTHFYbldTczZqeUNmYzFSMGg3UUFBQUI4U0VBRWpSV2VKcTgzdkFTTkZaNG1yemU4YUJXVjZaSEp0U1BQR2lac0ciLEtFWUZPUk1BVD0idXJuOnV1aWQ6ZWRlZjhiYTktNzlkNi00YWNlLWEzYzgtMjdkY2Q1MWQyMWVkIixLRVlGT1JNQVRWRVJTSU9OUz0iMSI=</cpix:HLSSignalingData>
<cpix:HLSSignalingData playlist="master">I0VYVC1YLVNFU1NJT04tS0VZOk1FVEhPRD1TQU1QTEUtQUVTLFVSST0iZGF0YTp0ZXh0L3BsYWluO2Jhc2U2NCxBQUFBUDNCemMyZ0FBQUFBN2UrTHFYbldTczZqeUNmYzFSMGg3UUFBQUI4U0VBRWpSV2VKcTgzdkFTTkZaNG1yemU4YUJXVjZaSEp0U1BQR2lac0ciLEtFWUZPUk1BVD0idXJuOnV1aWQ6ZWRlZjhiYTktNzlkNi00YWNlLWEzYzgtMjdkY2Q1MWQyMWVkIixLRVlGT1JNQVRWRVJTSU9OUz0iMSI=</cpix:HLSSignalingData>
</cpix:DRMSystem>
<cpix:DRMSystem kid="01234567-89ab-cdef-0123-456789abcdef" systemId="9a04f079-9840-4286-ab92-e65be0885f95">
<cpix:PSSH>AAACvnBzc2gAAAAAmgTweZhAQoarkuZb4IhflQAAAp6eAgAAAQABAJQCPABXAFIATQBIAEUAQQBEAEUAUgAgAHgAbQBsAG4AcwA9ACIAaAB0AHQAcAA6AC8ALwBzAGMAaABlAG0AYQBzAC4AbQBpAGMAcgBvAHMAbwBmAHQALgBjAG8AbQAvAEQAUgBNAC8AMgAwADAANwAvADAAMwAvAFAAbABhAHkAUgBlAGEAZAB5AEgAZQBhAGQAZQByACIAIAB2AGUAcgBzAGkAbwBuAD0AIgA0AC4AMwAuADAALgAwACIAPgA8AEQAQQBUAEEAPgA8AFAAUgBPAFQARQBDAFQASQBOAEYATwA+ADwASwBJAEQAUwA+ADwASwBJAEQAIABBAEwARwBJAEQAPQAiAEEARQBTAEMAQgBDACIAIABWAEEATABVAEUAPQAiAFoAMABVAGoAQQBhAHUASgA3ADgAMABCAEkAMABWAG4AaQBhAHYATgA3AHcAPQA9ACIAPgA8AC8ASwBJAEQAPgA8AC8ASwBJAEQAUwA+ADwALwBQAFIATwBUAEUAQwBUAEkATgBGAE8APgA8AEwAQQBfAFUAUgBMAD4AaAB0AHQAcABzADoALwAvAHAAbABhAHkAcgBlAGEAZAB5AC4AZQB6AGQAcgBtAC4AYwBvAG0ALwBjAGUAbgBjAHkALwBwAHIAZQBhAHUAdABoAC4AYQBzAHAAeAA/AHAAWAA9ADIANwA0AEYARgA0ADwALwBMAEEAXwBVAFIATAA+ADwARABTAF8ASQBEAD4AVgBsAFIANwBJAGQAcwBJAEoARQB1AFIAZAAwADYATABhAHEAcwAyAGoAdwA9AD0APAAvAEQAUwBfAEkARAA+ADwALwBEAEEAVABBAD4APAAvAFcAUgBNAEgARQBBAEQARQBSAD4A</cpix:PSSH>
<cpix:ContentProtectionData>PHBzc2ggeG1sbnM9InVybjptcGVnOmNlbmM6MjAxMyI+QUFBQ3ZuQnpjMmdBQUFBQW1nVHdlWmhBUW9hcmt1WmI0SWhmbFFBQUFwNmVBZ0FBQVFBQkFKUUNQQUJYQUZJQVRRQklBRVVBUVFCRUFFVUFVZ0FnQUhnQWJRQnNBRzRBY3dBOUFDSUFhQUIwQUhRQWNBQTZBQzhBTHdCekFHTUFhQUJsQUcwQVlRQnpBQzRBYlFCcEFHTUFjZ0J2QUhNQWJ3Qm1BSFFBTGdCakFHOEFiUUF2QUVRQVVnQk5BQzhBTWdBd0FEQUFOd0F2QURBQU13QXZBRkFBYkFCaEFIa0FVZ0JsQUdFQVpBQjVBRWdBWlFCaEFHUUFaUUJ5QUNJQUlBQjJBR1VBY2dCekFHa0Fid0J1QUQwQUlnQTBBQzRBTXdBdUFEQUFMZ0F3QUNJQVBnQThBRVFBUVFCVUFFRUFQZ0E4QUZBQVVnQlBBRlFBUlFCREFGUUFTUUJPQUVZQVR3QStBRHdBU3dCSkFFUUFVd0ErQUR3QVN3QkpBRVFBSUFCQkFFd0FSd0JKQUVRQVBRQWlBRUVBUlFCVEFFTUFRZ0JEQUNJQUlBQldBRUVBVEFCVkFFVUFQUUFpQUZvQU1BQlZBR29BUVFCaEFIVUFTZ0EzQURnQU1BQkNBRWtBTUFCV0FHNEFhUUJoQUhZQVRnQTNBSGNBUFFBOUFDSUFQZ0E4QUM4QVN3QkpBRVFBUGdBOEFDOEFTd0JKQUVRQVV3QStBRHdBTHdCUUFGSUFUd0JVQUVVQVF3QlVBRWtBVGdCR0FFOEFQZ0E4QUV3QVFRQmZBRlVBVWdCTUFENEFhQUIwQUhRQWNBQnpBRG9BTHdBdkFIQUFiQUJoQUhrQWNnQmxBR0VBWkFCNUFDNEFaUUI2QUdRQWNnQnRBQzRBWXdCdkFHMEFMd0JqQUdVQWJnQmpBSGtBTHdCd0FISUFaUUJoQUhVQWRBQm9BQzRBWVFCekFIQUFlQUEvQUhBQVdBQTlBRElBTndBMEFFWUFSZ0EwQUR3QUx3Qk1BRUVBWHdCVkFGSUFUQUErQUR3QVJBQlRBRjhBU1FCRUFENEFWZ0JzQUZJQU53QkpBR1FBY3dCSkFFb0FSUUIxQUZJQVpBQXdBRFlBVEFCaEFIRUFjd0F5QUdvQWR3QTlBRDBBUEFBdkFFUUFVd0JmQUVrQVJBQStBRHdBTHdCRUFFRUFWQUJCQUQ0QVBBQXZBRmNBVWdCTkFFZ0FSUUJCQUVRQVJRQlNBRDRBPC9wc3NoPjxwcm8geG1sbnM9InVybjptaWNyb3NvZnQ6cGxheXJlYWR5Ij5uZ0lBQUFFQUFRQ1VBandBVndCU0FFMEFTQUJGQUVFQVJBQkZBRklBSUFCNEFHMEFiQUJ1QUhNQVBRQWlBR2dBZEFCMEFIQUFPZ0F2QUM4QWN3QmpBR2dBWlFCdEFHRUFjd0F1QUcwQWFRQmpBSElBYndCekFHOEFaZ0IwQUM0QVl3QnZBRzBBTHdCRUFGSUFUUUF2QURJQU1BQXdBRGNBTHdBd0FETUFMd0JRQUd3QVlRQjVBRklBWlFCaEFHUUFlUUJJQUdVQVlRQmtBR1VBY2dBaUFDQUFkZ0JsQUhJQWN3QnBBRzhBYmdBOUFDSUFOQUF1QURNQUxnQXdBQzRBTUFBaUFENEFQQUJFQUVFQVZBQkJBRDRBUEFCUUFGSUFUd0JVQUVVQVF3QlVBRWtBVGdCR0FFOEFQZ0E4QUVzQVNRQkVBRk1BUGdBOEFFc0FTUUJFQUNBQVFRQk1BRWNBU1FCRUFEMEFJZ0JCQUVVQVV3QkRBRUlBUXdBaUFDQUFWZ0JCQUV3QVZRQkZBRDBBSWdCYUFEQUFWUUJxQUVFQVlRQjFBRW9BTndBNEFEQUFRZ0JKQURBQVZnQnVBR2tBWVFCMkFFNEFOd0IzQUQwQVBRQWlBRDRBUEFBdkFFc0FTUUJFQUQ0QVBBQXZBRXNBU1FCRUFGTUFQZ0E4QUM4QVVBQlNBRThBVkFCRkFFTUFWQUJKQUU0QVJnQlBBRDRBUEFCTUFFRUFYd0JWQUZJQVRBQStBR2dBZEFCMEFIQUFjd0E2QUM4QUx3QndBR3dBWVFCNUFISUFaUUJoQUdRQWVRQXVBR1VBZWdCa0FISUFiUUF1QUdNQWJ3QnRBQzhBWXdCbEFHNEFZd0I1QUM4QWNBQnlBR1VBWVFCMUFIUUFhQUF1QUdFQWN3QndBSGdBUHdCd0FGZ0FQUUF5QURjQU5BQkdBRVlBTkFBOEFDOEFUQUJCQUY4QVZRQlNBRXdBUGdBOEFFUUFVd0JmQUVrQVJBQStBRllBYkFCU0FEY0FTUUJrQUhNQVNRQktBRVVBZFFCU0FHUUFNQUEyQUV3QVlRQnhBSE1BTWdCcUFIY0FQUUE5QUR3QUx3QkVBRk1BWHdCSkFFUUFQZ0E4QUM4QVJBQkJBRlFBUVFBK0FEd0FMd0JYQUZJQVRRQklBRVVBUVFCRUFFVUFVZ0ErQUE9PTwvcHJvPg==</cpix:ContentProtectionData>
<cpix:HLSSignalingData playlist="master">I0VYVC1YLVNFU1NJT04tS0VZOk1FVEhPRD1TQU1QTEUtQUVTLFVSST0iZGF0YTp0ZXh0L3BsYWluO2NoYXJzZXQ9VVRGLTE2O2Jhc2U2NCxuZ0lBQUFFQUFRQ1VBandBVndCU0FFMEFTQUJGQUVFQVJBQkZBRklBSUFCNEFHMEFiQUJ1QUhNQVBRQWlBR2dBZEFCMEFIQUFPZ0F2QUM4QWN3QmpBR2dBWlFCdEFHRUFjd0F1QUcwQWFRQmpBSElBYndCekFHOEFaZ0IwQUM0QVl3QnZBRzBBTHdCRUFGSUFUUUF2QURJQU1BQXdBRGNBTHdBd0FETUFMd0JRQUd3QVlRQjVBRklBWlFCaEFHUUFlUUJJQUdVQVlRQmtBR1VBY2dBaUFDQUFkZ0JsQUhJQWN3QnBBRzhBYmdBOUFDSUFOQUF1QURNQUxnQXdBQzRBTUFBaUFENEFQQUJFQUVFQVZBQkJBRDRBUEFCUUFGSUFUd0JVQUVVQVF3QlVBRWtBVGdCR0FFOEFQZ0E4QUVzQVNRQkVBRk1BUGdBOEFFc0FTUUJFQUNBQVFRQk1BRWNBU1FCRUFEMEFJZ0JCQUVVQVV3QkRBRUlBUXdBaUFDQUFWZ0JCQUV3QVZRQkZBRDBBSWdCYUFEQUFWUUJxQUVFQVlRQjFBRW9BTndBNEFEQUFRZ0JKQURBQVZnQnVBR2tBWVFCMkFFNEFOd0IzQUQwQVBRQWlBRDRBUEFBdkFFc0FTUUJFQUQ0QVBBQXZBRXNBU1FCRUFGTUFQZ0E4QUM4QVVBQlNBRThBVkFCRkFFTUFWQUJKQUU0QVJnQlBBRDRBUEFCTUFFRUFYd0JWQUZJQVRBQStBR2dBZEFCMEFIQUFjd0E2QUM4QUx3QndBR3dBWVFCNUFISUFaUUJoQUdRQWVRQXVBR1VBZWdCa0FISUFiUUF1QUdNQWJ3QnRBQzhBWXdCbEFHNEFZd0I1QUM4QWNBQnlBR1VBWVFCMUFIUUFhQUF1QUdFQWN3QndBSGdBUHdCd0FGZ0FQUUF5QURjQU5BQkdBRVlBTkFBOEFDOEFUQUJCQUY4QVZRQlNBRXdBUGdBOEFFUUFVd0JmQUVrQVJBQStBRllBYkFCU0FEY0FTUUJrQUhNQVNRQktBRVVBZFFCU0FHUUFNQUEyQUV3QVlRQnhBSE1BTWdCcUFIY0FQUUE5QUR3QUx3QkVBRk1BWHdCSkFFUUFQZ0E4QUM4QVJBQkJBRlFBUVFBK0FEd0FMd0JYQUZJQVRRQklBRVVBUVFCRUFFVUFVZ0ErQUE9PSIsS0VZRk9STUFUPSJjb20ubWljcm9zb2Z0LnBsYXlyZWFkeSIsS0VZRk9STUFUVkVSU0lPTlM9IjEi</cpix:HLSSignalingData>
<cpix:HLSSignalingData playlist="media">I0VYVC1YLUtFWTpNRVRIT0Q9U0FNUExFLUFFUyxVUkk9ImRhdGE6dGV4dC9wbGFpbjtjaGFyc2V0PVVURi0xNjtiYXNlNjQsbmdJQUFBRUFBUUNVQWp3QVZ3QlNBRTBBU0FCRkFFRUFSQUJGQUZJQUlBQjRBRzBBYkFCdUFITUFQUUFpQUdnQWRBQjBBSEFBT2dBdkFDOEFjd0JqQUdnQVpRQnRBR0VBY3dBdUFHMEFhUUJqQUhJQWJ3QnpBRzhBWmdCMEFDNEFZd0J2QUcwQUx3QkVBRklBVFFBdkFESUFNQUF3QURjQUx3QXdBRE1BTHdCUUFHd0FZUUI1QUZJQVpRQmhBR1FBZVFCSUFHVUFZUUJrQUdVQWNnQWlBQ0FBZGdCbEFISUFjd0JwQUc4QWJnQTlBQ0lBTkFBdUFETUFMZ0F3QUM0QU1BQWlBRDRBUEFCRUFFRUFWQUJCQUQ0QVBBQlFBRklBVHdCVUFFVUFRd0JVQUVrQVRnQkdBRThBUGdBOEFFc0FTUUJFQUZNQVBnQThBRXNBU1FCRUFDQUFRUUJNQUVjQVNRQkVBRDBBSWdCQkFFVUFVd0JEQUVJQVF3QWlBQ0FBVmdCQkFFd0FWUUJGQUQwQUlnQmFBREFBVlFCcUFFRUFZUUIxQUVvQU53QTRBREFBUWdCSkFEQUFWZ0J1QUdrQVlRQjJBRTRBTndCM0FEMEFQUUFpQUQ0QVBBQXZBRXNBU1FCRUFENEFQQUF2QUVzQVNRQkVBRk1BUGdBOEFDOEFVQUJTQUU4QVZBQkZBRU1BVkFCSkFFNEFSZ0JQQUQ0QVBBQk1BRUVBWHdCVkFGSUFUQUErQUdnQWRBQjBBSEFBY3dBNkFDOEFMd0J3QUd3QVlRQjVBSElBWlFCaEFHUUFlUUF1QUdVQWVnQmtBSElBYlFBdUFHTUFid0J0QUM4QVl3QmxBRzRBWXdCNUFDOEFjQUJ5QUdVQVlRQjFBSFFBYUFBdUFHRUFjd0J3QUhnQVB3QndBRmdBUFFBeUFEY0FOQUJHQUVZQU5BQThBQzhBVEFCQkFGOEFWUUJTQUV3QVBnQThBRVFBVXdCZkFFa0FSQUErQUZZQWJBQlNBRGNBU1FCa0FITUFTUUJLQUVVQWRRQlNBR1FBTUFBMkFFd0FZUUJ4QUhNQU1nQnFBSGNBUFFBOUFEd0FMd0JFQUZNQVh3QkpBRVFBUGdBOEFDOEFSQUJCQUZRQVFRQStBRHdBTHdCWEFGSUFUUUJJQUVVQVFRQkVBRVVBVWdBK0FBPT0iLEtFWUZPUk1BVD0iY29tLm1pY3Jvc29mdC5wbGF5cmVhZHkiLEtFWUZPUk1BVFZFUlNJT05TPSIxIg==</cpix:HLSSignalingData>
<cpix:SmoothStreamingProtectionHeaderData>ngIAAAEAAQCUAjwAVwBSAE0ASABFAEEARABFAFIAIAB4AG0AbABuAHMAPQAiAGgAdAB0AHAAOgAvAC8AcwBjAGgAZQBtAGEAcwAuAG0AaQBjAHIAbwBzAG8AZgB0AC4AYwBvAG0ALwBEAFIATQAvADIAMAAwADcALwAwADMALwBQAGwAYQB5AFIAZQBhAGQAeQBIAGUAYQBkAGUAcgAiACAAdgBlAHIAcwBpAG8AbgA9ACIANAAuADMALgAwAC4AMAAiAD4APABEAEEAVABBAD4APABQAFIATwBUAEUAQwBUAEkATgBGAE8APgA8AEsASQBEAFMAPgA8AEsASQBEACAAQQBMAEcASQBEAD0AIgBBAEUAUwBDAEIAQwAiACAAVgBBAEwAVQBFAD0AIgBaADAAVQBqAEEAYQB1AEoANwA4ADAAQgBJADAAVgBuAGkAYQB2AE4ANwB3AD0APQAiAD4APAAvAEsASQBEAD4APAAvAEsASQBEAFMAPgA8AC8AUABSAE8AVABFAEMAVABJAE4ARgBPAD4APABMAEEAXwBVAFIATAA+AGgAdAB0AHAAcwA6AC8ALwBwAGwAYQB5AHIAZQBhAGQAeQAuAGUAegBkAHIAbQAuAGMAbwBtAC8AYwBlAG4AYwB5AC8AcAByAGUAYQB1AHQAaAAuAGEAcwBwAHgAPwBwAFgAPQAyADcANABGAEYANAA8AC8ATABBAF8AVQBSAEwAPgA8AEQAUwBfAEkARAA+AFYAbABSADcASQBkAHMASQBKAEUAdQBSAGQAMAA2AEwAYQBxAHMAMgBqAHcAPQA9ADwALwBEAFMAXwBJAEQAPgA8AC8ARABBAFQAQQA+ADwALwBXAFIATQBIAEUAQQBEAEUAUgA+AA==</cpix:SmoothStreamingProtectionHeaderData>
</cpix:DRMSystem>
<cpix:DRMSystem kid="01234567-89ab-cdef-0123-456789abcdef" systemId="94ce86fb-07ff-4f43-adb8-93d2fa968ca2">
<cpix:HLSSignalingData playlist="media">I0VYVC1YLUtFWTpNRVRIT0Q9U0FNUExFLUFFUyxVUkk9InNrZDovLzAxMjM0NTY3LTg5YWItY2RlZi0wMTIzLTQ1Njc4OWFiY2RlZjowMTIzNDU2Nzg5YWJjZGVmMDEyMzQ1Njc4OWFiY2RlZiIsS0VZRk9STUFUPSJjb20uYXBwbGUuc3RyZWFtaW5na2V5ZGVsaXZlcnkiLEtFWUZPUk1BVFZFUlNJT05TPSIxIg==</cpix:HLSSignalingData>
<cpix:HLSSignalingData playlist="master">I0VYVC1YLVNFU1NJT04tS0VZOk1FVEhPRD1TQU1QTEUtQUVTLFVSST0ic2tkOi8vMDEyMzQ1NjctODlhYi1jZGVmLTAxMjMtNDU2Nzg5YWJjZGVmOjAxMjM0NTY3ODlhYmNkZWYwMTIzNDU2Nzg5YWJjZGVmIixLRVlGT1JNQVQ9ImNvbS5hcHBsZS5zdHJlYW1pbmdrZXlkZWxpdmVyeSIsS0VZRk9STUFUVkVSU0lPTlM9IjEi</cpix:HLSSignalingData>
</cpix:DRMSystem>
</cpix:DRMSystemList>
<cpix:ContentKeyUsageRuleList>
<cpix:ContentKeyUsageRule kid="01234567-89ab-cdef-0123-456789abcdef"> </cpix:ContentKeyUsageRule>
</cpix:ContentKeyUsageRuleList>
</cpix:CPIX>
24 changes: 24 additions & 0 deletions cmd/livesim2/app/testdata/drm.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"version": "0.5",
"packages":
[
{
"name": "EZDRM-1-key-cbcs-test",
"desc": "EZDRM-provided DRM setup with one-key CBCS encryption with Widevine, PlayReady, and FairPlay",
"cpixFile": "cpix_1key_cbcs_test.xml",
"licenseURLs": {
"widevine": {
"laURL": "https://widevine-dash.ezdrm.com/proxy?pX=FFFFFF"
},
"playready": {
"laURL": "https://playready.ezdrm.com/cency/preauth.asp?pX=FFFFFF",
"certURL": "https://na-wv.ezdrm.com/demo/video/eleisure.cer"
},
"fairplay": {
"laURL": "https://us-dev.ezdrm.com/fps",
"certURL": "https://na-fps.ezdrm.com/demo/video/eleisure.cer"
}
}
}
]
}
3 changes: 1 addition & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ toolchain go1.23.5

require (
github.com/Comcast/gots/v2 v2.2.1
github.com/Eyevinn/dash-mpd v0.13.0
github.com/Eyevinn/dash-mpd v0.14.0
github.com/Eyevinn/mp4ff v0.50.0
github.com/beevik/etree v1.5.0
github.com/caddyserver/certmagic v0.22.0
Expand All @@ -18,7 +18,6 @@ require (
github.com/prometheus/client_golang v1.21.1
github.com/spf13/pflag v1.0.6
github.com/stretchr/testify v1.10.0

)

require (
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/Comcast/gots/v2 v2.2.1 h1:LU/SRg7p2KQqVkNqInV7I4MOQKAqvWQP/PSSLtygP2s=
github.com/Comcast/gots/v2 v2.2.1/go.mod h1:firJ11on3eUiGHAhbY5cZNqG0OqhQ1+nSZHfsEEzVVU=
github.com/Eyevinn/dash-mpd v0.13.0 h1:nKBARYjBEgeGVYUA26OPKyyGw7+J4xf2Az1nUK2ln2U=
github.com/Eyevinn/dash-mpd v0.13.0/go.mod h1:yym2itvB74evfJFDZB99p700LQddQFsN1YCbk9t6mAA=
github.com/Eyevinn/dash-mpd v0.14.0 h1:jKK3/EE/erPb6B6JBVzGJI27G3NXBjazGsQm2caogQk=
github.com/Eyevinn/dash-mpd v0.14.0/go.mod h1:yym2itvB74evfJFDZB99p700LQddQFsN1YCbk9t6mAA=
github.com/Eyevinn/mp4ff v0.50.0 h1:vFlsvpQh5Jfz++cuaeTI90vbID5dAabebvvN/l9lom0=
github.com/Eyevinn/mp4ff v0.50.0/go.mod h1:hJNUUqOBryLAzUW9wpCJyw2HaI+TCd2rUPhafoS5lgg=
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
Expand Down
2 changes: 1 addition & 1 deletion pkg/drm/cpix_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func TestCPIXParser(t *testing.T) {
file: "testdata/cpix_1key_cbcs_test.xml",
wantedContentID: "livesim2-0001",
wantedNrKeys: 1,
wantedNrDRMs: 2,
wantedNrDRMs: 3,
},
{
desc: "2 keys, CBCS, with usage rules for video and audio",
Expand Down
23 changes: 22 additions & 1 deletion pkg/drm/drm_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,30 @@ func TestReadFullConfig(t *testing.T) {
require.True(t, ok)
require.NotNil(t, cfg)
require.Equal(t, 1, len(cfg.CPIXData.ContentKeys))
require.Equal(t, 2, len(cfg.CPIXData.DRMSystems))
require.Equal(t, 3, len(cfg.CPIXData.DRMSystems))
require.Equal(t, 1, len(cfg.CPIXData.UsageRules))
require.Equal(t, "livesim2-0001", cfg.CPIXData.ContentID)

// Check that CertificateURL is properly read for FairPlay
fairplayURL, ok := cfg.URLs["fairplay"]
require.True(t, ok)
require.NotNil(t, fairplayURL)
require.Equal(t, "https://us-dev.ezdrm.com/fps", fairplayURL.LaURL)
require.Equal(t, "https://na-fps.ezdrm.com/demo/video/eleisure.cer", fairplayURL.CertificateURL)

// Check PlayReady has both LaURL and CertificateURL
playreadyURL, ok := cfg.URLs["playready"]
require.True(t, ok)
require.NotNil(t, playreadyURL)
require.Equal(t, "https://playready.ezdrm.com/cency/preauth.asp?pX=FFFFFF", playreadyURL.LaURL)
require.Equal(t, "https://na-wv.ezdrm.com/demo/video/eleisure.cer", playreadyURL.CertificateURL)

// Check Widevine has LaURL but empty CertificateURL
widevineURL, ok := cfg.URLs["widevine"]
require.True(t, ok)
require.NotNil(t, widevineURL)
require.Equal(t, "https://widevine-dash.ezdrm.com/proxy?pX=FFFFFF", widevineURL.LaURL)
require.Equal(t, "", widevineURL.CertificateURL)
}

func TestToUUIDStr(t *testing.T) {
Expand Down
Loading
Loading