ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Debug log when failed sending

pull/4202/head
Isaac Connor 2022-04-26 14:38:37 -04:00
parent ff6c0543fb
commit c902433c82
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/zm_stream.cpp
View File

@ -282,7 +282,7 @@ bool StreamBase::sendTextFrame(const char *frame_text) {
if ( type == STREAM_MPEG ) { if ( type == STREAM_MPEG ) {
if ( !vid_stream ) { if ( !vid_stream ) {
vid_stream = new VideoStream("pipe:", format, bitrate, effective_fps, image.Colours(), image.SubpixelOrder(), image.Width(), image.Height()); vid_stream = new VideoStream("pipe:", format, bitrate, effective_fps, image.Colours(), image.SubpixelOrder(), image.Width(), image.Height());
fprintf(stdout, "Content-type: %s\r\n\r\n", vid_stream->MimeType()); fprintf(stdout, "Content-Type: %s\r\n\r\n", vid_stream->MimeType());
vid_stream->OpenStream(); vid_stream->OpenStream();
} }
/* double pts = */ vid_stream->EncodeFrame(image.Buffer(), image.Size()); /* double pts = */ vid_stream->EncodeFrame(image.Buffer(), image.Size());
@ -294,10 +294,17 @@ bool StreamBase::sendTextFrame(const char *frame_text) {
image.EncodeJpeg(buffer, &n_bytes); image.EncodeJpeg(buffer, &n_bytes);
fputs("--" BOUNDARY "\r\nContent-Type: image/jpeg\r\n", stdout); if (0 > fputs("--" BOUNDARY "\r\nContent-Type: image/jpeg\r\n", stdout)) {
fprintf(stdout, "Content-Length: %d\r\n\r\n", n_bytes); Debug(1, "Error sending --" BOUNDARY "\r\nContent-Type: image/jpeg\r\n");
if (fwrite(buffer, n_bytes, 1, stdout) != 1) { return false;
Error("Unable to send stream text frame: %s", strerror(errno)); }
if (0 > fprintf(stdout, "Content-Length: %d\r\n\r\n", n_bytes)) {
Debug(1, "Error sending Content-Length: %d\r\n\r\n", n_bytes);
return false;
}
int rc = fwrite(buffer, n_bytes, 1, stdout);
if (rc != 1) {
Error("Unable to send stream text frame: %d %s", rc, strerror(errno));
return false; return false;
} }
fputs("\r\n\r\n", stdout); fputs("\r\n\r\n", stdout);