Merge pull request #532 from BBBBlarry/master

JLLeitschuh · JLLeitschuh · commit 59926fabcef1 · 2016-03-03T17:14:17.000-05:00
Rebased: read mjpeg format from TrendNet and Axis cameras
diff --git a/core/src/main/java/edu/wpi/grip/core/sources/IPCameraFrameGrabber.java b/core/src/main/java/edu/wpi/grip/core/sources/IPCameraFrameGrabber.java
@@ -162,14 +162,15 @@ byte[] readImage() throws IOException {
                 }
             }
         }
+        
         // find embedded jpeg in stream
-        final String subheader = sb.toString();
+        final String subheader = sb.toString().toLowerCase();
         //log.debug(subheader);
 
         // if (boundryKey == null)
         // {
         // Yay! - server was nice and sent content length
-        int c0 = subheader.indexOf("Content-Length: ");
+        int c0 = subheader.indexOf("content-length: ");
         int c1 = subheader.indexOf('\r', c0);
 
         if (c0 < 0) {

Original file line number	Diff line number	Diff line change
`@@ -162,14 +162,15 @@ byte[] readImage() throws IOException {`
`162`	`162`	`}`
`163`	`163`	`}`
`164`	`164`	`}`
	`165`	`+`
`165`	`166`	`// find embedded jpeg in stream`
`166`		`- final String subheader = sb.toString();`
	`167`	`+ final String subheader = sb.toString().toLowerCase();`
`167`	`168`	`//log.debug(subheader);`
`168`	`169`
`169`	`170`	`// if (boundryKey == null)`
`170`	`171`	`// {`
`171`	`172`	`// Yay! - server was nice and sent content length`
`172`		`- int c0 = subheader.indexOf("Content-Length: ");`
	`173`	`+ int c0 = subheader.indexOf("content-length: ");`
`173`	`174`	`int c1 = subheader.indexOf('\r', c0);`
`174`	`175`
`175`	`176`	`if (c0 < 0) {`