Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compatibility fix to get mjpg_streamer work with kernel 3.18 #3

Merged
merged 1 commit into from
Feb 11, 2015

Conversation

foosel
Copy link
Contributor

@foosel foosel commented Feb 11, 2015

Patches taken from

and adapter to current source. All credit for the actual fix goes to
"koos" on the Raspberry Pi forums.

foosel added a commit to foosel/OctoPi that referenced this pull request Feb 11, 2015
At least I got compile errors without that. That plus
jacksonliam/mjpg-streamer#3 (after
merge!) should fix the mjpg_streamer issues with kernel 3.18
jacksonliam added a commit that referenced this pull request Feb 11, 2015
Compatibility fix to get mjpg_streamer work with kernel 3.18
@jacksonliam jacksonliam merged commit 4309642 into jacksonliam:master Feb 11, 2015
@jacksonliam
Copy link
Owner

Awesome, thanks!

@koosvriezen
Copy link

Hi, this patch merges the two patches. And you should only have taken the second patch, that with the tmpbytesused/tmptimestamp.
The second patch makes sure that the v4l_buffer object isn't written to/read from after 'xioctl(vd->fd, VIDIOC_QBUF, &vd->buf)'.
Note that this patch could be improved for the yuv case too, that too accesses the v4l_buffer object for the bytesused/timestamp field

@foosel
Copy link
Contributor Author

foosel commented Feb 13, 2015

@koosvriezen hm... when I tried only the second patch (which was my initial attemp), I was still getting the same behavior as without any patches (empty image). I'll test again with just the second patch applied, maybe I messed something up during the tests.

jacksonliam added a commit that referenced this pull request Mar 16, 2016
Import numpy.core.multiarray first
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants