Add "greyworld" AWB option for input_raspicam

mjpg-streamer-experimental/plugins/input_raspicam/RaspiCamControl.c

@@ -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]);

mjpg-streamer-experimental/plugins/input_raspicam/mmal/CMakeLists.txt

@@ -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)
 
@@ -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)

mjpg-streamer-experimental/plugins/input_raspicam/mmal/client/CMakeLists.txt

@@ -0,0 +1 @@
+add_subdirectory(brcmjpeg)

mjpg-streamer-experimental/plugins/input_raspicam/mmal/client/brcmjpeg/CMakeLists.txt

@@ -0,0 +1,6 @@
+add_library(brcmjpeg SHARED brcmjpeg.c)
+target_link_libraries(brcmjpeg mmal_core mmal_util mmal_vc_client)
+
+include_directories(../../../../host_applications/linux/libs/sm)
+add_executable(brcmjpeg_test brcmjpeg_test.c)
+target_link_libraries(brcmjpeg_test brcmjpeg vcsm vcos)