mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-10 17:35:59 +00:00
Code Issues 1 Projects Releases Wiki Activity

rpicamsrc: fix and silence some compiler warnings

Browse source 
Some are in system headers, and in Raspi files we want
to keep modifications to a minimum.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/667>
This commit is contained in:
Tim-Philipp Müller 2020-07-09 17:31:49 +00:00
parent 4a4de61c23
commit 996d2389af
4 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/rpicamsrc/RaspiCapture.c
View file

@ -1627,7 +1627,7 @@ static void check_disable_port(MMAL_PORT_T *port)
mmal_port_disable(port); mmal_port_disable(port);
} }
void raspicapture_init() void raspicapture_init(void)
{ {
bcm_host_init(); bcm_host_init();

2
sys/rpicamsrc/RaspiCapture.h
View file

@ -126,7 +126,7 @@ typedef struct
typedef struct RASPIVID_STATE_T RASPIVID_STATE; typedef struct RASPIVID_STATE_T RASPIVID_STATE;
void raspicapture_init(); void raspicapture_init(void);
void raspicapture_default_config(RASPIVID_CONFIG *config); void raspicapture_default_config(RASPIVID_CONFIG *config);
RASPIVID_STATE *raspi_capture_setup(RASPIVID_CONFIG *config); RASPIVID_STATE *raspi_capture_setup(RASPIVID_CONFIG *config);
gboolean raspi_capture_start(RASPIVID_STATE *state); gboolean raspi_capture_start(RASPIVID_STATE *state);

4
sys/rpicamsrc/gstrpicamsrc.c
View file

@ -246,7 +246,9 @@ G_DEFINE_TYPE_WITH_CODE (GstRpiCamSrc, gst_rpi_cam_src,
#define C_ENUM(v) ((gint) v) #define C_ENUM(v) ((gint) v)
GType static GType gst_rpi_cam_src_sensor_mode_get_type (void);
static GType
gst_rpi_cam_src_sensor_mode_get_type (void) gst_rpi_cam_src_sensor_mode_get_type (void)
{ {
static const GEnumValue values[] = { static const GEnumValue values[] = {

13
sys/rpicamsrc/meson.build
View file

@ -49,6 +49,17 @@ foreach rpi_lib : ['mmal_core', 'mmal_util', 'mmal_vc_client', 'vcos', 'bcm_host
mmal_deps += [l] mmal_deps += [l]
endforeach endforeach
rpi_warn_flags = cc.get_supported_arguments([
# vcos/mmal headers
'-Wno-redundant-decls',
# RaspiCapture.c + RaspiCamControl.c
'-Wno-discarded-qualifiers',
'-Wno-declaration-after-statement',
'-Wno-missing-prototypes',
'-Wno-missing-declarations',
'-Wno-stringop-truncation',
])
gnome = import('gnome') gnome = import('gnome')
enums = gnome.mkenums_simple('gstrpicam-enum-types', enums = gnome.mkenums_simple('gstrpicam-enum-types',
@ -59,7 +70,7 @@ enums = gnome.mkenums_simple('gstrpicam-enum-types',
# we might need '-Wl,--no-as-needed' or b_asneeded=false on ubuntu, tbd # we might need '-Wl,--no-as-needed' or b_asneeded=false on ubuntu, tbd
gstrpicamsrc = library('gstrpicamsrc', gstrpicamsrc = library('gstrpicamsrc',
rpicamsrc_sources, enums, rpicamsrc_sources, enums,
c_args: [gst_plugins_good_args, rpi_inc_args], c_args: [gst_plugins_good_args, rpi_inc_args, rpi_warn_flags],
include_directories: [configinc, libsinc], include_directories: [configinc, libsinc],
dependencies: [gst_dep, gstbase_dep, gstvideo_dep] + mmal_deps, dependencies: [gst_dep, gstbase_dep, gstvideo_dep] + mmal_deps,
install_dir: plugins_install_dir, install_dir: plugins_install_dir,