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.

Sign up for GitHub

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

Jump to bottom

Mmal test #1

Open
wants to merge 2 commits into
base: mmal-test
Choose a base branch
from
Open

Mmal test #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e63f948
dirty hack to get ffmpeg to compile with jessie - libav10?
lowflyerUK Nov 13, 2015
003a99e
Slightly better hack to get ffmpeg working with jessie.
lowflyerUK Nov 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions README
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
MMAL README
-----------
Even more experimental MMAL README
----------------------------------
Forked from dozencrows superb work.

Added option to output both secondary and normal pictures.
The smaller picture is a good thumbnail if you need to reduce network load.

Manually merged updates from https://github.com/Mr-Dave/motion so that it works with libavformat56 on Rasbian Jessie.
This needs testing - in particular timelapse movies and on older versions of libavformat.

Added configs/motion-mmalcam-both.conf.
Works on Pi 2 at 640x480 at 4 fps with x4 upscale so stills are 2560x1920.
Uses up to about 50% of one cpu (so about 13% of available cpu).

Original MMAL README
--------------------
This is an experimental version of motion that adds support for the
Raspberry Pi's CSI camera module, via the MMAL API.

Expand Down
14 changes: 12 additions & 2 deletions conf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ struct config conf_template = {
mmalcam_raw_capture_file: NULL,
mmalcam_buffer2_upscale: 0,
mmalcam_buffer2_jpeg: 0,
output_both_pictures: 0,
#endif
text_changes: 0,
text_left: NULL,
Expand Down Expand Up @@ -486,6 +487,15 @@ config_param config_params[] = {
copy_string,
print_string
},
{
"output_both_pictures",
"# Output both primary and secondary pictures\n"
" Default: off",
0,
CONF_OFFSET(output_both_pictures),
copy_bool,
print_bool
},
#endif
{
"auto_brightness",
Expand Down Expand Up @@ -850,7 +860,7 @@ config_param config_params[] = {
copy_string,
print_string
},
{
/* {
"ffmpeg_deinterlace",
"# Use ffmpeg to deinterlace video. Necessary if you use an analog camera\n"
"# and see horizontal combing on moving objects in video or pictures.\n"
Expand All @@ -859,7 +869,7 @@ config_param config_params[] = {
CONF_OFFSET(ffmpeg_deinterlace),
copy_bool,
print_bool
},
}, */
#endif /* HAVE_FFMPEG */
#ifdef HAVE_SDL
{
Expand Down
3 changes: 2 additions & 1 deletion conf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ struct config {
int ffmpeg_output_secondary;
int ffmpeg_bps;
int ffmpeg_vbr;
int ffmpeg_deinterlace;
/* int ffmpeg_deinterlace; */
const char *ffmpeg_video_codec;
#ifdef HAVE_SDL
int sdl_threadnr;
Expand Down Expand Up @@ -135,6 +135,7 @@ struct config {
int mmalcam_buffer2_upscale;
const char *mmalcam_raw_capture_file;
int mmalcam_buffer2_jpeg;
int output_both_pictures;
#endif
int text_changes;
const char *text_left;
Expand Down
Loading