Merge pull request #166 from Dash-Industry-Forum/fix-eccp

Fix ECCP
Dash-Industry-Forum · Mar 4, 2024 · 195acdc · 195acdc
2 parents 6d87c17 + 2235ce2
commit 195acdc
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Correct UTCTiming schemes for http-iso and http-head
 - Make urlgen fields for negative test cases easier to fill
+- Fix OPTIONS for livesim2/ path
+- Fix encryption of segments for representations with previous metadata
 
 ## [1.2.0] - 2024-02-16
 

diff --git a/cmd/livesim2/app/asset.go b/cmd/livesim2/app/asset.go
@@ -753,6 +753,14 @@ func (r *RepData) readInit(vodFS fs.FS, assetPath string) error {
 		return fmt.Errorf("getInitBytes: %w", err)
 	}
 
+	if prepareForEncryption(r.Codecs) {
+		assetName := path.Base(assetPath)
+		err = r.addEncryption(assetName, data)
+		if err != nil {
+			return fmt.Errorf("addEncryption: %w", err)
+		}
+	}
+
 	if r.MediaTimescale != 0 {
 		return nil // Already set
 	}
@@ -761,13 +769,6 @@ func (r *RepData) readInit(vodFS fs.FS, assetPath string) error {
 	trex := r.initSeg.Moov.Mvex.Trex
 	r.DefaultSampleDuration = trex.DefaultSampleDuration
 
-	if prepareForEncryption(r.Codecs) {
-		assetName := path.Base(assetPath)
-		err = r.addEncryption(assetName, data)
-		if err != nil {
-			return fmt.Errorf("addEncryption: %w", err)
-		}
-	}
 	return nil
 }
 
@@ -800,6 +801,7 @@ func (r *RepData) addEncryption(assetName string, data []byte) error {
 	if err != nil {
 		return fmt.Errorf("init protect cbcs: %w", err)
 	}
+	slog.Info("Encrypted init segment with cbcs", "asset", assetName, "repID", r.ID)
 	ed.cbcsPD = ipd
 	ed.cbcsInitSeg = initSeg
 	ed.cbcsInitBytes, err = getInitBytes(initSeg)
@@ -816,6 +818,7 @@ func (r *RepData) addEncryption(assetName string, data []byte) error {
 	if err != nil {
 		return fmt.Errorf("init protect cenc: %w", err)
 	}
+	slog.Info("Encrypted init segment with cenc", "asset", assetName, "repID", r.ID)
 	ed.cencPD = ipd
 	ed.cencInitSeg = initSeg
 	ed.cencInitBytes, err = getInitBytes(initSeg)

diff --git a/cmd/livesim2/app/routes.go b/cmd/livesim2/app/routes.go
@@ -62,8 +62,8 @@ func (s *Server) Routes(ctx context.Context) error {
 	// LiveRouter is mounted at /livesim2
 	s.LiveRouter.MethodFunc("GET", "/*", s.livesimHandlerFunc)
 	s.LiveRouter.MethodFunc("HEAD", "/*", s.livesimHandlerFunc)
-	s.Router.MethodFunc("OPTIONS", "/*", s.optionsHandlerFunc)
 	s.LiveRouter.MethodFunc("POST", "/*", s.laURLHandlerFunc)
+	s.LiveRouter.MethodFunc("OPTIONS", "/*", s.optionsHandlerFunc)
 	// VodRouter is mounted at /vod
 	s.VodRouter.MethodFunc("GET", "/*", s.vodHandlerFunc)
 	s.VodRouter.MethodFunc("HEAD", "/*", s.vodHandlerFunc)