mirror/motion
1
0
Fork 0
mirror of https://github.com/Motion-Project/motion.git synced 2026-02-07 05:22:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Patch for bad image handling

Browse Source
This commit is contained in:
Mr Dave
2015-09-14 20:43:39 -06:00
parent 01769dbcad
commit 0c77371ad3
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@@ -1,4 +1,5 @@
Summary of Changes
* Add patch from JonGuess(issue 151452) for treatment of partial netcam images.
* Consolidate the Sqlite3 options into the code standard.
* Draft revised motion_guide.html with new options.
* Revise manual to have current options.

15
netcam_jpeg.c
View File

@@ -67,24 +67,15 @@ static boolean netcam_fill_input_buffer(j_decompress_ptr cinfo)
* path when a new image is to be processed. It is assumed that
* this routine will only be called once for the entire image.
* If an unexpected call (with start_of_file FALSE) occurs, the
* routine will insert a "fake" "end of image" marker and return
* to the library to process whatever data remains from the original
* image (the one with errors).
*
* I'm not yet clear on what the result (from the application's
* point of view) will be from this logic. If the application
* expects that a completely new image will be started, this will
* give trouble.
* routine calls ERREXIT().
*/
if (src->start_of_file) {
nbytes = src->length;
src->buffer = (JOCTET *) src->data;
} else {
/* Insert a fake EOI marker - as per jpeglib recommendation */
MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO, "%s: **fake EOI inserted**");
src->buffer[0] = (JOCTET) 0xFF;
src->buffer[1] = (JOCTET) JPEG_EOI; /* 0xD9 */
nbytes = 2;
MOTION_LOG(DBG, TYPE_NETCAM, NO_ERRNO, "%s: Not enough data from netcam.");
ERREXIT(cinfo, JERR_INPUT_EOF);
}
src->pub.next_input_byte = src->buffer;