pixel format added

This commit is contained in:
Sibesh Kar
2019-07-14 19:49:07 +05:30
parent 4756f0b58d
commit 73f4a73054
8 changed files with 72 additions and 6550 deletions

Binary file not shown.

Binary file not shown.

6493
output.txt

File diff suppressed because one or more lines are too long

View File

@@ -21,17 +21,17 @@ var _ = math.Inf
const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
type InitMsg struct {
RfbHeader string `protobuf:"bytes,1,opt,name=RfbHeader,json=rfbHeader,proto3" json:"RfbHeader,omitempty"`
RfbVersion string `protobuf:"bytes,2,opt,name=RfbVersion,json=rfbVersion,proto3" json:"RfbVersion,omitempty"`
FBHeight uint32 `protobuf:"varint,3,opt,name=FBHeight,json=fBHeight,proto3" json:"FBHeight,omitempty"`
FBWidth uint32 `protobuf:"varint,4,opt,name=FBWidth,json=fBWidth,proto3" json:"FBWidth,omitempty"`
SecType uint32 `protobuf:"varint,5,opt,name=SecType,json=secType,proto3" json:"SecType,omitempty"`
StartTime uint32 `protobuf:"varint,6,opt,name=StartTime,json=startTime,proto3" json:"StartTime,omitempty"`
DesktopName string `protobuf:"bytes,7,opt,name=DesktopName,json=desktopName,proto3" json:"DesktopName,omitempty"`
PixelFormat string `protobuf:"bytes,8,opt,name=PixelFormat,json=pixelFormat,proto3" json:"PixelFormat,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
RfbHeader string `protobuf:"bytes,1,opt,name=RfbHeader,json=rfbHeader,proto3" json:"RfbHeader,omitempty"`
RfbVersion string `protobuf:"bytes,2,opt,name=RfbVersion,json=rfbVersion,proto3" json:"RfbVersion,omitempty"`
FBHeight uint32 `protobuf:"varint,3,opt,name=FBHeight,json=fBHeight,proto3" json:"FBHeight,omitempty"`
FBWidth uint32 `protobuf:"varint,4,opt,name=FBWidth,json=fBWidth,proto3" json:"FBWidth,omitempty"`
SecType uint32 `protobuf:"varint,5,opt,name=SecType,json=secType,proto3" json:"SecType,omitempty"`
StartTime uint32 `protobuf:"varint,6,opt,name=StartTime,json=startTime,proto3" json:"StartTime,omitempty"`
DesktopName string `protobuf:"bytes,7,opt,name=DesktopName,json=desktopName,proto3" json:"DesktopName,omitempty"`
PixelFormat *PixelFormat `protobuf:"bytes,8,opt,name=PixelFormat,json=pixelFormat,proto3" json:"PixelFormat,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *InitMsg) Reset() { *m = InitMsg{} }
@@ -108,11 +108,11 @@ func (m *InitMsg) GetDesktopName() string {
return ""
}
func (m *InitMsg) GetPixelFormat() string {
func (m *InitMsg) GetPixelFormat() *PixelFormat {
if m != nil {
return m.PixelFormat
}
return ""
return nil
}
type PointerEvent struct {
@@ -602,47 +602,47 @@ func init() {
func init() { proto.RegisterFile("demo.proto", fileDescriptor_ca53982754088a9d) }
var fileDescriptor_ca53982754088a9d = []byte{
// 663 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0x4d, 0x6b, 0xdb, 0x5a,
0x10, 0x45, 0x96, 0x25, 0x4b, 0xe3, 0xf8, 0xbd, 0xe4, 0xbe, 0x10, 0xc4, 0xe3, 0xf1, 0x08, 0x5e,
0x79, 0x93, 0x50, 0x52, 0x28, 0x74, 0x57, 0x5c, 0xc7, 0x4d, 0x09, 0x09, 0xe6, 0x3a, 0xfd, 0x82,
0x6e, 0x24, 0x6b, 0x24, 0x0b, 0x5b, 0x57, 0xe2, 0xde, 0xeb, 0x24, 0x5e, 0xf4, 0x0f, 0xf4, 0x1f,
0xf4, 0xa7, 0x76, 0x57, 0xee, 0x87, 0xe4, 0x38, 0x5d, 0x74, 0x25, 0x66, 0xce, 0x9c, 0xc3, 0x99,
0x3b, 0x33, 0x02, 0x48, 0xb1, 0xac, 0xce, 0x6b, 0x5e, 0xc9, 0x8a, 0x78, 0xfa, 0x33, 0xfc, 0xe9,
0x40, 0xef, 0x3d, 0x2b, 0xe4, 0x8d, 0xc8, 0xc9, 0x7f, 0x10, 0xd2, 0x2c, 0xb9, 0xc2, 0x38, 0x45,
0x1e, 0x39, 0xa7, 0xce, 0x28, 0xa4, 0x21, 0x6f, 0x12, 0xe4, 0x7f, 0x00, 0x9a, 0x25, 0x1f, 0x91,
0x8b, 0xa2, 0x62, 0x51, 0x47, 0xc3, 0xc0, 0xdb, 0x0c, 0xf9, 0x17, 0x82, 0xe9, 0xf8, 0x0a, 0x8b,
0x7c, 0x29, 0x23, 0xf7, 0xd4, 0x19, 0x0d, 0x68, 0x90, 0xd9, 0x98, 0x44, 0xd0, 0x9b, 0x8e, 0x3f,
0x15, 0xa9, 0x5c, 0x46, 0x5d, 0x0d, 0xf5, 0x32, 0x13, 0x2a, 0x64, 0x8e, 0x8b, 0xbb, 0x6d, 0x8d,
0x91, 0x67, 0x10, 0x61, 0x42, 0xe5, 0x66, 0x2e, 0x63, 0x2e, 0xef, 0x8a, 0x12, 0x23, 0x5f, 0x63,
0xa1, 0x68, 0x12, 0xe4, 0x14, 0xfa, 0x13, 0x14, 0x2b, 0x59, 0xd5, 0xb7, 0x71, 0x89, 0x51, 0x4f,
0xdb, 0xe9, 0xa7, 0xbb, 0x94, 0xaa, 0x98, 0x15, 0x8f, 0xb8, 0x9e, 0x56, 0xbc, 0x8c, 0x65, 0x14,
0x98, 0x8a, 0x7a, 0x97, 0x1a, 0x7e, 0x85, 0x83, 0x59, 0x55, 0x30, 0x89, 0xfc, 0xf2, 0x1e, 0x99,
0x24, 0x04, 0xba, 0x37, 0xb1, 0x58, 0xe9, 0xd6, 0x07, 0xb4, 0x5b, 0xc6, 0x62, 0x45, 0x0e, 0xc0,
0xf9, 0xac, 0x9b, 0x1d, 0x50, 0xe7, 0x51, 0x45, 0x5f, 0x6c, 0x73, 0xce, 0x56, 0x39, 0x94, 0x45,
0x89, 0x42, 0xc6, 0x65, 0x6d, 0xfb, 0xda, 0x25, 0x86, 0xb7, 0x10, 0x5c, 0xe3, 0xb6, 0x55, 0x9e,
0x54, 0x0f, 0xac, 0x51, 0x4e, 0xab, 0x07, 0x46, 0x0e, 0xc1, 0xbd, 0xc6, 0xad, 0xd5, 0x76, 0x57,
0xf8, 0x4c, 0xcf, 0x7d, 0xae, 0xf7, 0x06, 0x60, 0x9a, 0x88, 0x39, 0xe6, 0xa5, 0x52, 0x3c, 0x06,
0x2f, 0xd9, 0x4a, 0x14, 0x5a, 0xf2, 0x80, 0x9a, 0x60, 0x5f, 0xa1, 0xf3, 0x5c, 0xe1, 0x47, 0x67,
0xef, 0x49, 0x94, 0x83, 0xf1, 0x6c, 0x66, 0x4d, 0xb9, 0xc9, 0x6c, 0xa6, 0x54, 0x27, 0x58, 0xcb,
0xa5, 0xe5, 0x7a, 0xa9, 0x0a, 0x94, 0xea, 0xb8, 0xc8, 0x2f, 0x59, 0x5a, 0xc4, 0xac, 0xf1, 0x95,
0x34, 0x09, 0x85, 0xde, 0xf1, 0x0d, 0xbe, 0xad, 0xd6, 0x15, 0x6f, 0x5f, 0xa1, 0x49, 0x90, 0x13,
0xf0, 0x29, 0xa6, 0x37, 0xf1, 0xa3, 0x1d, 0xaf, 0xcf, 0x75, 0xa4, 0xb6, 0xe5, 0x1d, 0x47, 0x64,
0x0a, 0x31, 0xc3, 0x0d, 0x72, 0x1b, 0xab, 0x9d, 0x18, 0xaf, 0x37, 0xa8, 0xa0, 0x9e, 0xd9, 0x89,
0xc4, 0x84, 0x8a, 0x45, 0x31, 0x9d, 0x2f, 0x8b, 0xcc, 0x0c, 0x74, 0x40, 0x03, 0x6e, 0x63, 0xb5,
0x9f, 0x5a, 0xd1, 0xa0, 0xa1, 0x46, 0x21, 0x6f, 0x33, 0xba, 0x8b, 0xf5, 0x06, 0x0d, 0x0c, 0xb6,
0x8b, 0x26, 0x31, 0xfc, 0x06, 0x21, 0xc5, 0x85, 0x8c, 0x59, 0xbe, 0x46, 0x33, 0x74, 0x67, 0x6f,
0xe8, 0x9d, 0x66, 0xe8, 0xc7, 0xe0, 0x99, 0x45, 0x36, 0x0f, 0xe1, 0x3d, 0xe8, 0x35, 0x3e, 0x01,
0xdf, 0xae, 0xbe, 0x79, 0x01, 0x7f, 0x69, 0x16, 0xff, 0x10, 0xdc, 0x4b, 0xb6, 0xb0, 0xbd, 0xbb,
0xc8, 0x16, 0x8a, 0x3f, 0xd6, 0x83, 0xf3, 0x9f, 0x0c, 0x6e, 0xb8, 0x80, 0xa3, 0x29, 0x8f, 0x4b,
0x4c, 0x36, 0x59, 0x86, 0xfc, 0x43, 0x9d, 0xc6, 0x12, 0xc9, 0x0b, 0x00, 0xde, 0x78, 0x52, 0x83,
0x76, 0x47, 0xfd, 0x8b, 0x43, 0x73, 0xbe, 0xe7, 0xad, 0x59, 0xfa, 0xa4, 0xe6, 0x0f, 0xf3, 0xff,
0xde, 0x81, 0xc1, 0x04, 0xcb, 0x8a, 0x09, 0xc9, 0x63, 0xa9, 0x6e, 0x76, 0x04, 0xbd, 0x82, 0x15,
0xb2, 0x14, 0xb9, 0x6e, 0xb7, 0x7f, 0xf1, 0x97, 0x95, 0xb7, 0xbf, 0x04, 0xda, 0xc0, 0xe4, 0x15,
0x84, 0x59, 0xb2, 0xd1, 0xbe, 0x44, 0xd4, 0xd1, 0x56, 0x22, 0x5b, 0xfb, 0x9b, 0x71, 0xba, 0x2b,
0x25, 0x67, 0x10, 0x08, 0xb3, 0xb2, 0x22, 0x72, 0x35, 0xed, 0xa8, 0xa1, 0xb5, 0xcb, 0x4c, 0xdb,
0x12, 0xf2, 0x1a, 0x06, 0xb5, 0x39, 0x49, 0xbc, 0xd7, 0x9c, 0xae, 0xe6, 0xfc, 0x63, 0x39, 0x4f,
0xcf, 0x95, 0xee, 0x57, 0x92, 0x33, 0x08, 0x57, 0xb8, 0xb5, 0x34, 0x4f, 0xd3, 0xfe, 0xb6, 0xb4,
0xe6, 0x0e, 0xe9, 0xae, 0x22, 0xf1, 0x35, 0xf4, 0xf2, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x41,
0x67, 0x4d, 0x1f, 0x14, 0x05, 0x00, 0x00,
// 669 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0xcb, 0x6a, 0xdb, 0x40,
0x14, 0x45, 0x96, 0x5f, 0xba, 0x8a, 0xdb, 0x64, 0x1a, 0x82, 0x28, 0xa5, 0x18, 0xaf, 0xbc, 0x49,
0x28, 0x69, 0x29, 0x74, 0x57, 0x5c, 0xc7, 0x4d, 0x09, 0x09, 0x66, 0x9c, 0xbe, 0xa0, 0x1b, 0xc9,
0xba, 0x92, 0x85, 0xad, 0x91, 0x98, 0x19, 0x27, 0xf1, 0xa2, 0x3f, 0x50, 0xe8, 0x07, 0xf4, 0x6f,
0xcb, 0x3c, 0x24, 0xdb, 0xe9, 0xa2, 0x2b, 0x71, 0xee, 0x99, 0x7b, 0x38, 0xf7, 0x25, 0x80, 0x18,
0xf3, 0xe2, 0xac, 0xe4, 0x85, 0x2c, 0x48, 0x4b, 0x7f, 0x06, 0xbf, 0x1b, 0xd0, 0xf9, 0xc4, 0x32,
0x79, 0x2d, 0x52, 0xf2, 0x02, 0x3c, 0x9a, 0x44, 0x97, 0x18, 0xc6, 0xc8, 0x03, 0xa7, 0xef, 0x0c,
0x3d, 0xea, 0xf1, 0x2a, 0x40, 0x5e, 0x02, 0xd0, 0x24, 0xfa, 0x82, 0x5c, 0x64, 0x05, 0x0b, 0x1a,
0x9a, 0x06, 0x5e, 0x47, 0xc8, 0x73, 0xe8, 0x4e, 0x46, 0x97, 0x98, 0xa5, 0x0b, 0x19, 0xb8, 0x7d,
0x67, 0xd8, 0xa3, 0xdd, 0xc4, 0x62, 0x12, 0x40, 0x67, 0x32, 0xfa, 0x9a, 0xc5, 0x72, 0x11, 0x34,
0x35, 0xd5, 0x49, 0x0c, 0x54, 0xcc, 0x0c, 0xe7, 0xb7, 0x9b, 0x12, 0x83, 0x96, 0x61, 0x84, 0x81,
0xca, 0xcd, 0x4c, 0x86, 0x5c, 0xde, 0x66, 0x39, 0x06, 0x6d, 0xcd, 0x79, 0xa2, 0x0a, 0x90, 0x3e,
0xf8, 0x63, 0x14, 0x4b, 0x59, 0x94, 0x37, 0x61, 0x8e, 0x41, 0x47, 0xdb, 0xf1, 0xe3, 0x6d, 0x88,
0xbc, 0x01, 0x7f, 0x9a, 0x3d, 0xe0, 0x6a, 0x52, 0xf0, 0x3c, 0x94, 0x41, 0xb7, 0xef, 0x0c, 0xfd,
0x73, 0x62, 0xaa, 0x3f, 0xdb, 0x61, 0xa8, 0x5f, 0x6e, 0xc1, 0xe0, 0x07, 0x1c, 0x4c, 0x8b, 0x8c,
0x49, 0xe4, 0x17, 0x77, 0xc8, 0x24, 0x21, 0xd0, 0xbc, 0x0e, 0xc5, 0x52, 0xb7, 0xa3, 0x47, 0x9b,
0x79, 0x28, 0x96, 0xe4, 0x00, 0x9c, 0x6f, 0xba, 0x01, 0x3d, 0xea, 0x3c, 0x28, 0xf4, 0xdd, 0x16,
0xec, 0x6c, 0x94, 0x6b, 0x99, 0xe5, 0x28, 0x64, 0x98, 0x97, 0xb6, 0xd6, 0x6d, 0x60, 0x70, 0x03,
0xdd, 0x2b, 0xdc, 0xd4, 0xca, 0xe3, 0xe2, 0x9e, 0x55, 0xca, 0x71, 0x71, 0xcf, 0xc8, 0x21, 0xb8,
0x57, 0xb8, 0xb1, 0xda, 0xee, 0x12, 0x1f, 0xe9, 0xb9, 0x8f, 0xf5, 0xde, 0x03, 0x4c, 0x22, 0x31,
0xc3, 0x34, 0x57, 0x8a, 0xc7, 0xd0, 0x8a, 0x36, 0x12, 0x85, 0x96, 0x3c, 0xa0, 0x06, 0xec, 0x2b,
0x34, 0x1e, 0x2b, 0xfc, 0x69, 0xec, 0xb5, 0x49, 0x39, 0x18, 0x4d, 0xa7, 0xd6, 0x94, 0x1b, 0x4d,
0xa7, 0x4a, 0x75, 0x8c, 0xa5, 0x5c, 0xd8, 0xdc, 0x56, 0xac, 0x80, 0x52, 0x1d, 0x65, 0xe9, 0x05,
0x8b, 0xb3, 0x90, 0x55, 0xbe, 0xa2, 0x2a, 0xa0, 0xd8, 0x5b, 0xbe, 0xc6, 0x0f, 0xc5, 0xaa, 0xe0,
0x75, 0x17, 0xaa, 0x00, 0x39, 0x81, 0x36, 0xc5, 0xf8, 0x3a, 0x7c, 0xb0, 0x23, 0x6f, 0x73, 0x8d,
0xd4, 0x06, 0x7d, 0xe4, 0x88, 0x4c, 0x31, 0x66, 0xe0, 0xdd, 0xd4, 0x62, 0xb5, 0x27, 0xa3, 0xd5,
0x1a, 0x15, 0xd5, 0x31, 0x7b, 0x12, 0x19, 0xa8, 0xb2, 0x28, 0xc6, 0xb3, 0x45, 0x96, 0x98, 0x21,
0xf7, 0x68, 0x97, 0x5b, 0xac, 0x76, 0x56, 0x2b, 0x1a, 0xd6, 0xd3, 0x2c, 0xa4, 0x75, 0x44, 0x57,
0xb1, 0x5a, 0xa3, 0xa1, 0xc1, 0x56, 0x51, 0x05, 0x06, 0x3f, 0xc1, 0xa3, 0x38, 0x97, 0x21, 0x4b,
0x57, 0x68, 0x86, 0xee, 0xec, 0x0d, 0xbd, 0x51, 0x0d, 0xfd, 0x18, 0x5a, 0x66, 0xb9, 0x4d, 0x23,
0x5a, 0xf7, 0x7a, 0xb5, 0x4f, 0xa0, 0x6d, 0xcf, 0xc1, 0x74, 0xa0, 0xbd, 0x30, 0xc7, 0x70, 0x08,
0xee, 0x05, 0x9b, 0xdb, 0xda, 0x5d, 0x64, 0x73, 0x95, 0x3f, 0xd2, 0x83, 0x6b, 0xef, 0x0c, 0x6e,
0x30, 0x87, 0xa3, 0x09, 0x0f, 0x73, 0x8c, 0xd6, 0x49, 0x82, 0xfc, 0x73, 0x19, 0x87, 0x12, 0xc9,
0x2b, 0x00, 0x5e, 0x79, 0x52, 0x83, 0x76, 0x87, 0xfe, 0xf9, 0xa1, 0x5d, 0xea, 0xda, 0x2c, 0xdd,
0x79, 0xf3, 0x9f, 0xf9, 0xff, 0x6a, 0x40, 0x6f, 0x8c, 0x79, 0xc1, 0x84, 0xe4, 0xa1, 0x54, 0x77,
0x3c, 0x84, 0x4e, 0xc6, 0x32, 0x99, 0x8b, 0x54, 0x97, 0xeb, 0x9f, 0x3f, 0xb1, 0xf2, 0xf6, 0x37,
0x41, 0x2b, 0x9a, 0xbc, 0x05, 0x2f, 0x89, 0xd6, 0xda, 0x97, 0x08, 0x1a, 0xda, 0x4a, 0x60, 0xdf,
0xfe, 0x63, 0x9c, 0x6e, 0x9f, 0x92, 0x53, 0xe8, 0x0a, 0xb3, 0xb2, 0x22, 0x70, 0x75, 0xda, 0x51,
0x95, 0x56, 0x2f, 0x33, 0xad, 0x9f, 0x90, 0x77, 0xd0, 0x2b, 0xcd, 0x49, 0xe2, 0x9d, 0xce, 0x69,
0xea, 0x9c, 0x67, 0xd5, 0x29, 0xef, 0x9c, 0x2b, 0xdd, 0x7f, 0x49, 0x4e, 0xc1, 0x5b, 0xe2, 0xc6,
0xa6, 0xb5, 0x74, 0xda, 0x53, 0x9b, 0x56, 0xdd, 0x21, 0xdd, 0xbe, 0x88, 0xda, 0x9a, 0x7a, 0xfd,
0x37, 0x00, 0x00, 0xff, 0xff, 0xb0, 0x19, 0x99, 0xbe, 0x28, 0x05, 0x00, 0x00,
}

View File

@@ -9,7 +9,7 @@ message InitMsg {
uint32 SecType = 5;
uint32 StartTime = 6;
string DesktopName = 7;
string PixelFormat = 8;
PixelFormat PixelFormat = 8;
}
message PointerEvent {

View File

@@ -41,6 +41,7 @@ func listPeople(w io.Writer, demo *pb.Demonstration) {
fmt.Printf("SecType: %v \n", demo.Initmsg.GetSecType())
fmt.Printf("StartTime: %v \n", demo.Initmsg.GetStartTime())
fmt.Printf("DesktopName: %v \n", demo.Initmsg.GetDesktopName())
fmt.Printf("PixelFormat: %v \n", demo.Initmsg.GetPixelFormat())
// for _, p := range demo.Segments {
// writeSegment(w, p)

View File

@@ -108,6 +108,19 @@ func (r *ProtoRecorder) writeStartSession(initMsg *common.ServerInit) error {
// r.buffer.WriteString(desktopName)
pixel_format := &pb.PixelFormat{
BPP: uint32(initMsg.PixelFormat.BPP),
Depth: uint32(initMsg.PixelFormat.Depth),
BigEndian: uint32(initMsg.PixelFormat.BigEndian),
TrueColor: uint32(initMsg.PixelFormat.TrueColor),
RedMax: uint32(initMsg.PixelFormat.RedMax),
GreenMax: uint32(initMsg.PixelFormat.GreenMax),
BlueMax: uint32(initMsg.PixelFormat.BlueMax),
RedShift: uint32(initMsg.PixelFormat.RedShift),
GreenShift: uint32(initMsg.PixelFormat.GreenShift),
BlueShift: uint32(initMsg.PixelFormat.BlueShift),
}
initMsgProto := &pb.InitMsg{
RfbHeader: "FBS 001.000",
RfbVersion: versionMsg_3_3,
@@ -116,6 +129,7 @@ func (r *ProtoRecorder) writeStartSession(initMsg *common.ServerInit) error {
SecType: uint32(SecTypeNone),
StartTime: uint32(r.startTime),
DesktopName: desktopName,
PixelFormat: pixel_format,
}
r.demonstration.Initmsg = initMsgProto
//binary.Write(&r.buffer, binary.BigEndian, byte(0)) // add null termination for desktop string