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

raspicam -awb greyworld and other new options support #274

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

raspicam -awb greyworld and other new options support #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion mjpg-streamer-experimental/plugins/input_raspicam/RaspiCamControl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@ static XREF_T awb_map[] =
{"fluorescent", MMAL_PARAM_AWBMODE_FLUORESCENT},
{"incandescent", MMAL_PARAM_AWBMODE_INCANDESCENT},
{"flash", MMAL_PARAM_AWBMODE_FLASH},
{"horizon", MMAL_PARAM_AWBMODE_HORIZON}
{"horizon", MMAL_PARAM_AWBMODE_HORIZON},
{"greyworld", MMAL_PARAM_AWBMODE_GREYWORLD}
};

static const int awb_map_size = sizeof(awb_map) / sizeof(awb_map[0]);
Expand All @@ -98,6 +99,9 @@ static XREF_T imagefx_map[] =
{"none", MMAL_PARAM_IMAGEFX_NONE},
{"negative", MMAL_PARAM_IMAGEFX_NEGATIVE},
{"solarise", MMAL_PARAM_IMAGEFX_SOLARIZE},
{"posterize", MMAL_PARAM_IMAGEFX_POSTERIZE},
{"whiteboard", MMAL_PARAM_IMAGEFX_WHITEBOARD},
{"blackboard", MMAL_PARAM_IMAGEFX_BLACKBOARD},
{"sketch", MMAL_PARAM_IMAGEFX_SKETCH},
{"denoise", MMAL_PARAM_IMAGEFX_DENOISE},
{"emboss", MMAL_PARAM_IMAGEFX_EMBOSS},
Expand Down
41 changes: 33 additions & 8 deletions mjpg-streamer-experimental/plugins/input_raspicam/mmal/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# We support building both static and shared libraries
if (NOT DEFINED LIBRARY_TYPE)
set(LIBRARY_TYPE SHARED)
endif (NOT DEFINED LIBRARY_TYPE)

add_definitions(-Wall -Werror)

Expand All @@ -6,15 +10,36 @@ add_library(mmal SHARED util/mmal_util.c)
add_subdirectory(core)
add_subdirectory(util)
add_subdirectory(vc)

#add_subdirectory(test/lua)
#add_subdirectory(test/standalone)

if(BUILD_MMAL_APPS)
add_subdirectory(components)
add_subdirectory(openmaxil)
add_subdirectory(client)

target_link_libraries(mmal mmal_core mmal_util mmal_vc_client vcos mmal_components)
else(BUILD_MMAL_APPS)
target_link_libraries(mmal mmal_core mmal_util mmal_vc_client)
endif(BUILD_MMAL_APPS)

install(TARGETS mmal DESTINATION lib)
install(FILES
mmal.h
mmal_buffer.h
mmal_clock.h
mmal_common.h
mmal_component.h
mmal_encodings.h
mmal_events.h
mmal_format.h
mmal_logging.h
mmal_parameters.h
mmal_parameters_audio.h
mmal_parameters_camera.h
mmal_parameters_clock.h
mmal_parameters_common.h
mmal_parameters_video.h
mmal_pool.h mmal_port.h
mmal_queue.h
mmal_types.h
DESTINATION include/interface/mmal
)

# Test apps
if(BUILD_MMAL_APPS)
add_subdirectory(test)
endif(BUILD_MMAL_APPS)
11 changes: 10 additions & 1 deletion mjpg-streamer-experimental/plugins/input_raspicam/mmal/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
add_library (mmal_core SHARED
add_library (mmal_core ${LIBRARY_TYPE}
mmal_format.c
mmal_port.c
mmal_port_clock.c
Expand All @@ -14,3 +14,12 @@ add_library (mmal_core SHARED
target_link_libraries (mmal_core vcos)

install(TARGETS mmal_core DESTINATION lib)
install(FILES
mmal_buffer_private.h
mmal_clock_private.h
mmal_component_private.h
mmal_core_private.h
mmal_port_private.h
mmal_events_private.h
DESTINATION include/interface/mmal/core
)
Loading