diff --git a/core/lb.go b/core/lb.go index 6f80b9bfea..9cb29efc0c 100644 --- a/core/lb.go +++ b/core/lb.go @@ -72,6 +72,13 @@ func (lb *LoadBalancingTranscoder) Transcode(ctx context.Context, md *SegTransco lb.mu.RUnlock() if exists { clog.V(common.DEBUG).Infof(ctx, "LB: Using existing transcode session for key=%s", session.key) + if md != nil && md.SegmentParameters != nil && md.SegmentParameters.ForceSessionReinit { + // Broadcaster requested HW session reinitialization + lb.mu.Lock() + session.transcoder.Stop() + session.transcoder = lb.newT(lb.leastLoaded()) + lb.mu.Unlock() + } } else { var err error if len(md.DetectorProfiles) > 0 { diff --git a/core/streamdata.go b/core/streamdata.go index 6066da7a32..8013ee1951 100644 --- a/core/streamdata.go +++ b/core/streamdata.go @@ -51,11 +51,16 @@ func (s *StreamParameters) StreamID() string { return string(s.ManifestID) + "/" + s.RtmpKey } -type SegmentParameters struct { +type SegmentClip struct { From time.Duration To time.Duration } +type SegmentParameters struct { + Clip *SegmentClip + ForceSessionReinit bool +} + type SegTranscodingMetadata struct { ManifestID ManifestID Fname string @@ -135,9 +140,12 @@ func NetSegData(md *SegTranscodingMetadata) (*net.SegData, error) { Profiles: []byte("invalid"), } if md.SegmentParameters != nil { - segData.SegmentParameters = &net.SegParameters{ - From: uint64(md.SegmentParameters.From.Milliseconds()), - To: uint64(md.SegmentParameters.To.Milliseconds()), + segData.ForceSessionReinit = md.SegmentParameters.ForceSessionReinit + if md.SegmentParameters.Clip != nil { + segData.SegmentParameters = &net.SegParameters{ + From: uint64(md.SegmentParameters.Clip.From.Milliseconds()), + To: uint64(md.SegmentParameters.Clip.To.Milliseconds()), + } } } diff --git a/core/transcoder.go b/core/transcoder.go index 883ebeb971..f40fb74410 100644 --- a/core/transcoder.go +++ b/core/transcoder.go @@ -500,9 +500,9 @@ func profilesToTranscodeOptions(workDir string, accel ffmpeg.Acceleration, profi AudioEncoder: ffmpeg.ComponentOptions{Name: "copy"}, CalcSign: calcPHash, } - if segPar != nil { - o.From = segPar.From - o.To = segPar.To + if segPar != nil && segPar.Clip != nil { + o.From = segPar.Clip.From + o.To = segPar.Clip.To } opts[i] = o } diff --git a/net/lp_rpc.pb.go b/net/lp_rpc.pb.go index ca1e84e267..3eb12ebb00 100644 --- a/net/lp_rpc.pb.go +++ b/net/lp_rpc.pb.go @@ -973,6 +973,8 @@ type SegData struct { FullProfiles3 []*VideoProfile `protobuf:"bytes,35,rep,name=fullProfiles3,proto3" json:"fullProfiles3,omitempty"` // Transcoding parameters specific to this segment SegmentParameters *SegParameters `protobuf:"bytes,37,opt,name=segment_parameters,json=segmentParameters,proto3" json:"segment_parameters,omitempty"` + // Force HW Session Reinit + ForceSessionReinit bool `protobuf:"varint,38,opt,name=ForceSessionReinit,proto3" json:"ForceSessionReinit,omitempty"` // [EXPERIMENTAL] // Detector profiles to use DetectorProfiles []*DetectorProfile `protobuf:"bytes,36,rep,name=detector_profiles,json=detectorProfiles,proto3" json:"detector_profiles,omitempty"` @@ -1111,6 +1113,13 @@ func (m *SegData) GetSegmentParameters() *SegParameters { return nil } +func (m *SegData) GetForceSessionReinit() bool { + if m != nil { + return m.ForceSessionReinit + } + return false +} + func (m *SegData) GetDetectorProfiles() []*DetectorProfile { if m != nil { return m.DetectorProfiles @@ -2092,138 +2101,139 @@ func init() { } var fileDescriptor_034e29c79f9ba827 = []byte{ - // 2086 bytes of a gzipped FileDescriptorProto + // 2101 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x58, 0xdd, 0x6e, 0xdb, 0xc8, - 0xf5, 0x37, 0x25, 0x59, 0x1f, 0x47, 0x92, 0x4d, 0x4f, 0x1c, 0x87, 0xf1, 0x26, 0x1b, 0x87, 0x9b, - 0xfc, 0x91, 0x05, 0x76, 0xbd, 0x81, 0x9c, 0xe4, 0xbf, 0x29, 0x50, 0xa0, 0xb2, 0xad, 0xb5, 0xb5, - 0x88, 0x6d, 0x75, 0xe4, 0xe4, 0xb2, 0x2a, 0x4d, 0x8e, 0x24, 0xd6, 0x14, 0xc9, 0x70, 0x46, 0x4d, - 0xbc, 0xe8, 0x0b, 0xb4, 0x6f, 0xd0, 0xde, 0x14, 0x28, 0x50, 0xf4, 0xbe, 0x4f, 0xd0, 0x07, 0xe8, - 0x03, 0xf4, 0xae, 0xaf, 0x52, 0xcc, 0x99, 0x21, 0x45, 0x5a, 0xce, 0x07, 0xf6, 0x6e, 0xce, 0xc7, - 0xcc, 0x39, 0x73, 0xe6, 0x9c, 0x33, 0xbf, 0x19, 0x30, 0x43, 0x26, 0xbe, 0x0b, 0xe2, 0x51, 0x12, - 0xbb, 0xbb, 0x71, 0x12, 0x89, 0x88, 0x94, 0x43, 0x26, 0xec, 0x1d, 0xa8, 0x0f, 0xfc, 0x70, 0x32, - 0x88, 0xc2, 0x09, 0xd9, 0x84, 0xd5, 0xdf, 0x3b, 0xc1, 0x9c, 0x59, 0xc6, 0x8e, 0xf1, 0xa4, 0x45, - 0x15, 0x61, 0x9f, 0xc0, 0xbd, 0x5e, 0xe8, 0x9d, 0x27, 0x4e, 0xc8, 0xdd, 0xc8, 0xf3, 0xc3, 0xc9, - 0x90, 0x71, 0xee, 0x47, 0x21, 0x65, 0x6f, 0xe7, 0x8c, 0x0b, 0xf2, 0x2d, 0x80, 0x33, 0x17, 0xd3, - 0x91, 0x88, 0x2e, 0x59, 0x88, 0x53, 0x9b, 0x9d, 0xb5, 0xdd, 0x90, 0x89, 0xdd, 0xee, 0x5c, 0x4c, - 0xcf, 0x25, 0x97, 0x36, 0x9c, 0x74, 0x68, 0x3f, 0x80, 0xfb, 0x1f, 0x58, 0x8e, 0xc7, 0x51, 0xc8, - 0x99, 0xdd, 0x85, 0x5b, 0x67, 0x89, 0x3b, 0x65, 0x5c, 0x24, 0x8e, 0x88, 0x92, 0xd4, 0x8c, 0x05, - 0x35, 0xc7, 0xf3, 0x12, 0xc6, 0xb9, 0x76, 0x2f, 0x25, 0x89, 0x09, 0x65, 0xee, 0x4f, 0xac, 0x12, - 0x72, 0xe5, 0xd0, 0xfe, 0xb3, 0x01, 0xd5, 0xb3, 0x61, 0x3f, 0x1c, 0x47, 0xe4, 0x25, 0x34, 0xb9, - 0x88, 0x12, 0x67, 0xc2, 0xce, 0xaf, 0x62, 0xb5, 0xb3, 0xb5, 0xce, 0x1d, 0x74, 0x4f, 0x69, 0xec, - 0x0e, 0x17, 0x62, 0x9a, 0xd7, 0x25, 0x8f, 0xa1, 0xca, 0xf7, 0xfc, 0x70, 0x1c, 0x59, 0x26, 0x6e, - 0xaa, 0x8d, 0xb3, 0x86, 0x7b, 0x6a, 0x1e, 0xd5, 0x42, 0xfb, 0x5b, 0x68, 0xe6, 0x96, 0x20, 0x00, - 0xd5, 0xc3, 0x3e, 0xed, 0x1d, 0x9c, 0x9b, 0x2b, 0xa4, 0x0a, 0xa5, 0xe1, 0x9e, 0x69, 0x48, 0xde, - 0xd1, 0xd9, 0xd9, 0xd1, 0xab, 0x9e, 0x59, 0xb2, 0xff, 0x66, 0x40, 0x3d, 0x5d, 0x83, 0x10, 0xa8, - 0x4c, 0x23, 0x2e, 0xd0, 0xad, 0x06, 0xc5, 0xb1, 0xdc, 0xce, 0x25, 0xbb, 0xc2, 0xed, 0x34, 0xa8, - 0x1c, 0x92, 0x2d, 0xa8, 0xc6, 0x51, 0xe0, 0xbb, 0x57, 0x56, 0x19, 0x99, 0x9a, 0x22, 0xf7, 0xa0, - 0xc1, 0xfd, 0x49, 0xe8, 0x88, 0x79, 0xc2, 0xac, 0x0a, 0x8a, 0x16, 0x0c, 0xf2, 0x25, 0x80, 0x9b, - 0x30, 0x8f, 0x85, 0xc2, 0x77, 0x02, 0x6b, 0x15, 0xc5, 0x39, 0x0e, 0xd9, 0x86, 0xfa, 0xfb, 0xee, - 0xec, 0xa7, 0x43, 0x47, 0x30, 0xab, 0x8a, 0xd2, 0x8c, 0xb6, 0x5f, 0x43, 0x63, 0x90, 0xf8, 0x2e, - 0x43, 0x27, 0x6d, 0x68, 0xc5, 0x92, 0x18, 0xb0, 0xe4, 0x75, 0xe8, 0x2b, 0x67, 0xcb, 0xb4, 0xc0, - 0x23, 0x8f, 0xa0, 0x1d, 0xfb, 0xef, 0x59, 0xc0, 0x53, 0xa5, 0x12, 0x2a, 0x15, 0x99, 0xf6, 0x7f, - 0x0d, 0x68, 0x1d, 0x38, 0xb1, 0x73, 0xe1, 0x07, 0xbe, 0xf0, 0x19, 0x97, 0x3b, 0xb8, 0xf0, 0x05, - 0x17, 0x89, 0x1f, 0x4e, 0x2c, 0x63, 0xa7, 0xfc, 0xa4, 0x42, 0x17, 0x0c, 0xb2, 0x03, 0xcd, 0x99, - 0x13, 0x7a, 0x32, 0x0b, 0x7c, 0xc6, 0xad, 0x12, 0xca, 0xf3, 0x2c, 0xd2, 0x05, 0x70, 0x9d, 0xd8, - 0x71, 0x71, 0x35, 0xab, 0xbc, 0x53, 0x7e, 0xd2, 0xec, 0x3c, 0xc4, 0x63, 0xca, 0x9b, 0x41, 0x42, - 0xe9, 0xf4, 0x42, 0x91, 0x5c, 0xd1, 0xdc, 0xa4, 0xed, 0x5f, 0xc2, 0xfa, 0x35, 0x71, 0x7a, 0x02, - 0x72, 0x9f, 0x6d, 0x75, 0x02, 0x59, 0x65, 0x94, 0x90, 0xa7, 0x88, 0x5f, 0x94, 0xbe, 0x37, 0xb6, - 0xdb, 0xd0, 0x3c, 0x88, 0x42, 0x99, 0xab, 0x7e, 0x28, 0xb8, 0xfd, 0xaf, 0x12, 0x98, 0xf9, 0xec, - 0xc5, 0x00, 0x7e, 0x09, 0x20, 0x74, 0xbe, 0xb3, 0x44, 0x9f, 0x75, 0x8e, 0x43, 0x5e, 0x40, 0x5b, - 0xf8, 0xee, 0x25, 0x13, 0xa3, 0xd8, 0x49, 0x9c, 0x19, 0x47, 0x2b, 0xcd, 0xce, 0x06, 0x6e, 0xe4, - 0x1c, 0x25, 0x03, 0x14, 0xd0, 0x96, 0xc8, 0x51, 0xb2, 0xf2, 0xf0, 0x10, 0x46, 0x98, 0xa4, 0xe5, - 0x5c, 0xe5, 0x65, 0x87, 0x47, 0x1b, 0x71, 0x76, 0x8e, 0xb9, 0x0a, 0xaa, 0x14, 0x2b, 0xe8, 0x39, - 0xb4, 0xdc, 0x5c, 0xbc, 0x30, 0x59, 0x52, 0xfb, 0xf9, 0x40, 0xd2, 0x82, 0xda, 0xb5, 0xca, 0xaf, - 0x7e, 0xa2, 0xf2, 0xc9, 0x63, 0xa8, 0xe9, 0xf2, 0xb2, 0x76, 0xf0, 0xa4, 0x9a, 0xb9, 0x32, 0xa4, - 0xa9, 0xcc, 0xfe, 0x2d, 0x34, 0xb2, 0xe9, 0x32, 0xf0, 0x8b, 0xbe, 0xd2, 0xa2, 0x8a, 0x20, 0xf7, - 0x01, 0xb8, 0xea, 0x1a, 0x23, 0xdf, 0xd3, 0x95, 0xd2, 0xd0, 0x9c, 0xbe, 0x27, 0xe3, 0xcd, 0xde, - 0xc7, 0x7e, 0xe2, 0x08, 0x3f, 0x0a, 0x31, 0x2e, 0x65, 0x9a, 0xe3, 0xd8, 0x7d, 0x68, 0x1f, 0x32, - 0xc1, 0x5c, 0x11, 0x25, 0x07, 0x81, 0xc3, 0x39, 0xb9, 0x0b, 0x75, 0x57, 0x0e, 0xe4, 0x6a, 0xea, - 0xd4, 0x6b, 0x48, 0xf7, 0x3d, 0x69, 0x4a, 0x89, 0x42, 0x67, 0xc6, 0x52, 0x53, 0xc8, 0x39, 0x75, - 0x66, 0xcc, 0xbe, 0x84, 0xed, 0xa1, 0xcb, 0x42, 0x86, 0xeb, 0xf8, 0x63, 0xdf, 0x45, 0x0b, 0x83, - 0x24, 0x1a, 0xfb, 0x01, 0x23, 0x0f, 0xa0, 0xc9, 0x9d, 0x59, 0x1c, 0xb0, 0x51, 0x22, 0xab, 0x4c, - 0x2d, 0x0d, 0x8a, 0x45, 0x1d, 0xc1, 0xc8, 0x37, 0xa0, 0x0c, 0xe9, 0xec, 0x6e, 0x76, 0x08, 0x86, - 0xa4, 0xe0, 0x1d, 0x4d, 0x55, 0xec, 0x18, 0xd6, 0x53, 0x49, 0x6a, 0xe1, 0x1c, 0x36, 0xb9, 0xb4, - 0x3f, 0x72, 0x0b, 0x0e, 0xe8, 0x36, 0xfc, 0x40, 0x75, 0xac, 0x0f, 0x3a, 0x78, 0xbc, 0x42, 0x6f, - 0xf1, 0x65, 0xe9, 0x7e, 0x4d, 0xa7, 0xbb, 0xfd, 0xcf, 0x55, 0xa8, 0x0d, 0xd9, 0xe4, 0xd0, 0x11, - 0x8e, 0x8c, 0xea, 0xcc, 0x09, 0xfd, 0x31, 0xe3, 0xa2, 0xef, 0xe9, 0xf3, 0xc8, 0x71, 0xb0, 0x0d, - 0xb3, 0xb7, 0xba, 0xf0, 0xe5, 0x10, 0xbb, 0x9b, 0xc3, 0xa7, 0x78, 0x02, 0x2d, 0x8a, 0x63, 0xd9, - 0x75, 0x62, 0x65, 0x3c, 0xcd, 0xc2, 0x8c, 0x4e, 0x1b, 0xf9, 0x6a, 0xd6, 0xc8, 0xa5, 0xb6, 0x37, - 0xd7, 0xe7, 0x28, 0xf3, 0x6b, 0x95, 0x66, 0xf4, 0x52, 0xd2, 0xd6, 0x7e, 0x4e, 0xd2, 0xd6, 0x3f, - 0x95, 0xb4, 0x5f, 0x83, 0xe9, 0xe9, 0x98, 0x8f, 0x58, 0xe8, 0x5c, 0x04, 0xcc, 0xb3, 0x1a, 0x3b, - 0xc6, 0x93, 0x3a, 0x5d, 0x4f, 0xf9, 0x3d, 0xc5, 0x26, 0x4f, 0x61, 0xd3, 0x75, 0x02, 0x77, 0x14, - 0xb3, 0xc4, 0x65, 0xb1, 0x98, 0x3b, 0xc1, 0x08, 0xb7, 0x0f, 0xa8, 0x4e, 0xa4, 0x6c, 0x90, 0x89, - 0x8e, 0x65, 0x30, 0x3e, 0xaf, 0x22, 0xe4, 0x4e, 0xc7, 0xf3, 0x20, 0x18, 0xa4, 0x71, 0x7b, 0x88, - 0xba, 0x6a, 0xa7, 0x6f, 0x7c, 0x8f, 0x45, 0x5a, 0x42, 0x0b, 0x6a, 0xe4, 0xff, 0xa1, 0x9d, 0xa7, - 0x3b, 0x96, 0xfd, 0xa1, 0x79, 0x45, 0xbd, 0xeb, 0x13, 0xf7, 0xac, 0xaf, 0x3e, 0x6b, 0xe2, 0x1e, - 0xe9, 0x02, 0xe1, 0x6c, 0x32, 0x63, 0xa1, 0xee, 0x64, 0x4c, 0xb0, 0x84, 0x5b, 0x8f, 0x31, 0xc6, - 0x2a, 0xb3, 0x87, 0x6c, 0x32, 0xc8, 0x24, 0x74, 0x43, 0x6b, 0x2f, 0x58, 0xa4, 0x0b, 0x1b, 0x59, - 0xbc, 0xb3, 0x44, 0x79, 0x84, 0xf6, 0x37, 0x0b, 0xb5, 0x91, 0xba, 0x90, 0x1d, 0x4f, 0xea, 0x86, - 0xbd, 0x07, 0xed, 0x82, 0x19, 0x99, 0x87, 0xe3, 0x24, 0x9a, 0x61, 0xce, 0x56, 0x28, 0x8e, 0xc9, - 0x1a, 0x94, 0x44, 0x84, 0xc9, 0x5a, 0xa1, 0x25, 0x11, 0xd9, 0xff, 0x5e, 0x85, 0x56, 0x7e, 0x6b, - 0x72, 0x12, 0x96, 0xbc, 0xa9, 0xae, 0x66, 0x39, 0x96, 0xdd, 0xe8, 0x9d, 0xef, 0x89, 0xa9, 0xb5, - 0x81, 0xb9, 0xa8, 0x08, 0x79, 0x3d, 0x4f, 0x99, 0x3f, 0x99, 0x0a, 0x8b, 0x20, 0x5b, 0x53, 0xb2, - 0xdf, 0x5e, 0xf8, 0x02, 0x2b, 0xff, 0x16, 0x0a, 0x52, 0x52, 0x26, 0xfa, 0x38, 0xe6, 0xd6, 0xa6, - 0xba, 0x60, 0xc6, 0x31, 0x27, 0x4f, 0xa1, 0x3a, 0x8e, 0x92, 0x99, 0x23, 0xac, 0xdb, 0x88, 0x50, - 0xac, 0xa5, 0x58, 0xef, 0xfe, 0x80, 0x72, 0xaa, 0xf5, 0xa4, 0xd5, 0x71, 0xcc, 0x0f, 0x59, 0x68, - 0x6d, 0xe1, 0x32, 0x9a, 0x22, 0x7b, 0x50, 0xd3, 0x71, 0xb3, 0xee, 0xe0, 0x52, 0x77, 0x97, 0x97, - 0x4a, 0x63, 0x97, 0x6a, 0x4a, 0x87, 0x26, 0x51, 0x6c, 0x59, 0xe8, 0xa6, 0x1c, 0x92, 0x17, 0x50, - 0x63, 0xa1, 0xba, 0xb0, 0xee, 0xe2, 0x32, 0xf7, 0x96, 0x97, 0x41, 0xe2, 0x20, 0xf2, 0x98, 0x4b, - 0x53, 0x65, 0x44, 0x1d, 0x51, 0x10, 0x25, 0x87, 0x2c, 0x16, 0x53, 0x6b, 0x1b, 0x17, 0xcc, 0x71, - 0xc8, 0x11, 0xb4, 0xdc, 0x69, 0x12, 0xcd, 0x1c, 0xb5, 0x1d, 0xeb, 0x0b, 0x5c, 0xfc, 0xab, 0xe5, - 0xc5, 0x0f, 0x50, 0x6b, 0x38, 0xbf, 0xc0, 0x76, 0xe9, 0x87, 0x13, 0x5a, 0x98, 0x28, 0xa3, 0xfb, - 0x76, 0xee, 0x04, 0xbe, 0xb8, 0xb2, 0xee, 0xa9, 0x96, 0xad, 0x49, 0xfb, 0x3e, 0x54, 0xb5, 0x0e, - 0x40, 0xf5, 0x64, 0xd0, 0x3b, 0x3a, 0x1f, 0x9a, 0x2b, 0xa4, 0x06, 0xe5, 0x93, 0xc1, 0x33, 0xd3, - 0xb0, 0x7f, 0x07, 0xb5, 0xf4, 0x8c, 0x6f, 0xc1, 0x7a, 0xef, 0xf4, 0xe0, 0xec, 0xb0, 0x47, 0x47, - 0x87, 0xbd, 0x1f, 0xba, 0xaf, 0x5f, 0x49, 0xd0, 0xb6, 0x01, 0xed, 0xe3, 0xce, 0x8b, 0x67, 0xa3, - 0xfd, 0xee, 0xb0, 0xf7, 0xaa, 0x7f, 0xda, 0x33, 0x0d, 0xd2, 0x86, 0x06, 0xb2, 0x4e, 0xba, 0xfd, - 0x53, 0xb3, 0x94, 0x91, 0xc7, 0xfd, 0xa3, 0x63, 0xb3, 0x4c, 0xee, 0xc2, 0x6d, 0x24, 0x0f, 0xce, - 0x4e, 0x87, 0xe7, 0xb4, 0xdb, 0x3f, 0xed, 0x1d, 0x2a, 0x51, 0xc5, 0xee, 0x00, 0x2c, 0x82, 0x44, - 0xea, 0x50, 0x91, 0x8a, 0xe6, 0x8a, 0x1e, 0x3d, 0x37, 0x0d, 0xe9, 0xd6, 0x9b, 0xc1, 0xf7, 0x66, - 0x49, 0x0d, 0x5e, 0x9a, 0x65, 0xfb, 0x00, 0x36, 0x96, 0xf6, 0x4e, 0xd6, 0x00, 0x0e, 0x8e, 0xe9, - 0xd9, 0x49, 0x77, 0xf4, 0xac, 0xf3, 0xd4, 0x5c, 0x29, 0xd0, 0x1d, 0xd3, 0xc8, 0xd3, 0xcf, 0x9e, - 0x99, 0x25, 0xfb, 0x2d, 0xdc, 0x4e, 0x21, 0x36, 0xf3, 0x86, 0xaa, 0xca, 0xb0, 0x8b, 0x9b, 0x50, - 0x9e, 0x27, 0x81, 0x06, 0x21, 0x72, 0x88, 0xe8, 0x12, 0x51, 0x9a, 0x6e, 0xdd, 0x9a, 0x22, 0xbb, - 0x70, 0xeb, 0x5a, 0x27, 0x1b, 0xc9, 0x99, 0x0a, 0x82, 0x6e, 0xc4, 0x85, 0x4e, 0xf6, 0x3a, 0x09, - 0xec, 0x7f, 0x18, 0x70, 0xe7, 0x86, 0xab, 0x06, 0xad, 0x9e, 0x40, 0x53, 0xdd, 0xa2, 0x71, 0x12, - 0x5d, 0x70, 0x44, 0x7a, 0xcd, 0xce, 0x37, 0x1f, 0xba, 0x9d, 0xe4, 0x94, 0x5d, 0x64, 0x0d, 0xa4, - 0x7a, 0x8a, 0xd9, 0x32, 0x06, 0x62, 0xb6, 0xa2, 0xf8, 0x53, 0x98, 0xcd, 0xc8, 0x61, 0x36, 0x7b, - 0x0a, 0xa0, 0xba, 0x08, 0xfa, 0xf6, 0xeb, 0x8f, 0x5e, 0xa1, 0xf7, 0x3e, 0xe6, 0xe4, 0x27, 0xef, - 0xcf, 0x3f, 0x19, 0xd0, 0xce, 0xce, 0x01, 0xad, 0xbd, 0x80, 0xba, 0x6e, 0x7a, 0x69, 0x18, 0xb6, - 0x15, 0xcc, 0xbb, 0xe9, 0xb4, 0x68, 0xa6, 0xbb, 0xfc, 0xc8, 0x21, 0xdf, 0x01, 0xa8, 0xd6, 0xe7, - 0x47, 0x61, 0x8a, 0x7d, 0xd7, 0x73, 0x2d, 0x12, 0x17, 0xc8, 0xa9, 0xd8, 0x7f, 0x31, 0x60, 0x3d, - 0x33, 0x43, 0x19, 0x9f, 0x07, 0x22, 0xbd, 0xb4, 0x8d, 0xc5, 0xa5, 0xbd, 0x05, 0xab, 0x2c, 0x49, - 0xa2, 0x44, 0x61, 0x9d, 0xe3, 0x15, 0xaa, 0x48, 0xf2, 0x04, 0x2a, 0x9e, 0x23, 0x1c, 0x0d, 0x33, - 0x49, 0xd1, 0x69, 0x1d, 0x0c, 0xd4, 0x20, 0x5f, 0x43, 0x25, 0xf7, 0x6a, 0xba, 0xad, 0xae, 0xb4, - 0x6b, 0x98, 0x98, 0xa2, 0xca, 0x7e, 0x1d, 0xaa, 0x09, 0x3a, 0x62, 0xff, 0x01, 0xd6, 0x29, 0x9b, - 0xf8, 0x5c, 0xb0, 0xec, 0xc5, 0xb7, 0x05, 0x55, 0xce, 0xdc, 0x84, 0xa5, 0xcf, 0x23, 0x4d, 0x49, - 0x50, 0xa0, 0xf1, 0xfb, 0x95, 0x4e, 0xd9, 0x8c, 0x5e, 0x02, 0x05, 0xe5, 0xcf, 0x02, 0x05, 0xf6, - 0x1f, 0x0d, 0x68, 0x9f, 0x46, 0xc2, 0x1f, 0x5f, 0xe9, 0xe8, 0xdf, 0x50, 0x27, 0xff, 0x07, 0x35, - 0xae, 0xa0, 0x90, 0x5e, 0xb5, 0x95, 0xde, 0x68, 0x18, 0xe9, 0x54, 0x28, 0xdd, 0x16, 0x0e, 0xbf, - 0xec, 0x7b, 0x18, 0x80, 0x32, 0xd5, 0x54, 0x01, 0xf9, 0x6c, 0x14, 0x91, 0xcf, 0x8f, 0x95, 0x7a, - 0xc9, 0x2c, 0xff, 0x58, 0xa9, 0x3f, 0x34, 0x6d, 0xfb, 0xaf, 0x25, 0x68, 0xe5, 0x41, 0xbf, 0x7c, - 0x24, 0x25, 0xcc, 0xf5, 0x63, 0x9f, 0x85, 0x42, 0xe3, 0xae, 0x05, 0x43, 0x02, 0xd4, 0xb1, 0xe3, - 0xb2, 0xd1, 0x22, 0xd7, 0x5b, 0xb4, 0x21, 0x39, 0x6f, 0x24, 0x43, 0x42, 0xdb, 0x77, 0x7e, 0x88, - 0x75, 0xa7, 0x71, 0x58, 0xed, 0x9d, 0x2f, 0xf1, 0xdf, 0x85, 0x2c, 0xf0, 0x6c, 0x99, 0x51, 0xe2, - 0x84, 0x9e, 0x82, 0x2b, 0x0a, 0x95, 0x6d, 0x64, 0x22, 0xea, 0x84, 0x1e, 0xa2, 0x15, 0x02, 0x15, - 0xce, 0x98, 0xa7, 0xf1, 0x19, 0x8e, 0x25, 0x3c, 0x5a, 0x00, 0xeb, 0xd1, 0x45, 0x10, 0xb9, 0x97, - 0x08, 0xd4, 0x5a, 0x74, 0x7d, 0xc1, 0xdf, 0x97, 0x6c, 0x72, 0x0c, 0x1b, 0x39, 0x55, 0xfd, 0xd2, - 0x51, 0xa0, 0xed, 0x8b, 0xdc, 0x4b, 0xa7, 0x97, 0xe9, 0xe8, 0x37, 0x4f, 0xce, 0x80, 0xe2, 0xd8, - 0x7d, 0x20, 0x4a, 0x77, 0xc8, 0x42, 0x8f, 0x25, 0x3a, 0x4c, 0x0f, 0xa1, 0xc5, 0x91, 0x1e, 0x85, - 0x51, 0xe8, 0xa6, 0x68, 0xbb, 0xa9, 0x78, 0xa7, 0x92, 0x75, 0xc3, 0x4f, 0xc1, 0x4f, 0xb0, 0x75, - 0xb3, 0x59, 0xf2, 0x18, 0xd6, 0xdc, 0x84, 0x29, 0x67, 0x93, 0x68, 0x1e, 0x7a, 0xba, 0x48, 0xda, - 0x29, 0x97, 0x4a, 0x26, 0x79, 0x09, 0x77, 0x8b, 0x6a, 0x2a, 0x08, 0x2a, 0x94, 0xca, 0xd0, 0x56, - 0x61, 0x06, 0x06, 0x43, 0xc6, 0xd3, 0xfe, 0x7b, 0x09, 0x6a, 0x03, 0xe7, 0x0a, 0xd3, 0x6d, 0xe9, - 0x09, 0x68, 0x7c, 0xde, 0x13, 0x10, 0x6b, 0x44, 0x6e, 0x50, 0xdb, 0xd2, 0xd4, 0xcd, 0xc1, 0x2e, - 0xff, 0x8c, 0x60, 0x93, 0x3e, 0x6c, 0x6a, 0xcf, 0x74, 0x74, 0xf5, 0x62, 0x15, 0x6c, 0x38, 0x77, - 0x72, 0x8b, 0xe5, 0x4f, 0x83, 0x12, 0xb1, 0x7c, 0x42, 0xcf, 0x61, 0x8d, 0xbd, 0x8f, 0x99, 0x2b, - 0x98, 0x37, 0xc2, 0x67, 0xa9, 0x7e, 0x68, 0x5e, 0x7f, 0xb3, 0xb6, 0x53, 0x2d, 0x64, 0x75, 0xfe, - 0x63, 0x40, 0x2b, 0xdf, 0x3f, 0xc8, 0x3e, 0xac, 0x1f, 0x31, 0x51, 0x60, 0x59, 0x4b, 0x5d, 0x46, - 0x77, 0x91, 0xed, 0x9b, 0xfb, 0x0f, 0xf9, 0x0d, 0xdc, 0xbe, 0xf1, 0x1b, 0x8a, 0xa8, 0xef, 0x83, - 0x8f, 0xfd, 0x78, 0x6d, 0xdb, 0x1f, 0x53, 0x51, 0xbf, 0x58, 0xe4, 0x11, 0x54, 0x06, 0xf2, 0xe2, - 0x56, 0x9f, 0x46, 0xe9, 0x17, 0xdb, 0x76, 0x91, 0xec, 0x9c, 0x02, 0x9c, 0x2f, 0xfe, 0x01, 0x7e, - 0x05, 0x24, 0xed, 0x81, 0x39, 0xae, 0x82, 0xbd, 0xd7, 0x9a, 0xe3, 0xb6, 0x6a, 0xc0, 0x85, 0x9e, - 0xf5, 0xd4, 0xb8, 0xa8, 0xe2, 0xcf, 0xde, 0xde, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x2f, 0x9d, - 0x10, 0x2e, 0xed, 0x13, 0x00, 0x00, + 0x15, 0x36, 0x25, 0x59, 0x3f, 0x47, 0x92, 0x4d, 0x4f, 0x1c, 0x87, 0xf1, 0x26, 0x1b, 0x87, 0x9b, + 0x2c, 0xb2, 0xc0, 0xae, 0x37, 0x90, 0x93, 0x74, 0x53, 0xa0, 0x40, 0x15, 0x5b, 0xb1, 0xb5, 0x88, + 0x6d, 0x75, 0xe4, 0xe4, 0xb2, 0x2a, 0x4d, 0x8e, 0x24, 0xd6, 0x14, 0xc9, 0x70, 0x46, 0x4d, 0xbc, + 0xe8, 0x0b, 0xb4, 0x6f, 0xd0, 0xde, 0x14, 0x28, 0x50, 0xf4, 0x35, 0xfa, 0x00, 0x7d, 0x80, 0xde, + 0x15, 0xe8, 0x93, 0x14, 0x73, 0x66, 0x48, 0x91, 0x96, 0xf3, 0x83, 0xbd, 0x9b, 0xf3, 0x33, 0x33, + 0x67, 0xce, 0xdf, 0x7c, 0x33, 0x60, 0x86, 0x4c, 0x7c, 0x1f, 0xc4, 0xa3, 0x24, 0x76, 0x77, 0xe3, + 0x24, 0x12, 0x11, 0x29, 0x87, 0x4c, 0xd8, 0x3b, 0x50, 0x1f, 0xf8, 0xe1, 0x64, 0x10, 0x85, 0x13, + 0xb2, 0x09, 0xab, 0x7f, 0x70, 0x82, 0x39, 0xb3, 0x8c, 0x1d, 0xe3, 0x51, 0x8b, 0x2a, 0xc2, 0x3e, + 0x86, 0x3b, 0xbd, 0xd0, 0x3b, 0x4b, 0x9c, 0x90, 0xbb, 0x91, 0xe7, 0x87, 0x93, 0x21, 0xe3, 0xdc, + 0x8f, 0x42, 0xca, 0xde, 0xce, 0x19, 0x17, 0xe4, 0x3b, 0x00, 0x67, 0x2e, 0xa6, 0x23, 0x11, 0x5d, + 0xb0, 0x10, 0xa7, 0x36, 0x3b, 0x6b, 0xbb, 0x21, 0x13, 0xbb, 0xdd, 0xb9, 0x98, 0x9e, 0x49, 0x2e, + 0x6d, 0x38, 0xe9, 0xd0, 0xbe, 0x07, 0x77, 0x3f, 0xb0, 0x1c, 0x8f, 0xa3, 0x90, 0x33, 0xbb, 0x0b, + 0x37, 0x4e, 0x13, 0x77, 0xca, 0xb8, 0x48, 0x1c, 0x11, 0x25, 0xe9, 0x36, 0x16, 0xd4, 0x1c, 0xcf, + 0x4b, 0x18, 0xe7, 0xda, 0xbc, 0x94, 0x24, 0x26, 0x94, 0xb9, 0x3f, 0xb1, 0x4a, 0xc8, 0x95, 0x43, + 0xfb, 0x2f, 0x06, 0x54, 0x4f, 0x87, 0xfd, 0x70, 0x1c, 0x91, 0xe7, 0xd0, 0xe4, 0x22, 0x4a, 0x9c, + 0x09, 0x3b, 0xbb, 0x8c, 0xd5, 0xc9, 0xd6, 0x3a, 0xb7, 0xd0, 0x3c, 0xa5, 0xb1, 0x3b, 0x5c, 0x88, + 0x69, 0x5e, 0x97, 0x3c, 0x84, 0x2a, 0xdf, 0xf3, 0xc3, 0x71, 0x64, 0x99, 0x78, 0xa8, 0x36, 0xce, + 0x1a, 0xee, 0xa9, 0x79, 0x54, 0x0b, 0xed, 0xef, 0xa0, 0x99, 0x5b, 0x82, 0x00, 0x54, 0x0f, 0xfa, + 0xb4, 0xb7, 0x7f, 0x66, 0xae, 0x90, 0x2a, 0x94, 0x86, 0x7b, 0xa6, 0x21, 0x79, 0x87, 0xa7, 0xa7, + 0x87, 0xaf, 0x7a, 0x66, 0xc9, 0xfe, 0xbb, 0x01, 0xf5, 0x74, 0x0d, 0x42, 0xa0, 0x32, 0x8d, 0xb8, + 0x40, 0xb3, 0x1a, 0x14, 0xc7, 0xf2, 0x38, 0x17, 0xec, 0x12, 0x8f, 0xd3, 0xa0, 0x72, 0x48, 0xb6, + 0xa0, 0x1a, 0x47, 0x81, 0xef, 0x5e, 0x5a, 0x65, 0x64, 0x6a, 0x8a, 0xdc, 0x81, 0x06, 0xf7, 0x27, + 0xa1, 0x23, 0xe6, 0x09, 0xb3, 0x2a, 0x28, 0x5a, 0x30, 0xc8, 0x97, 0x00, 0x6e, 0xc2, 0x3c, 0x16, + 0x0a, 0xdf, 0x09, 0xac, 0x55, 0x14, 0xe7, 0x38, 0x64, 0x1b, 0xea, 0xef, 0xbb, 0xb3, 0x9f, 0x0e, + 0x1c, 0xc1, 0xac, 0x2a, 0x4a, 0x33, 0xda, 0x7e, 0x0d, 0x8d, 0x41, 0xe2, 0xbb, 0x0c, 0x8d, 0xb4, + 0xa1, 0x15, 0x4b, 0x62, 0xc0, 0x92, 0xd7, 0xa1, 0xaf, 0x8c, 0x2d, 0xd3, 0x02, 0x8f, 0x3c, 0x80, + 0x76, 0xec, 0xbf, 0x67, 0x01, 0x4f, 0x95, 0x4a, 0xa8, 0x54, 0x64, 0xda, 0xff, 0x35, 0xa0, 0xb5, + 0xef, 0xc4, 0xce, 0xb9, 0x1f, 0xf8, 0xc2, 0x67, 0x5c, 0x9e, 0xe0, 0xdc, 0x17, 0x5c, 0x24, 0x7e, + 0x38, 0xb1, 0x8c, 0x9d, 0xf2, 0xa3, 0x0a, 0x5d, 0x30, 0xc8, 0x0e, 0x34, 0x67, 0x4e, 0xe8, 0xc9, + 0x2c, 0xf0, 0x19, 0xb7, 0x4a, 0x28, 0xcf, 0xb3, 0x48, 0x17, 0xc0, 0x75, 0x62, 0xc7, 0xc5, 0xd5, + 0xac, 0xf2, 0x4e, 0xf9, 0x51, 0xb3, 0x73, 0x1f, 0xc3, 0x94, 0xdf, 0x06, 0x09, 0xa5, 0xd3, 0x0b, + 0x45, 0x72, 0x49, 0x73, 0x93, 0xb6, 0x7f, 0x05, 0xeb, 0x57, 0xc4, 0x69, 0x04, 0xe4, 0x39, 0xdb, + 0x2a, 0x02, 0x59, 0x65, 0x94, 0x90, 0xa7, 0x88, 0x5f, 0x96, 0x7e, 0x30, 0xb6, 0xdb, 0xd0, 0xdc, + 0x8f, 0x42, 0x99, 0xab, 0x7e, 0x28, 0xb8, 0xfd, 0xaf, 0x12, 0x98, 0xf9, 0xec, 0x45, 0x07, 0x7e, + 0x09, 0x20, 0x74, 0xbe, 0xb3, 0x44, 0xc7, 0x3a, 0xc7, 0x21, 0xcf, 0xa0, 0x2d, 0x7c, 0xf7, 0x82, + 0x89, 0x51, 0xec, 0x24, 0xce, 0x8c, 0xe3, 0x2e, 0xcd, 0xce, 0x06, 0x1e, 0xe4, 0x0c, 0x25, 0x03, + 0x14, 0xd0, 0x96, 0xc8, 0x51, 0xb2, 0xf2, 0x30, 0x08, 0x23, 0x4c, 0xd2, 0x72, 0xae, 0xf2, 0xb2, + 0xe0, 0xd1, 0x46, 0x9c, 0xc5, 0x31, 0x57, 0x41, 0x95, 0x62, 0x05, 0x3d, 0x85, 0x96, 0x9b, 0xf3, + 0x17, 0x26, 0x4b, 0xba, 0x7f, 0xde, 0x91, 0xb4, 0xa0, 0x76, 0xa5, 0xf2, 0xab, 0x9f, 0xa8, 0x7c, + 0xf2, 0x10, 0x6a, 0xba, 0xbc, 0xac, 0x1d, 0x8c, 0x54, 0x33, 0x57, 0x86, 0x34, 0x95, 0xd9, 0xbf, + 0x83, 0x46, 0x36, 0x5d, 0x3a, 0x7e, 0xd1, 0x57, 0x5a, 0x54, 0x11, 0xe4, 0x2e, 0x00, 0x57, 0x5d, + 0x63, 0xe4, 0x7b, 0xba, 0x52, 0x1a, 0x9a, 0xd3, 0xf7, 0xa4, 0xbf, 0xd9, 0xfb, 0xd8, 0x4f, 0x1c, + 0xe1, 0x47, 0x21, 0xfa, 0xa5, 0x4c, 0x73, 0x1c, 0xbb, 0x0f, 0xed, 0x03, 0x26, 0x98, 0x2b, 0xa2, + 0x64, 0x3f, 0x70, 0x38, 0x27, 0xb7, 0xa1, 0xee, 0xca, 0x81, 0x5c, 0x4d, 0x45, 0xbd, 0x86, 0x74, + 0xdf, 0x93, 0x5b, 0x29, 0x51, 0xe8, 0xcc, 0x58, 0xba, 0x15, 0x72, 0x4e, 0x9c, 0x19, 0xb3, 0x2f, + 0x60, 0x7b, 0xe8, 0xb2, 0x90, 0xe1, 0x3a, 0xfe, 0xd8, 0x77, 0x71, 0x87, 0x41, 0x12, 0x8d, 0xfd, + 0x80, 0x91, 0x7b, 0xd0, 0xe4, 0xce, 0x2c, 0x0e, 0xd8, 0x28, 0x91, 0x55, 0xa6, 0x96, 0x06, 0xc5, + 0xa2, 0x8e, 0x60, 0xe4, 0x5b, 0x50, 0x1b, 0xe9, 0xec, 0x6e, 0x76, 0x08, 0xba, 0xa4, 0x60, 0x1d, + 0x4d, 0x55, 0xec, 0x18, 0xd6, 0x53, 0x49, 0xba, 0xc3, 0x19, 0x6c, 0x72, 0xb9, 0xff, 0xc8, 0x2d, + 0x18, 0xa0, 0xdb, 0xf0, 0x3d, 0xd5, 0xb1, 0x3e, 0x68, 0xe0, 0xd1, 0x0a, 0xbd, 0xc1, 0x97, 0xa5, + 0x2f, 0x6a, 0x3a, 0xdd, 0xed, 0xff, 0xad, 0x42, 0x6d, 0xc8, 0x26, 0x07, 0x8e, 0x70, 0xa4, 0x57, + 0x67, 0x4e, 0xe8, 0x8f, 0x19, 0x17, 0x7d, 0x4f, 0xc7, 0x23, 0xc7, 0xc1, 0x36, 0xcc, 0xde, 0xea, + 0xc2, 0x97, 0x43, 0xec, 0x6e, 0x0e, 0x9f, 0x62, 0x04, 0x5a, 0x14, 0xc7, 0xb2, 0xeb, 0xc4, 0x6a, + 0xf3, 0x34, 0x0b, 0x33, 0x3a, 0x6d, 0xe4, 0xab, 0x59, 0x23, 0x97, 0xda, 0xde, 0x5c, 0xc7, 0x51, + 0xe6, 0xd7, 0x2a, 0xcd, 0xe8, 0xa5, 0xa4, 0xad, 0xfd, 0x9c, 0xa4, 0xad, 0x7f, 0x2a, 0x69, 0xbf, + 0x01, 0xd3, 0xd3, 0x3e, 0x1f, 0xb1, 0xd0, 0x39, 0x0f, 0x98, 0x67, 0x35, 0x76, 0x8c, 0x47, 0x75, + 0xba, 0x9e, 0xf2, 0x7b, 0x8a, 0x4d, 0x1e, 0xc3, 0xa6, 0xeb, 0x04, 0xee, 0x28, 0x66, 0x89, 0xcb, + 0x62, 0x31, 0x77, 0x82, 0x11, 0x1e, 0x1f, 0x50, 0x9d, 0x48, 0xd9, 0x20, 0x13, 0x1d, 0x49, 0x67, + 0x7c, 0x5e, 0x45, 0xc8, 0x93, 0x8e, 0xe7, 0x41, 0x30, 0x48, 0xfd, 0x76, 0x1f, 0x75, 0xd5, 0x49, + 0xdf, 0xf8, 0x1e, 0x8b, 0xb4, 0x84, 0x16, 0xd4, 0xc8, 0x2f, 0xa0, 0x9d, 0xa7, 0x3b, 0x96, 0xfd, + 0xa1, 0x79, 0x45, 0xbd, 0xab, 0x13, 0xf7, 0xac, 0xaf, 0x3e, 0x6b, 0xe2, 0x1e, 0xe9, 0x02, 0xe1, + 0x6c, 0x32, 0x63, 0xa1, 0xee, 0x64, 0x4c, 0xb0, 0x84, 0x5b, 0x0f, 0xd1, 0xc7, 0x2a, 0xb3, 0x87, + 0x6c, 0x32, 0xc8, 0x24, 0x74, 0x43, 0x6b, 0x2f, 0x58, 0x64, 0x17, 0xc8, 0xcb, 0x28, 0x71, 0x59, + 0x86, 0x0a, 0x7c, 0x79, 0x9b, 0x7c, 0xad, 0x5c, 0xb8, 0x2c, 0x21, 0x5d, 0xd8, 0xc8, 0xe2, 0x93, + 0x25, 0xd6, 0x03, 0xb4, 0x77, 0xb3, 0x50, 0x4b, 0xa9, 0xc9, 0x59, 0x38, 0x53, 0xb3, 0xed, 0x3d, + 0x68, 0x17, 0xcc, 0x92, 0x79, 0x3b, 0x4e, 0xa2, 0x19, 0xe6, 0x78, 0x85, 0xe2, 0x98, 0xac, 0x41, + 0x49, 0x44, 0x98, 0xdc, 0x15, 0x5a, 0x12, 0x91, 0xfd, 0xef, 0x55, 0x68, 0xe5, 0x5d, 0x21, 0x27, + 0x61, 0x8b, 0x30, 0xd5, 0x55, 0x2e, 0xc7, 0xb2, 0x7b, 0xbd, 0xf3, 0x3d, 0x31, 0xb5, 0x36, 0x30, + 0x77, 0x15, 0x21, 0xaf, 0xf3, 0x29, 0xf3, 0x27, 0x53, 0x61, 0x11, 0x64, 0x6b, 0x4a, 0xf6, 0xe7, + 0x73, 0x5f, 0x60, 0xa7, 0xb8, 0x81, 0x82, 0x94, 0x94, 0x85, 0x31, 0x8e, 0xb9, 0xb5, 0xa9, 0x2e, + 0xa4, 0x71, 0xcc, 0xc9, 0x63, 0xa8, 0x8e, 0xa3, 0x64, 0xe6, 0x08, 0xeb, 0x26, 0x22, 0x1a, 0x6b, + 0x29, 0x36, 0xbb, 0x2f, 0x51, 0x4e, 0xb5, 0x9e, 0xdc, 0x75, 0x1c, 0xf3, 0x03, 0x16, 0x5a, 0x5b, + 0xb8, 0x8c, 0xa6, 0xc8, 0x1e, 0xd4, 0xb4, 0xdf, 0xac, 0x5b, 0xb8, 0xd4, 0xed, 0xe5, 0xa5, 0x52, + 0xdf, 0xa5, 0x9a, 0xd2, 0xa0, 0x49, 0x14, 0x5b, 0x16, 0x9a, 0x29, 0x87, 0xe4, 0x19, 0xd4, 0x58, + 0xa8, 0x2e, 0xb8, 0xdb, 0xb8, 0xcc, 0x9d, 0xe5, 0x65, 0x90, 0xd8, 0x8f, 0x3c, 0xe6, 0xd2, 0x54, + 0x19, 0x51, 0x4a, 0x14, 0x44, 0xc9, 0x01, 0x8b, 0xc5, 0xd4, 0xda, 0xc6, 0x05, 0x73, 0x1c, 0x72, + 0x08, 0x2d, 0x77, 0x9a, 0x44, 0x33, 0x47, 0x1d, 0xc7, 0xfa, 0x02, 0x17, 0xff, 0x6a, 0x79, 0xf1, + 0x7d, 0xd4, 0x1a, 0xce, 0xcf, 0xb1, 0xbd, 0xfa, 0xe1, 0x84, 0x16, 0x26, 0x4a, 0xef, 0xbe, 0x9d, + 0x3b, 0x81, 0x2f, 0x2e, 0xad, 0x3b, 0xaa, 0xc5, 0x6b, 0xd2, 0xbe, 0x0b, 0x55, 0xad, 0x03, 0x50, + 0x3d, 0x1e, 0xf4, 0x0e, 0xcf, 0x86, 0xe6, 0x0a, 0xa9, 0x41, 0xf9, 0x78, 0xf0, 0xc4, 0x34, 0xec, + 0xdf, 0x43, 0x2d, 0x8d, 0xf1, 0x0d, 0x58, 0xef, 0x9d, 0xec, 0x9f, 0x1e, 0xf4, 0xe8, 0xe8, 0xa0, + 0xf7, 0xb2, 0xfb, 0xfa, 0x95, 0x04, 0x79, 0x1b, 0xd0, 0x3e, 0xea, 0x3c, 0x7b, 0x32, 0x7a, 0xd1, + 0x1d, 0xf6, 0x5e, 0xf5, 0x4f, 0x7a, 0xa6, 0x41, 0xda, 0xd0, 0x40, 0xd6, 0x71, 0xb7, 0x7f, 0x62, + 0x96, 0x32, 0xf2, 0xa8, 0x7f, 0x78, 0x64, 0x96, 0xc9, 0x6d, 0xb8, 0x89, 0xe4, 0xfe, 0xe9, 0xc9, + 0xf0, 0x8c, 0x76, 0xfb, 0x27, 0xbd, 0x03, 0x25, 0xaa, 0xd8, 0x1d, 0x80, 0x85, 0x93, 0x48, 0x1d, + 0x2a, 0x52, 0xd1, 0x5c, 0xd1, 0xa3, 0xa7, 0xa6, 0x21, 0xcd, 0x7a, 0x33, 0xf8, 0xc1, 0x2c, 0xa9, + 0xc1, 0x73, 0xb3, 0x6c, 0xef, 0xc3, 0xc6, 0xd2, 0xd9, 0xc9, 0x1a, 0xc0, 0xfe, 0x11, 0x3d, 0x3d, + 0xee, 0x8e, 0x9e, 0x74, 0x1e, 0x9b, 0x2b, 0x05, 0xba, 0x63, 0x1a, 0x79, 0xfa, 0xc9, 0x13, 0xb3, + 0x64, 0xbf, 0x85, 0x9b, 0x29, 0x24, 0x67, 0xde, 0x50, 0x55, 0x25, 0x76, 0x7d, 0x13, 0xca, 0xf3, + 0x24, 0xd0, 0xa0, 0x45, 0x0e, 0x11, 0x8d, 0x22, 0xaa, 0xd3, 0xad, 0x5e, 0x53, 0x64, 0x17, 0x6e, + 0x5c, 0xe9, 0x7c, 0x23, 0x39, 0x53, 0x41, 0xd6, 0x8d, 0xb8, 0xd0, 0xf9, 0x5e, 0x27, 0x81, 0xfd, + 0x4f, 0x03, 0x6e, 0x5d, 0x73, 0x35, 0xe1, 0xae, 0xc7, 0xd0, 0x54, 0xb7, 0x6e, 0x9c, 0x44, 0xe7, + 0x1c, 0x91, 0x61, 0xb3, 0xf3, 0xed, 0x87, 0x6e, 0x33, 0x39, 0x65, 0x17, 0x59, 0x03, 0xa9, 0x9e, + 0x62, 0xbc, 0x8c, 0x81, 0x18, 0xaf, 0x28, 0xfe, 0x14, 0xc6, 0x33, 0x72, 0x18, 0xcf, 0x9e, 0x02, + 0xa8, 0x2e, 0x82, 0xb6, 0xfd, 0xe6, 0xa3, 0x57, 0xee, 0x9d, 0x8f, 0x19, 0xf9, 0xc9, 0xfb, 0xf6, + 0xcf, 0x06, 0xb4, 0xb3, 0x38, 0xe0, 0x6e, 0xcf, 0xa0, 0xae, 0x9b, 0x64, 0xea, 0x86, 0x6d, 0x05, + 0x0b, 0xaf, 0x8b, 0x16, 0xcd, 0x74, 0x97, 0x1f, 0x45, 0xe4, 0x7b, 0x00, 0xd5, 0xfa, 0xfc, 0x28, + 0x4c, 0xb1, 0xf2, 0x7a, 0xae, 0x45, 0xe2, 0x02, 0x39, 0x15, 0xfb, 0xaf, 0x06, 0xac, 0x67, 0xdb, + 0x50, 0xc6, 0xe7, 0x81, 0x48, 0x2f, 0x79, 0x63, 0x71, 0xc9, 0x6f, 0xc1, 0x2a, 0x4b, 0x92, 0x28, + 0x51, 0xd8, 0xe8, 0x68, 0x85, 0x2a, 0x92, 0x3c, 0x82, 0x8a, 0xe7, 0x08, 0x47, 0xc3, 0x52, 0x52, + 0x34, 0x5a, 0x3b, 0x03, 0x35, 0xc8, 0x37, 0x50, 0xc9, 0xbd, 0xb2, 0x6e, 0xaa, 0x2b, 0xf0, 0x0a, + 0x86, 0xa6, 0xa8, 0xf2, 0xa2, 0x0e, 0xd5, 0x04, 0x0d, 0xb1, 0xff, 0x08, 0xeb, 0x94, 0x4d, 0x7c, + 0x2e, 0x58, 0xf6, 0x42, 0xdc, 0x82, 0x2a, 0x67, 0x6e, 0xc2, 0xd2, 0xe7, 0x94, 0xa6, 0x24, 0x88, + 0xd0, 0x78, 0xff, 0x52, 0xa7, 0x6c, 0x46, 0x2f, 0x81, 0x88, 0xf2, 0x67, 0x81, 0x08, 0xfb, 0x4f, + 0x06, 0xb4, 0x4f, 0x22, 0xe1, 0x8f, 0x2f, 0xb5, 0xf7, 0xaf, 0xa9, 0x93, 0xaf, 0xa1, 0xc6, 0x15, + 0x74, 0xd2, 0xab, 0xb6, 0xd2, 0x1b, 0x10, 0x3d, 0x9d, 0x0a, 0xa5, 0xd9, 0xc2, 0xe1, 0x17, 0x7d, + 0x0f, 0x1d, 0x50, 0xa6, 0x9a, 0x2a, 0x20, 0xa5, 0x8d, 0x22, 0x52, 0xfa, 0xb1, 0x52, 0x2f, 0x99, + 0xe5, 0x1f, 0x2b, 0xf5, 0xfb, 0xa6, 0x6d, 0xff, 0xad, 0x04, 0xad, 0xfc, 0x23, 0x41, 0x3e, 0xaa, + 0x12, 0xe6, 0xfa, 0xb1, 0xcf, 0x42, 0xa1, 0x71, 0xda, 0x82, 0x21, 0x01, 0xed, 0xd8, 0x71, 0xd9, + 0x68, 0x91, 0xeb, 0x2d, 0xda, 0x90, 0x9c, 0x37, 0x92, 0x21, 0xa1, 0xf0, 0x3b, 0x3f, 0xc4, 0xba, + 0xd3, 0xb8, 0xad, 0xf6, 0xce, 0x97, 0x78, 0xf1, 0x5c, 0x16, 0x78, 0xb6, 0xcc, 0x28, 0x71, 0x42, + 0x4f, 0xc1, 0x1b, 0x85, 0xe2, 0x36, 0x32, 0x11, 0x75, 0x42, 0x0f, 0xd1, 0x0d, 0x81, 0x0a, 0x67, + 0xcc, 0xd3, 0x78, 0x0e, 0xc7, 0x12, 0x4e, 0x2d, 0x80, 0xf8, 0xe8, 0x3c, 0x88, 0xdc, 0x0b, 0x04, + 0x76, 0x2d, 0xba, 0xbe, 0xe0, 0xbf, 0x90, 0x6c, 0x72, 0x04, 0x1b, 0x39, 0x55, 0xfd, 0x32, 0x52, + 0x20, 0xef, 0x8b, 0xdc, 0xcb, 0xa8, 0x97, 0xe9, 0xe8, 0x37, 0x52, 0x6e, 0x03, 0xc5, 0xb1, 0xfb, + 0x40, 0x94, 0xee, 0x90, 0x85, 0x1e, 0x4b, 0xb4, 0x9b, 0xee, 0x43, 0x8b, 0x23, 0x3d, 0x0a, 0xa3, + 0xd0, 0x4d, 0xd1, 0x79, 0x53, 0xf1, 0x4e, 0x24, 0xeb, 0x9a, 0x9f, 0x85, 0x9f, 0x60, 0xeb, 0xfa, + 0x6d, 0xc9, 0x43, 0x58, 0x73, 0x13, 0xa6, 0x8c, 0x4d, 0xa2, 0x79, 0xe8, 0xe9, 0x22, 0x69, 0xa7, + 0x5c, 0x2a, 0x99, 0xe4, 0x39, 0xdc, 0x2e, 0xaa, 0x29, 0x27, 0x28, 0x57, 0xaa, 0x8d, 0xb6, 0x0a, + 0x33, 0xd0, 0x19, 0xd2, 0x9f, 0xf6, 0x3f, 0x4a, 0x50, 0x1b, 0x38, 0x97, 0x98, 0x6e, 0x4b, 0x4f, + 0x46, 0xe3, 0xf3, 0x9e, 0x8c, 0x58, 0x23, 0xf2, 0x80, 0x7a, 0x2f, 0x4d, 0x5d, 0xef, 0xec, 0xf2, + 0xcf, 0x70, 0x36, 0xe9, 0xc3, 0xa6, 0xb6, 0x4c, 0x7b, 0x57, 0x2f, 0x56, 0xc1, 0x86, 0x73, 0x2b, + 0xb7, 0x58, 0x3e, 0x1a, 0x94, 0x88, 0xe5, 0x08, 0x3d, 0x85, 0x35, 0xf6, 0x3e, 0x66, 0xae, 0x60, + 0xde, 0x08, 0x9f, 0xb1, 0xfa, 0x61, 0x7a, 0xf5, 0x8d, 0xdb, 0x4e, 0xb5, 0x90, 0xd5, 0xf9, 0x8f, + 0x01, 0xad, 0x7c, 0xff, 0x20, 0x2f, 0x60, 0xfd, 0x90, 0x89, 0x02, 0xcb, 0x5a, 0xea, 0x32, 0xba, + 0x8b, 0x6c, 0x5f, 0xdf, 0x7f, 0xc8, 0x6f, 0xe1, 0xe6, 0xb5, 0xdf, 0x56, 0x44, 0x7d, 0x37, 0x7c, + 0xec, 0x87, 0x6c, 0xdb, 0xfe, 0x98, 0x8a, 0xfa, 0xf5, 0x22, 0x0f, 0xa0, 0x32, 0x90, 0x17, 0xb7, + 0xfa, 0x64, 0x4a, 0xbf, 0xe4, 0xb6, 0x8b, 0x64, 0xe7, 0x04, 0xe0, 0x6c, 0xf1, 0x6f, 0xf0, 0x6b, + 0x20, 0x69, 0x0f, 0xcc, 0x71, 0x15, 0xec, 0xbd, 0xd2, 0x1c, 0xb7, 0x55, 0x03, 0x2e, 0xf4, 0xac, + 0xc7, 0xc6, 0x79, 0x15, 0x7f, 0x02, 0xf7, 0xfe, 0x1f, 0x00, 0x00, 0xff, 0xff, 0xc8, 0x85, 0x1e, + 0xcb, 0x1d, 0x14, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/net/lp_rpc.proto b/net/lp_rpc.proto index 4942681551..e3df8bec20 100644 --- a/net/lp_rpc.proto +++ b/net/lp_rpc.proto @@ -230,6 +230,9 @@ message SegData { // Transcoding parameters specific to this segment SegParameters segment_parameters = 37; + // Force HW Session Reinit + bool ForceSessionReinit = 38; + // [EXPERIMENTAL] // Detector profiles to use repeated DetectorProfile detector_profiles = 36; diff --git a/server/broadcast.go b/server/broadcast.go index cc32751db5..6e6799f18e 100755 --- a/server/broadcast.go +++ b/server/broadcast.go @@ -1039,7 +1039,6 @@ func transcodeSegment(ctx context.Context, cxn *rtmpConnection, seg *stream.HLSS if seg, err = prepareForTranscoding(ctx, cxn, sess, seg, name); err != nil { return nil, info, err } - // cxn.sessManager.pushSegInFlight(sess, seg) sess.pushSegInFlight(seg) var res *ReceivedTranscodeResult res, err = SubmitSegment(ctx, sess.Clone(), seg, segPar, nonce, calcPerceptualHash, verified) diff --git a/server/mediaserver.go b/server/mediaserver.go index 17c76e28bf..e12b690cb5 100644 --- a/server/mediaserver.go +++ b/server/mediaserver.go @@ -144,8 +144,9 @@ type authWebhookResponse struct { Name string `json:"name"` } `json:"sceneClassification"` } `json:"detection"` - VerificationFreq uint `json:"verificationFreq"` - TimeoutMultiplier int `json:"timeoutMultiplier"` + VerificationFreq uint `json:"verificationFreq"` + TimeoutMultiplier int `json:"timeoutMultiplier"` + ForceSessionReinit bool `json:"forceSessionReinit"` } func NewLivepeerServer(rtmpAddr string, lpNode *core.LivepeerNode, httpIngest bool, transcodingOptions string) (*LivepeerServer, error) { @@ -801,7 +802,7 @@ func (s *LivepeerServer) HandlePush(w http.ResponseWriter, r *http.Request) { if valMs, err := strconv.ParseUint(sliceToStr, 10, 64); err == nil { sliceToDur = time.Duration(valMs) * time.Millisecond } - var segPar *core.SegmentParameters + var segPar core.SegmentParameters if sliceFromDur > 0 || sliceToDur > 0 { if sliceFromDur > 0 && sliceToDur > 0 && sliceFromDur > sliceToDur { httpErr := fmt.Sprintf(`Invalid slice config from=%s to=%s`, sliceFromDur, sliceToDur) @@ -809,11 +810,14 @@ func (s *LivepeerServer) HandlePush(w http.ResponseWriter, r *http.Request) { http.Error(w, httpErr, http.StatusBadRequest) return } - segPar = &core.SegmentParameters{ + segPar.Clip = &core.SegmentClip{ From: sliceFromDur, To: sliceToDur, } } + if authHeaderConfig != nil { + segPar.ForceSessionReinit = authHeaderConfig.ForceSessionReinit + } now := time.Now() if mid == "" { @@ -900,7 +904,7 @@ func (s *LivepeerServer) HandlePush(w http.ResponseWriter, r *http.Request) { } } - cxn, err = s.registerConnection(ctx, st, vcodec, mediaFormat.PixFormat, segPar) + cxn, err = s.registerConnection(ctx, st, vcodec, mediaFormat.PixFormat, &segPar) if err != nil { st.Close() if err != errAlreadyExists { @@ -1009,7 +1013,7 @@ func (s *LivepeerServer) HandlePush(w http.ResponseWriter, r *http.Request) { }() // Do the transcoding! - urls, err := processSegment(ctx, cxn, seg, segPar) + urls, err := processSegment(ctx, cxn, seg, &segPar) if err != nil { status := http.StatusInternalServerError if isNonRetryableError(err) { diff --git a/server/push_test.go b/server/push_test.go index 9d1d99537c..9d03eba5bf 100644 --- a/server/push_test.go +++ b/server/push_test.go @@ -1997,8 +1997,8 @@ func TestPush_SlicePass(t *testing.T) { require.NoError(err) require.NotNil(md) require.NotNil(md.SegmentParameters) - require.Equal(100*time.Millisecond, md.SegmentParameters.From) - require.Equal(200*time.Millisecond, md.SegmentParameters.To) + require.Equal(100*time.Millisecond, md.SegmentParameters.Clip.From) + require.Equal(200*time.Millisecond, md.SegmentParameters.Clip.To) w.WriteHeader(http.StatusOK) w.Write([]byte("test")) }) diff --git a/server/rpc.go b/server/rpc.go index 2b7cd2d38c..4815375006 100644 --- a/server/rpc.go +++ b/server/rpc.go @@ -536,9 +536,10 @@ func coreSegMetadata(segData *net.SegData) (*core.SegTranscodingMetadata, error) } detectorProfs = append(detectorProfs, detectorProfile) } - var segPar *core.SegmentParameters + var segPar core.SegmentParameters + segPar.ForceSessionReinit = segData.ForceSessionReinit if segData.SegmentParameters != nil { - segPar = &core.SegmentParameters{ + segPar.Clip = &core.SegmentClip{ From: time.Duration(segData.SegmentParameters.From) * time.Millisecond, To: time.Duration(segData.SegmentParameters.To) * time.Millisecond, } @@ -556,6 +557,6 @@ func coreSegMetadata(segData *net.SegData) (*core.SegTranscodingMetadata, error) DetectorEnabled: segData.DetectorEnabled, DetectorProfiles: detectorProfs, CalcPerceptualHash: segData.CalcPerceptualHash, - SegmentParameters: segPar, + SegmentParameters: &segPar, }, nil }