From 938e7b50ca198ffb05d8fcb393d5c42f3a1bb3f7 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 13 Oct 2014 16:18:20 +0300 Subject: Add camera support for RPi and SABRE Include necessary gstreamer plugins to enable camera usage in Qt. Camera is enabled in RPi boot configuration, and needed kernel modules are loaded during boot on in RPi and SABRE. Change-Id: Iaeb17933b7d7dabb30db638db6594ab6aada05a0 Reviewed-by: Yoann Lopes Reviewed-by: Gatis Paeglis --- conf/distro/include/imx6qsabresd.conf | 4 +++- conf/distro/include/raspberrypi.conf | 4 ++++ recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb | 8 ++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf index 4aae29e..2faf285 100644 --- a/conf/distro/include/imx6qsabresd.conf +++ b/conf/distro/include/imx6qsabresd.conf @@ -29,7 +29,7 @@ BOOTFS_CONTENT = "\ ${KERNEL_IMAGETYPE}-imx6q-sabresd-ldo.dtb:imx6q-sabresd-ldo.dtb \ u-boot-${MACHINE}.imx:u-boot.imx \ " -BOOTFS_DEPENDS = "u-boot:do_deploy" +BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy" PREFERRED_VERSION_gpu-viv-bin-mx6q = "3.10.17-1.0.1-hfp" PREFERRED_VERSION_imx-lib = "3.10.17-1.0.0" @@ -59,4 +59,6 @@ MACHINE_EXTRA_INSTALL_SDK_HOST = "\ wayland-nativesdk \ " +module_autoload_mxc_v4l2_capture = "mxc_v4l2_capture" + ADB_PRODUCTID = "0x0000" diff --git a/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf index 61cebb4..d0a400e 100644 --- a/conf/distro/include/raspberrypi.conf +++ b/conf/distro/include/raspberrypi.conf @@ -39,6 +39,10 @@ MACHINE_EXTRA_INSTALL_SDK = " \ " module_autoload_snd-bcm2835 = "snd-bcm2835" +module_autoload_bcm2835-v4l2 = "bcm2835-v4l2" +module_conf_bcm2835-v4l2 = "options bcm2835-v4l2 gst_v4l2src_is_broken=1" # additional memory for GPU GPU_MEM = "128" +# video camera support +VIDEO_CAMERA = "1" diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb index 6cfb53d..fdfca05 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb @@ -31,15 +31,23 @@ RDEPENDS_${PN} = "\ gst-meta-audio \ gst-plugins-good \ gst-plugins-base-app \ + gst-plugins-base-audiorate \ + gst-plugins-base-videorate \ + gst-plugins-base-encodebin \ gst-plugins-good-videofilter \ gst-plugins-good-id3demux \ gst-plugins-good-auparse \ gst-plugins-good-isomp4 \ gst-plugins-good-icydemux \ + gst-plugins-good-video4linux2 \ + gst-plugins-good-multifile \ + gst-plugins-good-videocrop \ gst-plugins-ugly-rmdemux \ gst-plugins-ugly-asf \ gst-plugins-ugly-a52dec \ gst-plugins-bad-mpegdemux \ gst-plugins-bad-faad \ + gst-plugins-bad-camerabin2 \ + gst-plugins-bad-jpegformat \ gst-ffmpeg \ " -- cgit v1.2.3-54-g00ecf