v4l2: ignore devices with no channels

Change-Id: I3eed29011806d8807d581c572baae8bfdc24e0eb Tuleap: #486
savoirfairelinux · Mar 18, 2016 · 88efa70 · 88efa70
1 parent e0fbbb0
commit 88efa70
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/media/video/v4l2/video_device_impl.cpp b/src/media/video/v4l2/video_device_impl.cpp
@@ -463,7 +463,8 @@ VideoDeviceImpl::VideoDeviceImpl(const string& path)
         if (input.type & V4L2_INPUT_TYPE_CAMERA) {
             VideoV4l2Channel channel(idx, (const char*) input.name);
             channel.readFormats(fd);
-            channels_.push_back(channel);
+            if (not channel.getSizeList().empty())
+                channels_.push_back(channel);
         }
 
         input.index = ++idx;

diff --git a/src/media/video/video_device.h b/src/media/video/video_device.h
@@ -166,10 +166,10 @@ class VideoDevice {
      * Returns the parameters needed for actual use of the device
      */
     DeviceParams getDeviceParams() const;
+    std::vector<std::string> getChannelList() const;
 
 private:
 
-    std::vector<std::string> getChannelList() const;
     std::vector<VideoSize> getSizeList(const std::string& channel) const;
     std::vector<FrameRate> getRateList(const std::string& channel, VideoSize size) const;
 

diff --git a/src/media/video/video_device_monitor.cpp b/src/media/video/video_device_monitor.cpp
@@ -183,6 +183,9 @@ VideoDeviceMonitor::addDevice(const string& node)
     // instantiate a new unique device
     try {
         VideoDevice dev {node};
+        if (dev.getChannelList().empty())
+            return;
+
         giveUniqueName(dev, devices_);
 
         // restore its preferences if any, or store the defaults