Fix#51 (#60)

* add pipeline nil check to linux adapter

* log more detailed errors

* clean up adapter

* fix string format booleans

Co-authored-by: Daniel Paulus <[email protected]>

Author: danielPaulusMesmer

screencapture/discovery.go

@@ -205,12 +205,21 @@ func isMuxConfig(confDesc gousb.ConfigDesc) bool {
 }
 
 func findInterfaceForSubclass(confDesc gousb.ConfigDesc, subClass gousb.Class) (bool, int) {
-	for i := range confDesc.Interfaces {
+	for _, iface := range confDesc.Interfaces {
 		//usually the interfaces we care about have only one altsetting
-		isVendorClass := confDesc.Interfaces[i].AltSettings[0].Class == gousb.ClassVendorSpec
-		isCorrectSubClass := confDesc.Interfaces[i].AltSettings[0].SubClass == subClass
+
+		for _, alt := range iface.AltSettings {
+			isVendorClass := alt.Class == gousb.ClassVendorSpec
+			isCorrectSubClass := alt.SubClass == subClass
+			log.Debugf("found: %t", isCorrectSubClass && isVendorClass)
+
+		}
+		isVendorClass := iface.AltSettings[0].Class == gousb.ClassVendorSpec
+		isCorrectSubClass := iface.AltSettings[0].SubClass == subClass
+
+		log.Debugf("iface:%v altsettings:%d isvendor:%t isub:%t", iface, len(iface.AltSettings), isVendorClass, isCorrectSubClass)
 		if isVendorClass && isCorrectSubClass {
-			return true, confDesc.Interfaces[i].Number
+			return true, iface.Number
 		}
 	}
 	return false, -1

screencapture/frameextractor.go

@@ -98,6 +98,9 @@ func (gsta GstAdapter) Stop() {
 		log.Warn("Failed sending EOS signal for video app source")
 	}
 
+	if gsta.pipeline == nil {
+		return
+	}
 	bus := gsta.pipeline.GetBus()
 
 	//I hope those are 60 seconds

screencapture/frameextractor_test.go

@@ -1,7 +1,10 @@
 package screencapture
 
 import (
+	"encoding/binary"
 	"errors"
+	"fmt"
+	"io"
 
 	"github.com/google/gousb"
 	log "github.com/sirupsen/logrus"
@@ -35,15 +38,13 @@ func (usa *UsbAdapter) StartReading(device IosDevice, receiver UsbDataReceiver,
 	}
 	confignum, _ := usbDevice.ActiveConfigNum()
 
-	log.Debugf("Config is active: %d", confignum)
+	log.Debugf("Config is active: %d, QT config is: %d", confignum, device.QTConfigIndex)
 
-	config, err := usbDevice.Config(confignum)
+	config, err := usbDevice.Config(device.QTConfigIndex)
 	if err != nil {
 		return errors.New("Could not retrieve config")
 	}
 
-	sendQTConfigControlRequest(usbDevice)
-
 	log.Debugf("QT Config is active: %s", config.String())
 
 	val, err := usbDevice.Control(0x02, 0x01, 0, 0x86, make([]byte, 0))
@@ -94,22 +95,27 @@ func (usa *UsbAdapter) StartReading(device IosDevice, receiver UsbDataReceiver,
 		return err
 	}
 	log.Debug("Endpoint claimed")
-	log.Infof("Device '%s' USB connection ready", device.SerialNumber)
+	log.Infof("Device '%s' USB connection ready, waiting for ping..", device.SerialNumber)
 	go func() {
-
-		frameExtractor := NewLengthFieldBasedFrameExtractor()
 		for {
-			buffer := make([]byte, 65536)
+			buffer := make([]byte, 4)
 
-			n, err := stream.Read(buffer)
+			n, err := io.ReadFull(stream, buffer)
 			if err != nil {
-				log.Error("couldn't read bytes", err)
+				log.Errorf("Failed reading 4bytes length with err:%s only received: %d", err, n)
 				return
 			}
-			frame, isCompleteFrame := frameExtractor.ExtractFrame(buffer[:n])
-			if isCompleteFrame {
-				receiver.ReceiveData(frame)
+			//the 4 bytes header are included in the length, so we need to subtract them
+			//here to know how long the payload will be
+			length := binary.LittleEndian.Uint32(buffer) - 4
+			dataBuffer := make([]byte, length)
+
+			n, err = io.ReadFull(stream, dataBuffer)
+			if err != nil {
+				log.Errorf("Failed reading payload with err:%s only received: %d/%d bytes", err, n, length)
+				return
 			}
+			receiver.ReceiveData(dataBuffer)
 		}
 	}()
 
@@ -125,6 +131,11 @@ func (usa *UsbAdapter) StartReading(device IosDevice, receiver UsbDataReceiver,
 	iface.Close()
 
 	sendQTDisableConfigControlRequest(usbDevice)
+	log.Debug("Resetting device config")
+	_, err = usbDevice.Config(device.UsbMuxConfigIndex)
+	if err != nil {
+		log.Warn(err)
+	}
 
 	return nil
 }
@@ -148,6 +159,11 @@ func grabInBulk(setting gousb.InterfaceSetting) (int, error) {
 }
 
 func grabQuickTimeInterface(config *gousb.Config) (*gousb.Interface, error) {
-	_, ifaceIndex := findInterfaceForSubclass(config.Desc, QuicktimeSubclass)
+	log.Debug("Looking for quicktime interface..")
+	found, ifaceIndex := findInterfaceForSubclass(config.Desc, QuicktimeSubclass)
+	if !found {
+		return nil, fmt.Errorf("did not find interface %v", config)
+	}
+	log.Debugf("Found Quicktimeinterface: %d", ifaceIndex)
 	return config.Interface(ifaceIndex, 0)
 }