Fixes to gstreamer pipelines and Camera AVStreamManager Init

Author: pidarped

examples/camera-app/camera-common/src/camera-app.cpp

@@ -78,9 +78,12 @@ void CameraAppInit(CameraDeviceInterface * cameraDevice)
 {
     gCameraApp = Platform::MakeUnique<CameraApp>(kCameraEndpointId, cameraDevice);
     gCameraApp.get()->InitCameraDeviceClusters();
+
+    ChipLogDetail(NotSpecified, "CameraAppInit: Initialized Camera clusters");
 }
 
 void CameraAppShutdown()
 {
+    ChipLogDetail(NotSpecified, "CameraAppShutdown: Shutting down Camera app");
     gCameraApp = nullptr;
 }

examples/camera-app/linux/BUILD.gn

@@ -53,7 +53,6 @@ executable("chip-camera-app") {
   ]
 
   libs = [ "datachannel" ]
-
   lib_dirs =
       [ rebase_path("${chip_root}/third_party/libdatachannel/repo/build") ]
 
@@ -76,7 +75,7 @@ executable("chip-camera-app") {
   output_dir = root_out_dir
 
   # Manually specify GStreamer libraries
-  libs = [
+  libs += [
     "gstreamer-1.0",
     "glib-2.0",
     "gobject-2.0",

examples/camera-app/linux/include/camera-device.h

@@ -142,7 +142,7 @@ class CameraDevice : public CameraDeviceInterface,
     void InitializeSnapshotStreams();
 
     GstElement * CreatePipeline(const std::string & pipelineString, CameraError& error);
-    CameraError SetV4l2Control(int controlId, int value);
+    CameraError SetV4l2Control(uint32_t controlId, int value);
 
     // Various cluster server delegates
     ChimeManager mChimeManager;

examples/camera-app/linux/include/clusters/camera-avstream-mgmt/camera-av-stream-manager.h

@@ -96,8 +96,6 @@ class CameraAVStreamManager : public CameraAVStreamMgmtDelegate
 
     CHIP_ERROR PersistentAttributesLoadedCallback();
 
-    void Init();
-
     CameraAVStreamManager()  = default;
     ~CameraAVStreamManager() = default;
 

examples/camera-app/linux/src/camera-device.cpp

@@ -36,8 +36,7 @@ CameraDevice::CameraDevice()
 {
     InitializeCameraDevice();
 
-    // set up the different modules/components
-    mCameraAVStreamManager.Init();
+    InitializeStreams();
 }
 
 CameraDevice::~CameraDevice()
@@ -76,6 +75,8 @@ CameraError CameraDevice::InitializeStreams()
     InitializeAudioStreams();
     InitializeSnapshotStreams();
 
+    StartVideoStream(1);
+    StartSnapshotStream(1);
     return CameraError::SUCCESS;
 }
 
@@ -184,7 +185,7 @@ GstElement* CameraDevice::CreatePipeline(const std::string & pipelineString, Cam
 }
 
 // Helper function to set V4L2 control
-CameraError CameraDevice::SetV4l2Control(int controlId, int value)
+CameraError CameraDevice::SetV4l2Control(uint32_t controlId, int value)
 {
     if (videoDeviceFd == -1)
     {
@@ -230,7 +231,7 @@ CameraError CameraDevice::StartVideoStream(uint16_t streamID)
 
     if (it->codec == VideoCodecEnum::kH264)
     {
-        pipelineString += "x264enc ! rtph264pay ! ";
+        pipelineString += "videoconvert ! videoscale ! x264enc tune=zerolatency ! rtph264pay ! ";
     }
     else if (it->codec == VideoCodecEnum::kHevc)
     {
@@ -241,7 +242,8 @@ CameraError CameraDevice::StartVideoStream(uint16_t streamID)
         return CameraError::ERROR_VIDEO_STREAM_START_FAILED;
     }
 
-    pipelineString += "udpsink host=127.0.0.1 port=" + VIDEO_STREAM_GST_DEST_PORT; // Known socket
+    //pipelineString += "udpsink host=127.0.0.1 port=" + VIDEO_STREAM_GST_DEST_PORT; // Known socket
+    pipelineString += "udpsink host=127.0.0.1 port=5000"; // Known socket
 
     CameraError error = CameraError::SUCCESS;
     it->videoPipeline = CreatePipeline(pipelineString, error);
@@ -298,10 +300,12 @@ CameraError CameraDevice::StartSnapshotStream(uint16_t streamID)
         return CameraError::ERROR_SNAPSHOT_STREAM_START_FAILED;
     }
 
+#if 0
     // Construct the GStreamer pipeline string
     std::string pipelineString = "v4l2src device=/dev/video0 ! "
-                                 "video/x-raw,width=" + std::to_string(it->videoRes.width) +
-                                 ",height=" + std::to_string(it->videoRes.height) + " ! ";
+                                 //"video/x-raw,width=" + std::to_string(it->videoRes.width) +
+                                 "image/jpeg,width=" + std::to_string(it->videoRes.width) +
+                                 ",height=" + std::to_string(it->videoRes.height) + ",framerate=1/1 ! ";
 
     if (it->codec == ImageCodecEnum::kJpeg)
     {
@@ -311,7 +315,9 @@ CameraError CameraDevice::StartSnapshotStream(uint16_t streamID)
     {
         return CameraError::ERROR_SNAPSHOT_STREAM_START_FAILED;
     }
+#endif
 
+    std::string pipelineString = "v4l2src device=/dev/video0 ! videoconvert ! jpegenc snapshot=true ! ";
     pipelineString += "filesink location=./capture_snapshot.jpg";
 
     // Create the GStreamer pipeline

examples/camera-app/linux/src/clusters/camera-avstream-mgmt/camera-av-stream-manager.cpp

@@ -213,9 +213,3 @@ CameraAVStreamManager::PersistentAttributesLoadedCallback()
 
     return CHIP_NO_ERROR;
 }
-
-void CameraAVStreamManager::Init()
-{
-    CameraDevice::GetInstance().InitializeStreams();
-}
-