From 09f536b03b0349a17d199055d8abe7b71039e8fa Mon Sep 17 00:00:00 2001 From: Angie Ramirez Date: Tue, 27 Nov 2018 19:12:07 -0500 Subject: [PATCH] temp commit for SegData changes --- eth/types/segment.go | 16 +-- net/lp_rpc.pb.go | 285 +++++++++++++++++++++++-------------------- net/lp_rpc.proto | 5 +- server/rpc.go | 1 + 4 files changed, 168 insertions(+), 139 deletions(-) diff --git a/eth/types/segment.go b/eth/types/segment.go index 6e3bd2f762..cc46e9cff1 100644 --- a/eth/types/segment.go +++ b/eth/types/segment.go @@ -3,24 +3,24 @@ package types import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + ethcommon "github.com/ethereum/go-ethereum/common" + "github.com/livepeer/go-livepeer/common" + ffmpeg "github.com/livepeer/lpms/ffmpeg" ) type Segment struct { StreamID string SegmentSequenceNumber *big.Int - DataHash common.Hash -} - -func (s *Segment) Hash() common.Hash { - return crypto.Keccak256Hash([]byte(s.StreamID), common.LeftPadBytes(s.SegmentSequenceNumber.Bytes(), 32), s.DataHash.Bytes()) + DataHash ethcommon.Hash + Profiles []ffmpeg.VideoProfile } func (s *Segment) Flatten() []byte { - buf := make([]byte, len(s.StreamID)+32+len(s.DataHash.Bytes())) + buf := make([]byte, len(s.StreamID)+32+len(s.DataHash.Bytes())+len(s.Profiles)) i := copy(buf[0:], []byte(s.StreamID)) i += copy(buf[i:], common.LeftPadBytes(s.SegmentSequenceNumber.Bytes(), 32)) i += copy(buf[i:], s.DataHash.Bytes()) + i += copy(buf[i:], common.ProfilesToTranscodeOpts(s.Profiles)) + return buf } diff --git a/net/lp_rpc.pb.go b/net/lp_rpc.pb.go index 831b921fd0..8ef1d10b22 100644 --- a/net/lp_rpc.pb.go +++ b/net/lp_rpc.pb.go @@ -3,13 +3,12 @@ package net -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" - import ( - context "golang.org/x/net/context" + context "context" + fmt "fmt" + proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. @@ -36,6 +35,7 @@ var OSInfo_StorageType_name = map[int32]string{ 1: "S3", 2: "IPFS", } + var OSInfo_StorageType_value = map[string]int32{ "DIRECT": 0, "S3": 1, @@ -45,8 +45,9 @@ var OSInfo_StorageType_value = map[string]int32{ func (x OSInfo_StorageType) String() string { return proto.EnumName(OSInfo_StorageType_name, int32(x)) } + func (OSInfo_StorageType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_lp_rpc_3f7bcf49dcd292df, []int{2, 0} + return fileDescriptor_034e29c79f9ba827, []int{2, 0} } type PingPong struct { @@ -61,16 +62,17 @@ func (m *PingPong) Reset() { *m = PingPong{} } func (m *PingPong) String() string { return proto.CompactTextString(m) } func (*PingPong) ProtoMessage() {} func (*PingPong) Descriptor() ([]byte, []int) { - return fileDescriptor_lp_rpc_3f7bcf49dcd292df, []int{0} + return fileDescriptor_034e29c79f9ba827, []int{0} } + func (m *PingPong) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PingPong.Unmarshal(m, b) } func (m *PingPong) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_PingPong.Marshal(b, m, deterministic) } -func (dst *PingPong) XXX_Merge(src proto.Message) { - xxx_messageInfo_PingPong.Merge(dst, src) +func (m *PingPong) XXX_Merge(src proto.Message) { + xxx_messageInfo_PingPong.Merge(m, src) } func (m *PingPong) XXX_Size() int { return xxx_messageInfo_PingPong.Size(m) @@ -92,7 +94,7 @@ func (m *PingPong) GetValue() []byte { // information on which transcoder to use. type TranscoderRequest struct { // Ethereum address of the broadcaster - Address string `protobuf:"bytes,1,opt,name=address" json:"address,omitempty"` + Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` // Broadcaster's signature over its address Sig []byte `protobuf:"bytes,2,opt,name=sig,proto3" json:"sig,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -104,16 +106,17 @@ func (m *TranscoderRequest) Reset() { *m = TranscoderRequest{} } func (m *TranscoderRequest) String() string { return proto.CompactTextString(m) } func (*TranscoderRequest) ProtoMessage() {} func (*TranscoderRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_lp_rpc_3f7bcf49dcd292df, []int{1} + return fileDescriptor_034e29c79f9ba827, []int{1} } + func (m *TranscoderRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TranscoderRequest.Unmarshal(m, b) } func (m *TranscoderRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_TranscoderRequest.Marshal(b, m, deterministic) } -func (dst *TranscoderRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_TranscoderRequest.Merge(dst, src) +func (m *TranscoderRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_TranscoderRequest.Merge(m, src) } func (m *TranscoderRequest) XXX_Size() int { return xxx_messageInfo_TranscoderRequest.Size(m) @@ -139,12 +142,12 @@ func (m *TranscoderRequest) GetSig() []byte { } // -// OSInfo needed to negotiate storages that will be used. -// It carries info needed to write to the storage. +//OSInfo needed to negotiate storages that will be used. +//It carries info needed to write to the storage. type OSInfo struct { // Storage type: direct, s3, ipfs. - StorageType OSInfo_StorageType `protobuf:"varint,1,opt,name=storageType,enum=net.OSInfo_StorageType" json:"storageType,omitempty"` - S3Info *S3OSInfo `protobuf:"bytes,16,opt,name=s3info" json:"s3info,omitempty"` + StorageType OSInfo_StorageType `protobuf:"varint,1,opt,name=storageType,proto3,enum=net.OSInfo_StorageType" json:"storageType,omitempty"` + S3Info *S3OSInfo `protobuf:"bytes,16,opt,name=s3info,proto3" json:"s3info,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -154,16 +157,17 @@ func (m *OSInfo) Reset() { *m = OSInfo{} } func (m *OSInfo) String() string { return proto.CompactTextString(m) } func (*OSInfo) ProtoMessage() {} func (*OSInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_lp_rpc_3f7bcf49dcd292df, []int{2} + return fileDescriptor_034e29c79f9ba827, []int{2} } + func (m *OSInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OSInfo.Unmarshal(m, b) } func (m *OSInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_OSInfo.Marshal(b, m, deterministic) } -func (dst *OSInfo) XXX_Merge(src proto.Message) { - xxx_messageInfo_OSInfo.Merge(dst, src) +func (m *OSInfo) XXX_Merge(src proto.Message) { + xxx_messageInfo_OSInfo.Merge(m, src) } func (m *OSInfo) XXX_Size() int { return xxx_messageInfo_OSInfo.Size(m) @@ -190,17 +194,17 @@ func (m *OSInfo) GetS3Info() *S3OSInfo { type S3OSInfo struct { // Host to use to connect to S3 - Host string `protobuf:"bytes,1,opt,name=host" json:"host,omitempty"` + Host string `protobuf:"bytes,1,opt,name=host,proto3" json:"host,omitempty"` // Key (prefix) to use when uploading the object. - Key string `protobuf:"bytes,2,opt,name=key" json:"key,omitempty"` + Key string `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty"` // POST policy that S3 owner node creates to give write access to other node. - Policy string `protobuf:"bytes,3,opt,name=policy" json:"policy,omitempty"` + Policy string `protobuf:"bytes,3,opt,name=policy,proto3" json:"policy,omitempty"` // Signature for POST policy. - Signature string `protobuf:"bytes,4,opt,name=signature" json:"signature,omitempty"` + Signature string `protobuf:"bytes,4,opt,name=signature,proto3" json:"signature,omitempty"` // Needed for POST policy. - XAmzCredential string `protobuf:"bytes,5,opt,name=xAmzCredential" json:"xAmzCredential,omitempty"` + XAmzCredential string `protobuf:"bytes,5,opt,name=xAmzCredential,proto3" json:"xAmzCredential,omitempty"` // Needed for POST policy. - XAmzDate string `protobuf:"bytes,6,opt,name=xAmzDate" json:"xAmzDate,omitempty"` + XAmzDate string `protobuf:"bytes,6,opt,name=xAmzDate,proto3" json:"xAmzDate,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -210,16 +214,17 @@ func (m *S3OSInfo) Reset() { *m = S3OSInfo{} } func (m *S3OSInfo) String() string { return proto.CompactTextString(m) } func (*S3OSInfo) ProtoMessage() {} func (*S3OSInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_lp_rpc_3f7bcf49dcd292df, []int{3} + return fileDescriptor_034e29c79f9ba827, []int{3} } + func (m *S3OSInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_S3OSInfo.Unmarshal(m, b) } func (m *S3OSInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_S3OSInfo.Marshal(b, m, deterministic) } -func (dst *S3OSInfo) XXX_Merge(src proto.Message) { - xxx_messageInfo_S3OSInfo.Merge(dst, src) +func (m *S3OSInfo) XXX_Merge(src proto.Message) { + xxx_messageInfo_S3OSInfo.Merge(m, src) } func (m *S3OSInfo) XXX_Size() int { return xxx_messageInfo_S3OSInfo.Size(m) @@ -277,17 +282,17 @@ func (m *S3OSInfo) GetXAmzDate() string { // use the transcoder, and miscellaneous data related to the job. type TranscoderInfo struct { // URI of the transcoder to use for submitting segments. - Transcoder string `protobuf:"bytes,1,opt,name=transcoder" json:"transcoder,omitempty"` + Transcoder string `protobuf:"bytes,1,opt,name=transcoder,proto3" json:"transcoder,omitempty"` // Signals the authentication method to expect within `credentials`. This // field is opaque to the broadcaster, and should be passed to the transcoder. - AuthType string `protobuf:"bytes,2,opt,name=authType" json:"authType,omitempty"` + AuthType string `protobuf:"bytes,2,opt,name=authType,proto3" json:"authType,omitempty"` // Credentials to verify the request has been authorized by an orchestrator. // This field is opaque to the broadcaster. - Credentials string `protobuf:"bytes,3,opt,name=credentials" json:"credentials,omitempty"` + Credentials string `protobuf:"bytes,3,opt,name=credentials,proto3" json:"credentials,omitempty"` // Transcoded streamId list to update the master manifest on the broadcaster. - StreamIds map[string]string `protobuf:"bytes,16,rep,name=streamIds" json:"streamIds,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + StreamIds map[string]string `protobuf:"bytes,16,rep,name=streamIds,proto3" json:"streamIds,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Orchestrator returns info about own input object storage, if it wants it to be used. - Storage []*OSInfo `protobuf:"bytes,32,rep,name=storage" json:"storage,omitempty"` + Storage []*OSInfo `protobuf:"bytes,32,rep,name=storage,proto3" json:"storage,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -297,16 +302,17 @@ func (m *TranscoderInfo) Reset() { *m = TranscoderInfo{} } func (m *TranscoderInfo) String() string { return proto.CompactTextString(m) } func (*TranscoderInfo) ProtoMessage() {} func (*TranscoderInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_lp_rpc_3f7bcf49dcd292df, []int{4} + return fileDescriptor_034e29c79f9ba827, []int{4} } + func (m *TranscoderInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TranscoderInfo.Unmarshal(m, b) } func (m *TranscoderInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_TranscoderInfo.Marshal(b, m, deterministic) } -func (dst *TranscoderInfo) XXX_Merge(src proto.Message) { - xxx_messageInfo_TranscoderInfo.Merge(dst, src) +func (m *TranscoderInfo) XXX_Merge(src proto.Message) { + xxx_messageInfo_TranscoderInfo.Merge(m, src) } func (m *TranscoderInfo) XXX_Size() int { return xxx_messageInfo_TranscoderInfo.Size(m) @@ -358,7 +364,7 @@ func (m *TranscoderInfo) GetStorage() []*OSInfo { type AuthToken struct { // Signature of the orchestrator over the remaining fields Sig []byte `protobuf:"bytes,1,opt,name=sig,proto3" json:"sig,omitempty"` - JobId string `protobuf:"bytes,16,opt,name=jobId" json:"jobId,omitempty"` + JobId string `protobuf:"bytes,16,opt,name=jobId,proto3" json:"jobId,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -368,16 +374,17 @@ func (m *AuthToken) Reset() { *m = AuthToken{} } func (m *AuthToken) String() string { return proto.CompactTextString(m) } func (*AuthToken) ProtoMessage() {} func (*AuthToken) Descriptor() ([]byte, []int) { - return fileDescriptor_lp_rpc_3f7bcf49dcd292df, []int{5} + return fileDescriptor_034e29c79f9ba827, []int{5} } + func (m *AuthToken) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AuthToken.Unmarshal(m, b) } func (m *AuthToken) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_AuthToken.Marshal(b, m, deterministic) } -func (dst *AuthToken) XXX_Merge(src proto.Message) { - xxx_messageInfo_AuthToken.Merge(dst, src) +func (m *AuthToken) XXX_Merge(src proto.Message) { + xxx_messageInfo_AuthToken.Merge(m, src) } func (m *AuthToken) XXX_Size() int { return xxx_messageInfo_AuthToken.Size(m) @@ -405,14 +412,16 @@ func (m *AuthToken) GetJobId() string { // Data included by the broadcaster when submitting a segment for transcoding. type SegData struct { // Sequence number of the segment to be transcoded - Seq int64 `protobuf:"varint,1,opt,name=seq" json:"seq,omitempty"` + Seq int64 `protobuf:"varint,1,opt,name=seq,proto3" json:"seq,omitempty"` // Hash of the segment data to be transcoded Hash []byte `protobuf:"bytes,2,opt,name=hash,proto3" json:"hash,omitempty"` // Broadcaster signature for the segment. Corresponds to: // broadcaster.sign(streamId | seqNo | dataHash) // where streamId is derived from the jobId - Sig []byte `protobuf:"bytes,3,opt,name=sig,proto3" json:"sig,omitempty"` - Storage []*OSInfo `protobuf:"bytes,4,rep,name=storage" json:"storage,omitempty"` + Sig []byte `protobuf:"bytes,3,opt,name=sig,proto3" json:"sig,omitempty"` + // Rendition string + SegString string `protobuf:"bytes,4,opt,name=segString,proto3" json:"segString,omitempty"` + Storage []*OSInfo `protobuf:"bytes,5,rep,name=storage,proto3" json:"storage,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -422,16 +431,17 @@ func (m *SegData) Reset() { *m = SegData{} } func (m *SegData) String() string { return proto.CompactTextString(m) } func (*SegData) ProtoMessage() {} func (*SegData) Descriptor() ([]byte, []int) { - return fileDescriptor_lp_rpc_3f7bcf49dcd292df, []int{6} + return fileDescriptor_034e29c79f9ba827, []int{6} } + func (m *SegData) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SegData.Unmarshal(m, b) } func (m *SegData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SegData.Marshal(b, m, deterministic) } -func (dst *SegData) XXX_Merge(src proto.Message) { - xxx_messageInfo_SegData.Merge(dst, src) +func (m *SegData) XXX_Merge(src proto.Message) { + xxx_messageInfo_SegData.Merge(m, src) } func (m *SegData) XXX_Size() int { return xxx_messageInfo_SegData.Size(m) @@ -463,6 +473,13 @@ func (m *SegData) GetSig() []byte { return nil } +func (m *SegData) GetSegString() string { + if m != nil { + return m.SegString + } + return "" +} + func (m *SegData) GetStorage() []*OSInfo { if m != nil { return m.Storage @@ -473,7 +490,7 @@ func (m *SegData) GetStorage() []*OSInfo { // Individual transcoded segment data. type TranscodedSegmentData struct { // URL where the transcoded data can be downloaded from. - Url string `protobuf:"bytes,1,opt,name=url" json:"url,omitempty"` + Url string `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -483,16 +500,17 @@ func (m *TranscodedSegmentData) Reset() { *m = TranscodedSegmentData{} } func (m *TranscodedSegmentData) String() string { return proto.CompactTextString(m) } func (*TranscodedSegmentData) ProtoMessage() {} func (*TranscodedSegmentData) Descriptor() ([]byte, []int) { - return fileDescriptor_lp_rpc_3f7bcf49dcd292df, []int{7} + return fileDescriptor_034e29c79f9ba827, []int{7} } + func (m *TranscodedSegmentData) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TranscodedSegmentData.Unmarshal(m, b) } func (m *TranscodedSegmentData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_TranscodedSegmentData.Marshal(b, m, deterministic) } -func (dst *TranscodedSegmentData) XXX_Merge(src proto.Message) { - xxx_messageInfo_TranscodedSegmentData.Merge(dst, src) +func (m *TranscodedSegmentData) XXX_Merge(src proto.Message) { + xxx_messageInfo_TranscodedSegmentData.Merge(m, src) } func (m *TranscodedSegmentData) XXX_Size() int { return xxx_messageInfo_TranscodedSegmentData.Size(m) @@ -513,7 +531,7 @@ func (m *TranscodedSegmentData) GetUrl() string { // A set of transcoded segments following the profiles specified in the job. type TranscodeData struct { // Transcoded data, in the order specified in the job options - Segments []*TranscodedSegmentData `protobuf:"bytes,1,rep,name=segments" json:"segments,omitempty"` + Segments []*TranscodedSegmentData `protobuf:"bytes,1,rep,name=segments,proto3" json:"segments,omitempty"` // Signature of the hash of the concatenated hashes Sig []byte `protobuf:"bytes,2,opt,name=sig,proto3" json:"sig,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -525,16 +543,17 @@ func (m *TranscodeData) Reset() { *m = TranscodeData{} } func (m *TranscodeData) String() string { return proto.CompactTextString(m) } func (*TranscodeData) ProtoMessage() {} func (*TranscodeData) Descriptor() ([]byte, []int) { - return fileDescriptor_lp_rpc_3f7bcf49dcd292df, []int{8} + return fileDescriptor_034e29c79f9ba827, []int{8} } + func (m *TranscodeData) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TranscodeData.Unmarshal(m, b) } func (m *TranscodeData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_TranscodeData.Marshal(b, m, deterministic) } -func (dst *TranscodeData) XXX_Merge(src proto.Message) { - xxx_messageInfo_TranscodeData.Merge(dst, src) +func (m *TranscodeData) XXX_Merge(src proto.Message) { + xxx_messageInfo_TranscodeData.Merge(m, src) } func (m *TranscodeData) XXX_Size() int { return xxx_messageInfo_TranscodeData.Size(m) @@ -562,7 +581,7 @@ func (m *TranscodeData) GetSig() []byte { // Response that a transcoder sends after transcoding a segment. type TranscodeResult struct { // Sequence number of the transcoded results. - Seq int64 `protobuf:"varint,1,opt,name=seq" json:"seq,omitempty"` + Seq int64 `protobuf:"varint,1,opt,name=seq,proto3" json:"seq,omitempty"` // Result of transcoding can be an error, or successful with more info // // Types that are valid to be assigned to Result: @@ -578,16 +597,17 @@ func (m *TranscodeResult) Reset() { *m = TranscodeResult{} } func (m *TranscodeResult) String() string { return proto.CompactTextString(m) } func (*TranscodeResult) ProtoMessage() {} func (*TranscodeResult) Descriptor() ([]byte, []int) { - return fileDescriptor_lp_rpc_3f7bcf49dcd292df, []int{9} + return fileDescriptor_034e29c79f9ba827, []int{9} } + func (m *TranscodeResult) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TranscodeResult.Unmarshal(m, b) } func (m *TranscodeResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_TranscodeResult.Marshal(b, m, deterministic) } -func (dst *TranscodeResult) XXX_Merge(src proto.Message) { - xxx_messageInfo_TranscodeResult.Merge(dst, src) +func (m *TranscodeResult) XXX_Merge(src proto.Message) { + xxx_messageInfo_TranscodeResult.Merge(m, src) } func (m *TranscodeResult) XXX_Size() int { return xxx_messageInfo_TranscodeResult.Size(m) @@ -598,19 +618,28 @@ func (m *TranscodeResult) XXX_DiscardUnknown() { var xxx_messageInfo_TranscodeResult proto.InternalMessageInfo +func (m *TranscodeResult) GetSeq() int64 { + if m != nil { + return m.Seq + } + return 0 +} + type isTranscodeResult_Result interface { isTranscodeResult_Result() } type TranscodeResult_Error struct { - Error string `protobuf:"bytes,2,opt,name=error,oneof"` + Error string `protobuf:"bytes,2,opt,name=error,proto3,oneof"` } + type TranscodeResult_Data struct { - Data *TranscodeData `protobuf:"bytes,3,opt,name=data,oneof"` + Data *TranscodeData `protobuf:"bytes,3,opt,name=data,proto3,oneof"` } func (*TranscodeResult_Error) isTranscodeResult_Result() {} -func (*TranscodeResult_Data) isTranscodeResult_Result() {} + +func (*TranscodeResult_Data) isTranscodeResult_Result() {} func (m *TranscodeResult) GetResult() isTranscodeResult_Result { if m != nil { @@ -619,13 +648,6 @@ func (m *TranscodeResult) GetResult() isTranscodeResult_Result { return nil } -func (m *TranscodeResult) GetSeq() int64 { - if m != nil { - return m.Seq - } - return 0 -} - func (m *TranscodeResult) GetError() string { if x, ok := m.GetResult().(*TranscodeResult_Error); ok { return x.Error @@ -713,7 +735,7 @@ func _TranscodeResult_OneofSizer(msg proto.Message) (n int) { // Sent by the transcoder to register itself to the orchestrator. type RegisterRequest struct { // Shared secret for auth - Secret string `protobuf:"bytes,1,opt,name=secret" json:"secret,omitempty"` + Secret string `protobuf:"bytes,1,opt,name=secret,proto3" json:"secret,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -723,16 +745,17 @@ func (m *RegisterRequest) Reset() { *m = RegisterRequest{} } func (m *RegisterRequest) String() string { return proto.CompactTextString(m) } func (*RegisterRequest) ProtoMessage() {} func (*RegisterRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_lp_rpc_3f7bcf49dcd292df, []int{10} + return fileDescriptor_034e29c79f9ba827, []int{10} } + func (m *RegisterRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RegisterRequest.Unmarshal(m, b) } func (m *RegisterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RegisterRequest.Marshal(b, m, deterministic) } -func (dst *RegisterRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_RegisterRequest.Merge(dst, src) +func (m *RegisterRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_RegisterRequest.Merge(m, src) } func (m *RegisterRequest) XXX_Size() int { return xxx_messageInfo_RegisterRequest.Size(m) @@ -752,8 +775,8 @@ func (m *RegisterRequest) GetSecret() string { // Sent by the transcoder type NotifySegment struct { - Url string `protobuf:"bytes,1,opt,name=url" json:"url,omitempty"` - TaskId int64 `protobuf:"varint,16,opt,name=taskId" json:"taskId,omitempty"` + Url string `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"` + TaskId int64 `protobuf:"varint,16,opt,name=taskId,proto3" json:"taskId,omitempty"` Profiles []byte `protobuf:"bytes,17,opt,name=profiles,proto3" json:"profiles,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -764,16 +787,17 @@ func (m *NotifySegment) Reset() { *m = NotifySegment{} } func (m *NotifySegment) String() string { return proto.CompactTextString(m) } func (*NotifySegment) ProtoMessage() {} func (*NotifySegment) Descriptor() ([]byte, []int) { - return fileDescriptor_lp_rpc_3f7bcf49dcd292df, []int{11} + return fileDescriptor_034e29c79f9ba827, []int{11} } + func (m *NotifySegment) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_NotifySegment.Unmarshal(m, b) } func (m *NotifySegment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_NotifySegment.Marshal(b, m, deterministic) } -func (dst *NotifySegment) XXX_Merge(src proto.Message) { - xxx_messageInfo_NotifySegment.Merge(dst, src) +func (m *NotifySegment) XXX_Merge(src proto.Message) { + xxx_messageInfo_NotifySegment.Merge(m, src) } func (m *NotifySegment) XXX_Size() int { return xxx_messageInfo_NotifySegment.Size(m) @@ -806,6 +830,7 @@ func (m *NotifySegment) GetProfiles() []byte { } func init() { + proto.RegisterEnum("net.OSInfo_StorageType", OSInfo_StorageType_name, OSInfo_StorageType_value) proto.RegisterType((*PingPong)(nil), "net.PingPong") proto.RegisterType((*TranscoderRequest)(nil), "net.TranscoderRequest") proto.RegisterType((*OSInfo)(nil), "net.OSInfo") @@ -819,7 +844,58 @@ func init() { proto.RegisterType((*TranscodeResult)(nil), "net.TranscodeResult") proto.RegisterType((*RegisterRequest)(nil), "net.RegisterRequest") proto.RegisterType((*NotifySegment)(nil), "net.NotifySegment") - proto.RegisterEnum("net.OSInfo_StorageType", OSInfo_StorageType_name, OSInfo_StorageType_value) +} + +func init() { proto.RegisterFile("net/lp_rpc.proto", fileDescriptor_034e29c79f9ba827) } + +var fileDescriptor_034e29c79f9ba827 = []byte{ + // 729 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x54, 0xdd, 0x4e, 0x1b, 0x39, + 0x14, 0x66, 0xf2, 0x33, 0x24, 0x27, 0x24, 0x04, 0x2f, 0x9b, 0x1d, 0x45, 0xab, 0x55, 0x34, 0x5a, + 0x56, 0x41, 0x2b, 0x65, 0x57, 0x89, 0xb4, 0xda, 0x56, 0x48, 0x85, 0x02, 0x2d, 0xb9, 0x01, 0xe4, + 0xa1, 0x17, 0xbd, 0xaa, 0x4c, 0xe6, 0x64, 0x32, 0x65, 0x18, 0x07, 0xdb, 0xa9, 0x9a, 0x3e, 0x40, + 0xdf, 0xa0, 0xea, 0x3b, 0xf4, 0x29, 0x2b, 0x7b, 0x7e, 0x43, 0xe9, 0x9d, 0xbf, 0xe3, 0xf3, 0x1d, + 0xfb, 0xfb, 0xce, 0xb1, 0xa1, 0x1b, 0xa3, 0xfa, 0x27, 0x5a, 0xbe, 0x13, 0xcb, 0xd9, 0x68, 0x29, + 0xb8, 0xe2, 0xa4, 0x1a, 0xa3, 0x72, 0x07, 0xd0, 0xb8, 0x0e, 0xe3, 0xe0, 0x9a, 0xc7, 0x01, 0xd9, + 0x87, 0xfa, 0x07, 0x16, 0xad, 0xd0, 0xb1, 0x06, 0xd6, 0x70, 0x87, 0x26, 0xc0, 0x7d, 0x01, 0x7b, + 0x37, 0x82, 0xc5, 0x72, 0xc6, 0x7d, 0x14, 0x14, 0x1f, 0x56, 0x28, 0x15, 0x71, 0x60, 0x9b, 0xf9, + 0xbe, 0x40, 0x29, 0x4d, 0x72, 0x93, 0x66, 0x90, 0x74, 0xa1, 0x2a, 0xc3, 0xc0, 0xa9, 0x98, 0x12, + 0x7a, 0xe9, 0x7e, 0xb5, 0xc0, 0xbe, 0xf2, 0xa6, 0xf1, 0x9c, 0x93, 0x67, 0xd0, 0x92, 0x8a, 0x0b, + 0x16, 0xe0, 0xcd, 0x7a, 0x99, 0x9c, 0xd3, 0x19, 0xff, 0x36, 0x8a, 0x51, 0x8d, 0x92, 0x8c, 0x91, + 0x57, 0x6c, 0xd3, 0x72, 0x2e, 0x39, 0x00, 0x5b, 0x4e, 0xc2, 0x78, 0xce, 0x9d, 0xee, 0xc0, 0x1a, + 0xb6, 0xc6, 0x6d, 0xc3, 0xf2, 0x26, 0x09, 0x8f, 0xa6, 0x9b, 0xee, 0xdf, 0xd0, 0x2a, 0x95, 0x20, + 0x00, 0xf6, 0xd9, 0x94, 0x9e, 0x9f, 0xde, 0x74, 0xb7, 0x88, 0x0d, 0x15, 0x6f, 0xd2, 0xb5, 0x48, + 0x03, 0x6a, 0xd3, 0xeb, 0x57, 0x5e, 0xb7, 0xe2, 0x7e, 0xb3, 0xa0, 0x91, 0x55, 0x20, 0x04, 0x6a, + 0x0b, 0x2e, 0x55, 0xaa, 0xc7, 0xac, 0xb5, 0x98, 0x3b, 0x5c, 0x1b, 0x31, 0x4d, 0xaa, 0x97, 0xa4, + 0x07, 0xf6, 0x92, 0x47, 0xe1, 0x6c, 0xed, 0x54, 0x4d, 0x30, 0x45, 0xe4, 0x77, 0x68, 0xca, 0x30, + 0x88, 0x99, 0x5a, 0x09, 0x74, 0x6a, 0x66, 0xab, 0x08, 0x90, 0xbf, 0xa0, 0xf3, 0xf1, 0xe4, 0xfe, + 0xd3, 0xa9, 0x40, 0x1f, 0x63, 0x15, 0xb2, 0xc8, 0xa9, 0x9b, 0x94, 0x47, 0x51, 0xd2, 0x87, 0x86, + 0x8e, 0x9c, 0x31, 0x85, 0x8e, 0x6d, 0x32, 0x72, 0xec, 0x7e, 0xa9, 0x40, 0xa7, 0x68, 0x84, 0xb9, + 0xf2, 0x1f, 0x00, 0x2a, 0x8f, 0xa4, 0x17, 0x2f, 0x45, 0x74, 0x39, 0xb6, 0x52, 0x0b, 0xe3, 0x75, + 0xa2, 0x21, 0xc7, 0x64, 0x00, 0xad, 0x59, 0x7e, 0xb0, 0x4c, 0xd5, 0x94, 0x43, 0xe4, 0x18, 0x9a, + 0x52, 0x09, 0x64, 0xf7, 0x53, 0x5f, 0x3a, 0xdd, 0x41, 0x75, 0xd8, 0x1a, 0xbb, 0xc6, 0xf4, 0xcd, + 0x5b, 0x8c, 0xbc, 0x2c, 0xe9, 0x3c, 0x56, 0x62, 0x4d, 0x0b, 0x12, 0x39, 0x80, 0xed, 0xb4, 0x85, + 0xce, 0xc0, 0xf0, 0x5b, 0xa5, 0x56, 0xd3, 0x6c, 0xaf, 0x7f, 0x04, 0x9d, 0xcd, 0x1a, 0x99, 0xef, + 0x56, 0xe1, 0x7b, 0x3e, 0x9b, 0x89, 0x8e, 0x04, 0x3c, 0xaf, 0xfc, 0x6f, 0xb9, 0x13, 0x68, 0x9e, + 0x68, 0x51, 0xfc, 0x0e, 0xe3, 0x6c, 0xfa, 0xac, 0x7c, 0xfa, 0x34, 0xf1, 0x3d, 0xbf, 0x9d, 0xfa, + 0x66, 0x6c, 0x9a, 0x34, 0x01, 0xee, 0x67, 0x0b, 0xb6, 0x3d, 0x0c, 0xce, 0x98, 0x62, 0x86, 0x83, + 0x0f, 0x86, 0x53, 0xa5, 0x7a, 0x69, 0x46, 0x81, 0xc9, 0x45, 0x3a, 0xc4, 0x66, 0x9d, 0x55, 0xae, + 0x16, 0x95, 0x75, 0xcb, 0x31, 0xf0, 0x94, 0x08, 0xe3, 0x20, 0x6f, 0x79, 0x16, 0x28, 0x6b, 0xaf, + 0xff, 0x5c, 0xbb, 0x7b, 0x08, 0xbf, 0xe6, 0x76, 0xfa, 0x1e, 0x06, 0xf7, 0x18, 0xab, 0xec, 0x56, + 0x2b, 0x11, 0x65, 0x16, 0xac, 0x44, 0xe4, 0xbe, 0x85, 0x76, 0x9e, 0x6a, 0x52, 0xfe, 0x83, 0x86, + 0x4c, 0x18, 0xfa, 0x15, 0xea, 0x33, 0xfa, 0x9b, 0xfd, 0x29, 0x17, 0xa4, 0x79, 0xee, 0x13, 0x4f, + 0x94, 0xc3, 0x6e, 0x4e, 0xa2, 0x28, 0x57, 0x91, 0x7a, 0xc2, 0x95, 0x1e, 0xd4, 0x51, 0x08, 0x2e, + 0x92, 0x16, 0x5c, 0x6c, 0xd1, 0x04, 0x92, 0x21, 0xd4, 0x7c, 0xa6, 0x98, 0xb1, 0xa6, 0x35, 0x26, + 0x9b, 0x57, 0xd0, 0x47, 0x5f, 0x6c, 0x51, 0x93, 0xf1, 0xb2, 0x01, 0xb6, 0x30, 0xd5, 0xdd, 0x43, + 0xd8, 0xa5, 0x18, 0x84, 0x52, 0x15, 0x5f, 0x4a, 0x0f, 0x6c, 0x89, 0x33, 0x81, 0xd9, 0x0b, 0x4c, + 0x91, 0xfb, 0x06, 0xda, 0x97, 0x5c, 0x85, 0xf3, 0x75, 0x2a, 0xe6, 0x47, 0x67, 0x34, 0x55, 0x31, + 0x79, 0x97, 0x36, 0xb9, 0x4a, 0x53, 0xa4, 0xe7, 0x7f, 0x29, 0xf8, 0x3c, 0x8c, 0x50, 0x3a, 0x7b, + 0x46, 0x6d, 0x8e, 0xc7, 0x02, 0x76, 0xae, 0xc4, 0x6c, 0x81, 0x52, 0x09, 0xa6, 0xb8, 0x20, 0x47, + 0xd0, 0x7e, 0x8d, 0xaa, 0x18, 0x6d, 0xd2, 0x7b, 0x34, 0xeb, 0xe9, 0x3d, 0xfb, 0xbf, 0x3c, 0xf1, + 0x06, 0xc8, 0x9f, 0x50, 0xd3, 0xdf, 0x28, 0x49, 0x7e, 0xa5, 0xec, 0x47, 0xed, 0x6f, 0xc2, 0xf1, + 0x25, 0x40, 0xe9, 0x80, 0x63, 0x20, 0x99, 0x07, 0xa5, 0xe8, 0xbe, 0xa1, 0x3c, 0x32, 0xa7, 0x9f, + 0xb8, 0xba, 0xe1, 0xc3, 0xbf, 0xd6, 0xad, 0x6d, 0x3e, 0xf2, 0xc9, 0xf7, 0x00, 0x00, 0x00, 0xff, + 0xff, 0xc8, 0xc2, 0xff, 0x72, 0xdc, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1023,54 +1099,3 @@ var _Transcoder_serviceDesc = grpc.ServiceDesc{ }, Metadata: "net/lp_rpc.proto", } - -func init() { proto.RegisterFile("net/lp_rpc.proto", fileDescriptor_lp_rpc_3f7bcf49dcd292df) } - -var fileDescriptor_lp_rpc_3f7bcf49dcd292df = []byte{ - // 712 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x54, 0x5d, 0x4f, 0x1b, 0x3b, - 0x10, 0x65, 0x93, 0xb0, 0x24, 0x13, 0x12, 0x82, 0x2f, 0x37, 0x77, 0x15, 0x5d, 0x5d, 0x45, 0xab, - 0x4b, 0x15, 0x54, 0x29, 0xad, 0x12, 0xa9, 0x6a, 0x2b, 0xa4, 0x42, 0x81, 0x96, 0xbc, 0x00, 0xf2, - 0xd2, 0x87, 0x3e, 0x55, 0x26, 0x3b, 0xd9, 0x6c, 0x59, 0xd6, 0xc1, 0x76, 0xaa, 0xa6, 0xff, 0xa3, - 0xea, 0x7f, 0xe8, 0xaf, 0xac, 0xec, 0xfd, 0x0c, 0xa5, 0x6f, 0x3e, 0xe3, 0x39, 0x33, 0x3e, 0xc7, - 0x63, 0x43, 0x27, 0x46, 0xf5, 0x2c, 0x5a, 0x7c, 0x12, 0x8b, 0xe9, 0x70, 0x21, 0xb8, 0xe2, 0xa4, - 0x1a, 0xa3, 0x72, 0xfb, 0x50, 0xbf, 0x0a, 0xe3, 0xe0, 0x8a, 0xc7, 0x01, 0xd9, 0x83, 0xcd, 0x2f, - 0x2c, 0x5a, 0xa2, 0x63, 0xf5, 0xad, 0xc1, 0x36, 0x4d, 0x80, 0xfb, 0x06, 0x76, 0xaf, 0x05, 0x8b, - 0xe5, 0x94, 0xfb, 0x28, 0x28, 0xde, 0x2f, 0x51, 0x2a, 0xe2, 0xc0, 0x16, 0xf3, 0x7d, 0x81, 0x52, - 0x9a, 0xe4, 0x06, 0xcd, 0x20, 0xe9, 0x40, 0x55, 0x86, 0x81, 0x53, 0x31, 0x25, 0xf4, 0xd2, 0xfd, - 0x61, 0x81, 0x7d, 0xe9, 0x4d, 0xe2, 0x19, 0x27, 0xaf, 0xa0, 0x29, 0x15, 0x17, 0x2c, 0xc0, 0xeb, - 0xd5, 0x22, 0xe9, 0xd3, 0x1e, 0xfd, 0x33, 0x8c, 0x51, 0x0d, 0x93, 0x8c, 0xa1, 0x57, 0x6c, 0xd3, - 0x72, 0x2e, 0xd9, 0x07, 0x5b, 0x8e, 0xc3, 0x78, 0xc6, 0x9d, 0x4e, 0xdf, 0x1a, 0x34, 0x47, 0x2d, - 0xc3, 0xf2, 0xc6, 0x09, 0x8f, 0xa6, 0x9b, 0xee, 0x53, 0x68, 0x96, 0x4a, 0x10, 0x00, 0xfb, 0x74, - 0x42, 0xcf, 0x4e, 0xae, 0x3b, 0x1b, 0xc4, 0x86, 0x8a, 0x37, 0xee, 0x58, 0xa4, 0x0e, 0xb5, 0xc9, - 0xd5, 0x3b, 0xaf, 0x53, 0x71, 0x7f, 0x5a, 0x50, 0xcf, 0x2a, 0x10, 0x02, 0xb5, 0x39, 0x97, 0x2a, - 0xd5, 0x63, 0xd6, 0x5a, 0xcc, 0x2d, 0xae, 0x8c, 0x98, 0x06, 0xd5, 0x4b, 0xd2, 0x05, 0x7b, 0xc1, - 0xa3, 0x70, 0xba, 0x72, 0xaa, 0x26, 0x98, 0x22, 0xf2, 0x2f, 0x34, 0x64, 0x18, 0xc4, 0x4c, 0x2d, - 0x05, 0x3a, 0x35, 0xb3, 0x55, 0x04, 0xc8, 0x13, 0x68, 0x7f, 0x3d, 0xbe, 0xfb, 0x76, 0x22, 0xd0, - 0xc7, 0x58, 0x85, 0x2c, 0x72, 0x36, 0x4d, 0xca, 0x83, 0x28, 0xe9, 0x41, 0x5d, 0x47, 0x4e, 0x99, - 0x42, 0xc7, 0x36, 0x19, 0x39, 0x76, 0xbf, 0x57, 0xa0, 0x5d, 0x5c, 0x84, 0x39, 0xf2, 0x7f, 0x00, - 0x2a, 0x8f, 0xa4, 0x07, 0x2f, 0x45, 0x74, 0x39, 0xb6, 0x54, 0x73, 0xe3, 0x75, 0xa2, 0x21, 0xc7, - 0xa4, 0x0f, 0xcd, 0x69, 0xde, 0x58, 0xa6, 0x6a, 0xca, 0x21, 0x72, 0x04, 0x0d, 0xa9, 0x04, 0xb2, - 0xbb, 0x89, 0x2f, 0x9d, 0x4e, 0xbf, 0x3a, 0x68, 0x8e, 0x5c, 0x63, 0xfa, 0xfa, 0x29, 0x86, 0x5e, - 0x96, 0x74, 0x16, 0x2b, 0xb1, 0xa2, 0x05, 0x89, 0xec, 0xc3, 0x56, 0x7a, 0x85, 0x4e, 0xdf, 0xf0, - 0x9b, 0xa5, 0xab, 0xa6, 0xd9, 0x5e, 0xef, 0x10, 0xda, 0xeb, 0x35, 0x32, 0xdf, 0xad, 0xc2, 0xf7, - 0x7c, 0x36, 0x13, 0x1d, 0x09, 0x78, 0x5d, 0x79, 0x69, 0xb9, 0x63, 0x68, 0x1c, 0x6b, 0x51, 0xfc, - 0x16, 0xe3, 0x6c, 0xfa, 0xac, 0x7c, 0xfa, 0x34, 0xf1, 0x33, 0xbf, 0x99, 0xf8, 0x66, 0x6c, 0x1a, - 0x34, 0x01, 0xee, 0x1c, 0xb6, 0x3c, 0x0c, 0x4e, 0x99, 0x62, 0x86, 0x82, 0xf7, 0x86, 0x52, 0xa5, - 0x7a, 0x69, 0x26, 0x81, 0xc9, 0x79, 0x3a, 0xc3, 0x66, 0x9d, 0x15, 0xae, 0x16, 0x85, 0x4b, 0xe2, - 0x6a, 0x7f, 0x16, 0xe7, 0x1e, 0xc0, 0xdf, 0xb9, 0x5f, 0xbe, 0x87, 0xc1, 0x1d, 0xc6, 0x2a, 0xeb, - 0xbb, 0x14, 0x51, 0xa6, 0x71, 0x29, 0x22, 0xf7, 0x23, 0xb4, 0xf2, 0x54, 0x93, 0xf2, 0x02, 0xea, - 0x32, 0x61, 0xe8, 0x67, 0xa6, 0x7b, 0xf4, 0xd6, 0x2f, 0xa0, 0x5c, 0x90, 0xe6, 0xb9, 0x8f, 0xbc, - 0x41, 0x0e, 0x3b, 0x39, 0x89, 0xa2, 0x5c, 0x46, 0xea, 0x11, 0xdd, 0x5d, 0xd8, 0x44, 0x21, 0xb8, - 0x48, 0x3c, 0x3e, 0xdf, 0xa0, 0x09, 0x24, 0x03, 0xa8, 0xf9, 0x4c, 0x31, 0x23, 0xbe, 0x39, 0x22, - 0xeb, 0x47, 0xd0, 0xad, 0xcf, 0x37, 0xa8, 0xc9, 0x78, 0x5b, 0x07, 0x5b, 0x98, 0xea, 0xee, 0x01, - 0xec, 0x50, 0x0c, 0x42, 0xa9, 0x8a, 0x3f, 0xa3, 0x0b, 0xb6, 0xc4, 0xa9, 0xc0, 0xec, 0x89, 0xa5, - 0xc8, 0xfd, 0x00, 0xad, 0x0b, 0xae, 0xc2, 0xd9, 0x2a, 0x15, 0xf3, 0xbb, 0x33, 0x9a, 0xaa, 0x98, - 0xbc, 0x4d, 0x6f, 0xb1, 0x4a, 0x53, 0xa4, 0x07, 0x7c, 0x21, 0xf8, 0x2c, 0x8c, 0x50, 0x3a, 0xbb, - 0x46, 0x6d, 0x8e, 0x47, 0x02, 0xb6, 0x2f, 0xc5, 0x74, 0x8e, 0x52, 0x09, 0xa6, 0xb8, 0x20, 0x87, - 0xd0, 0x7a, 0x8f, 0xaa, 0x98, 0x5d, 0xd2, 0x7d, 0x30, 0xcc, 0xe9, 0x39, 0x7b, 0x7f, 0x3d, 0x32, - 0xe4, 0xe4, 0x7f, 0xa8, 0xe9, 0x7f, 0x92, 0x24, 0xdf, 0x4e, 0xf6, 0x65, 0xf6, 0xd6, 0xe1, 0xe8, - 0x02, 0xa0, 0xd4, 0xe0, 0x08, 0x48, 0xe6, 0x41, 0x29, 0xba, 0x67, 0x28, 0x0f, 0xcc, 0xe9, 0x25, - 0xae, 0xae, 0xf9, 0xf0, 0xdc, 0xba, 0xb1, 0xcd, 0x4f, 0x3d, 0xfe, 0x15, 0x00, 0x00, 0xff, 0xff, - 0x6a, 0xe0, 0x88, 0x8c, 0xbd, 0x05, 0x00, 0x00, -} diff --git a/net/lp_rpc.proto b/net/lp_rpc.proto index 8146556eb2..598bd70ad7 100644 --- a/net/lp_rpc.proto +++ b/net/lp_rpc.proto @@ -122,7 +122,10 @@ message SegData { // where streamId is derived from the jobId bytes sig = 3; - repeated OSInfo storage = 4; + // Rendition string + string segString = 4; + + repeated OSInfo storage = 5; } // Individual transcoded segment data. diff --git a/server/rpc.go b/server/rpc.go index 370d57ab01..e0549b01fd 100644 --- a/server/rpc.go +++ b/server/rpc.go @@ -196,6 +196,7 @@ func genSegCreds(bcast Broadcaster, streamId string, segData *net.SegData) (stri StreamID: streamId, SegmentSequenceNumber: big.NewInt(segData.Seq), DataHash: ethcommon.BytesToHash(segData.Hash), + SegmentString: fmt.Sprintf("%x", segData.SegString) } sig, err := bcast.Sign(seg.Flatten()) if err != nil {