This repository was archived by the owner on Aug 27, 2025. It is now read-only.
Raspicam annotate updates and hello_encode fixes #481
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
It was using assumed knowledge of the padding instead. The requirements on video_encode have recently been reduced and the assumptions were therefore invalid and caused a segfault
The code was calling ilclient_get_output_buffer to retrieve a filled buffer, and then immediately returning it via OMX_FillThisBuffer before looking at the contents. OMX_FillThisBuffer does not block, but relies on waiting for the FillBufferDone callback instead. The correct order of doing things is to call ilclient_get_output_buffer (which waits on FillBufferDone if necessary), process the buffer, and then call OMX_FillThisBuffer to pass it back to OMX for filling again. The recent improvements to video_encode mean that it is faster at processing buffers and would often have reset the buffer header before hello_encode had a chance to save the data.
Adds extra fields to the IL and MMAL parameters to set justification as centre/left/right, and add an x and y offset. Retains backwards compatibility
Camera annotation can now support left and right justification of the text, and setting an x and y offset. Update the raspicam apps to allow taking these via the command line.
|
Not actually tried it but LGTM, although the mixed in whitespace changes made it a bit confusing to read. I assume there is a matching vc4 firmware change - what happens with older firmware, does it fall back or just not annotate anything? |
|
If you look at the commits instead of the combined changes, then they are clean patches. |
|
Cool, so it's a yes from me! |
popcornmix
added a commit
to raspberrypi/firmware
that referenced
this pull request
Jul 30, 2018
kernel: overlays: Fix vc4-kms-kippah-7inch kernel: dwc-otg: FIQ: Fix bad mode in data abort handler See: raspberrypi/linux#2450 bootcode: Re-enable the pull down on SD CLK pin immediately. firmware: Rawcam: Fixup buffering issues on fast fps firmware: MMAL alignment changes, plus a couple of minor fixes userland: Raspicam annotate updates and hello_encode fixes See: raspberrypi/userland#481 userland: Raspicam: Segment timestamp See: raspberrypi/userland#479 userland: Raspicam: Two more Raspicam fixes See: raspberrypi/userland#478 userland: Raspicam: Raspicam Tweaks See: raspberrypi/userland#477 userland: Raspicam: Fixed up initial timelapse delay See: raspberrypi/userland#476
popcornmix
added a commit
to Hexxeh/rpi-firmware
that referenced
this pull request
Jul 30, 2018
kernel: overlays: Fix vc4-kms-kippah-7inch kernel: dwc-otg: FIQ: Fix bad mode in data abort handler See: raspberrypi/linux#2450 bootcode: Re-enable the pull down on SD CLK pin immediately. firmware: Rawcam: Fixup buffering issues on fast fps firmware: MMAL alignment changes, plus a couple of minor fixes userland: Raspicam annotate updates and hello_encode fixes See: raspberrypi/userland#481 userland: Raspicam: Segment timestamp See: raspberrypi/userland#479 userland: Raspicam: Two more Raspicam fixes See: raspberrypi/userland#478 userland: Raspicam: Raspicam Tweaks See: raspberrypi/userland#477 userland: Raspicam: Fixed up initial timelapse delay See: raspberrypi/userland#476
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.