yehor/ha_client
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves #307 Support different frame bounderies for MJPEG stream

Browse Source
This commit is contained in:
estevez-dev
2019-02-20 12:06:03 +02:00
parent 6cf80c0bfd
commit cc3c6b0087
1 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/entity_widgets/controls/camera_controls.dart
View File

@ -34,18 +34,27 @@ class _CameraControlsWidgetState extends State<CameraControlsWidget> {
cameraState = "Starting..."; cameraState = "Starting...";
}); });
Logger.d("[Received] <== ${response.headers}"); Logger.d("[Received] <== ${response.headers}");
String frameBoundary = response.headers['content-type'].split('boundary=')[1];
final int frameBoundarySize = frameBoundary.length;
List<int> primaryBuffer=[]; List<int> primaryBuffer=[];
final int imageSizeStart = 59; int imageSizeStart = 59;
int imageSizeEnd = 0; int imageSizeEnd = 0;
int imageStart = 0; int imageStart = 0;
int imageSize = 0; int imageSize = 0;
String strBuffer = ""; String strBuffer = "";
String contentType = "";
streamCompleter = Completer(); streamCompleter = Completer();
response.stream.transform( response.stream.transform(
StreamTransformer.fromHandlers( StreamTransformer.fromHandlers(
handleData: (data, sink) { handleData: (data, sink) {
primaryBuffer.addAll(data); primaryBuffer.addAll(data);
if (primaryBuffer.length >= 66) { imageStart = 0;
imageSizeEnd = 0;
if (primaryBuffer.length >= imageSizeStart + 10) {
contentType = utf8.decode(
primaryBuffer.sublist(frameBoundarySize+16, imageSizeStart + 10), allowMalformed: true).split("\r\n")[0];
Logger.d("$contentType");
imageSizeStart = frameBoundarySize + 16 + contentType.length + 18;
for (int i = imageSizeStart; i < primaryBuffer.length - 4; i++) { for (int i = imageSizeStart; i < primaryBuffer.length - 4; i++) {
strBuffer = utf8.decode( strBuffer = utf8.decode(
primaryBuffer.sublist(i, i + 4), allowMalformed: true); primaryBuffer.sublist(i, i + 4), allowMalformed: true);
@ -55,13 +64,18 @@ class _CameraControlsWidgetState extends State<CameraControlsWidget> {
break; break;
} }
} }
imageSize = int.tryParse(utf8.decode( if (imageSizeEnd > 0) {
primaryBuffer.sublist(imageSizeStart, imageSizeEnd), imageSize = int.tryParse(utf8.decode(
allowMalformed: true)); primaryBuffer.sublist(imageSizeStart, imageSizeEnd),
if (imageSize != null && primaryBuffer.length >= imageStart + imageSize + 2) { allowMalformed: true));
sink.add( Logger.d("content-length: $imageSize");
primaryBuffer.sublist(imageStart, imageStart + imageSize)); if (imageSize != null &&
primaryBuffer.removeRange(0, imageStart + imageSize + 2); primaryBuffer.length >= imageStart + imageSize + 2) {
sink.add(
primaryBuffer.sublist(
imageStart, imageStart + imageSize));
primaryBuffer.removeRange(0, imageStart + imageSize + 2);
}
} }
} }
if (timeToStop) { if (timeToStop) {