net,core: add fields for signatures in B<>O messages

livepeer · Sep 21, 2021 · 9c4cc8b · 9c4cc8b
1 parent fce8a40
commit 9c4cc8b
Show file tree

Hide file tree

Showing 5 changed files with 174 additions and 143 deletions.
diff --git a/core/orchestrator.go b/core/orchestrator.go
@@ -396,7 +396,8 @@ type TranscodeData struct {
 // TranscodedSegmentData contains encoded data for a profile
 type TranscodedSegmentData struct {
 	Data   []byte
-	Pixels int64 // Encoded pixels
+	PHash  []byte // Perceptual hash data (maybe nil)
+	Pixels int64  // Encoded pixels
 }
 
 type SegChanData struct {

diff --git a/core/streamdata.go b/core/streamdata.go
@@ -47,17 +47,18 @@ func (s *StreamParameters) StreamID() string {
 }
 
 type SegTranscodingMetadata struct {
-	ManifestID       ManifestID
-	Fname            string
-	Seq              int64
-	Hash             ethcommon.Hash
-	Profiles         []ffmpeg.VideoProfile
-	OS               *net.OSInfo
-	Duration         time.Duration
-	Caps             *Capabilities
-	AuthToken        *net.AuthToken
-	DetectorEnabled  bool
-	DetectorProfiles []ffmpeg.DetectorProfile
+	ManifestID         ManifestID
+	Fname              string
+	Seq                int64
+	Hash               ethcommon.Hash
+	Profiles           []ffmpeg.VideoProfile
+	OS                 *net.OSInfo
+	Duration           time.Duration
+	Caps               *Capabilities
+	AuthToken          *net.AuthToken
+	DetectorEnabled    bool
+	DetectorProfiles   []ffmpeg.DetectorProfile
+	CalcPerceptualHash bool
 }
 
 func (md *SegTranscodingMetadata) Flatten() []byte {
@@ -109,15 +110,16 @@ func NetSegData(md *SegTranscodingMetadata) (*net.SegData, error) {
 	}
 	// Generate serialized segment info
 	segData := &net.SegData{
-		ManifestId:       []byte(md.ManifestID),
-		Seq:              md.Seq,
-		Hash:             md.Hash.Bytes(),
-		Storage:          storage,
-		Duration:         int32(md.Duration / time.Millisecond),
-		Capabilities:     md.Caps.ToNetCapabilities(),
-		AuthToken:        md.AuthToken,
-		DetectorEnabled:  md.DetectorEnabled,
-		DetectorProfiles: detectorProfiles,
+		ManifestId:         []byte(md.ManifestID),
+		Seq:                md.Seq,
+		Hash:               md.Hash.Bytes(),
+		Storage:            storage,
+		Duration:           int32(md.Duration / time.Millisecond),
+		Capabilities:       md.Caps.ToNetCapabilities(),
+		AuthToken:          md.AuthToken,
+		DetectorEnabled:    md.DetectorEnabled,
+		DetectorProfiles:   detectorProfiles,
+		CalcPerceptualHash: md.CalcPerceptualHash,
 		// Triggers failure on Os that don't know how to use FullProfiles/2/3
 		Profiles: []byte("invalid"),
 	}