Ticket #37833: diff-fix-issue108-ffmpeg-1.1.x-compatibility.patch

include/bob/daq/Camera.h

@@ -35 +35 @@
   /**
    * Pixel format
    */
-  enum PixelFormat {
+  enum CamPixFormat {
     OTHER,
     YUYV,
     MJPEG,
@@ -61 +61 @@
      * @param frameNb     frame number
      * @param timestamp   frame timestamp (in seconds)
      */
-    virtual void imageReceived(unsigned char* image, PixelFormat pixelFormat, int width, int height, int stride, int size, int frameNb, double timestamp) = 0;
+    virtual void imageReceived(unsigned char* image, CamPixFormat pixelFormat, int width, int height, int stride, int size, int frameNb, double timestamp) = 0;
   };
 
   /**
@@ -134 +134 @@
    * @param[out] pixelFormats supported pixel formats
    * @return 0 on success
    */
-  virtual int getSupportedPixelFormats(std::vector<PixelFormat>& pixelFormats) = 0;
+  virtual int getSupportedCamPixFormats(std::vector<CamPixFormat>& pixelFormats) = 0;
   
   /**
    * Get the list of supported frame sizes for a pixel format
@@ -143 +143 @@
    * @param[out] frameSizes supported frame sizes
    * @return 0 on success
    */
-  virtual int getSupportedFrameSizes(PixelFormat pixelFormat, std::vector<FrameSize>& frameSizes) = 0;
+  virtual int getSupportedFrameSizes(CamPixFormat pixelFormat, std::vector<FrameSize>& frameSizes) = 0;
   
   /**
    * Get the list of supported frame intervals for a pixel format and a frame size
@@ -153 +153 @@
    * @param[out] frameIntervals supported frame intervals
    * @return 0 on success
    */
-  virtual int getSupportedFrameIntervals(PixelFormat pixelFormat, FrameSize& frameSize, std::vector<FrameInterval>& frameIntervals) = 0;
+  virtual int getSupportedFrameIntervals(CamPixFormat pixelFormat, FrameSize& frameSize, std::vector<FrameInterval>& frameIntervals) = 0;
 
-  virtual PixelFormat getPixelFormat() const = 0;
-  virtual void setPixelFormat(PixelFormat pixelFormat) = 0;
+  virtual CamPixFormat getCamPixFormat() const = 0;
+  virtual void setCamPixFormat(CamPixFormat pixelFormat) = 0;
   
   virtual FrameSize getFrameSize() const = 0;
   virtual void setFrameSize(FrameSize& frameSize) = 0;

include/bob/daq/SimpleController.h

@@ -34 +34 @@
   virtual ~SimpleController();
   
   virtual void keyPressed(int key);
-  virtual void imageReceived(unsigned char* image, Camera::PixelFormat pixelformat, int width, int height, int stride, int size, int frameNb, double timestamp);
+  virtual void imageReceived(unsigned char* image, Camera::CamPixFormat pixelformat, int width, int height, int stride, int size, int frameNb, double timestamp);
 
   void stop();
   

include/bob/daq/V4LCamera.h

@@ -43 +43 @@
   void stop();
   void wait();
 
-  int getSupportedPixelFormats(std::vector<PixelFormat>& pixelFormats);
-  int getSupportedFrameSizes(PixelFormat pixelFormat, std::vector<FrameSize>& frameSizes);
-  int getSupportedFrameIntervals(PixelFormat pixelFormat, FrameSize& frameSize, std::vector<FrameInterval>& frameIntervals);
+  int getSupportedCamPixFormats(std::vector<CamPixFormat>& pixelFormats);
+  int getSupportedFrameSizes(CamPixFormat pixelFormat, std::vector<FrameSize>& frameSizes);
+  int getSupportedFrameIntervals(CamPixFormat pixelFormat, FrameSize& frameSize, std::vector<FrameInterval>& frameIntervals);
 
-  PixelFormat getPixelFormat() const;
-  void setPixelFormat(PixelFormat pixelFormat);
+  CamPixFormat getCamPixFormat() const;
+  void setCamPixFormat(CamPixFormat pixelFormat);
   
   FrameSize getFrameSize() const;
   void setFrameSize(FrameSize& frameSize);

include/bob/daq/VideoReaderCamera.h

@@ -40 +40 @@
   void stop();
   void wait();
 
-  int getSupportedPixelFormats(std::vector<PixelFormat>& pixelFormats);
-  int getSupportedFrameSizes(PixelFormat pixelFormat, std::vector<FrameSize>& frameSizes);
-  int getSupportedFrameIntervals(PixelFormat pixelFormat, FrameSize& frameSize, std::vector<FrameInterval>& frameIntervals);
+  int getSupportedCamPixFormats(std::vector<Camera::CamPixFormat>& pixelFormats);
+  int getSupportedFrameSizes(Camera::CamPixFormat pixelFormat, std::vector<FrameSize>& frameSizes);
+  int getSupportedFrameIntervals(Camera::CamPixFormat pixelFormat, FrameSize& frameSize, std::vector<FrameInterval>& frameIntervals);
 
-  PixelFormat getPixelFormat() const;
-  void setPixelFormat(PixelFormat pixelFormat);
+  Camera::CamPixFormat getCamPixFormat() const;
+  void setCamPixFormat(Camera::CamPixFormat pixelFormat);
   
   FrameSize getFrameSize() const;
   void setFrameSize(FrameSize& frameSize);

src/daq/cxx/SimpleController.cc

@@ -247 +247 @@
 }
 //////////////////////////////////////////////////////////////////////////////
 
-void SimpleController::imageReceived(unsigned char* image, Camera::PixelFormat pixelFormat,
+void SimpleController::imageReceived(unsigned char* image, Camera::CamPixFormat pixelFormat,
                                     int width, int height, int stride, int size, int frameNb, double timestamp) {
   ControllerCallback::CaptureStatus status;
   status.totalSessionTime = length + recordingDelay;

src/daq/cxx/V4LCamera.cc

@@ -292 +292 @@
 }
 
 /**
- * Convert v4l2 pixel format to Camera::PixelFormat
+ * Convert v4l2 pixel format to Camera::CamPixFormat
  */
-Camera::PixelFormat convertPixelFormat(unsigned int v4l2_pixelFormat) {
+Camera::CamPixFormat convertCamPixFormat(unsigned int v4l2_pixelFormat) {
   switch (v4l2_pixelFormat) {
     case V4L2_PIX_FMT_YUYV:
       return Camera::YUYV;
@@ -308 +308 @@
 }
 
 /**
- * Convert Camera::PixelFormat to v4l2 pixel format
+ * Convert Camera::CamPixFormat to v4l2 pixel format
  */
-unsigned int convertPixelFormat(Camera::PixelFormat pixelFormat) {
+unsigned int convertCamPixFormat(Camera::CamPixFormat pixelFormat) {
   switch (pixelFormat) {
     case Camera::YUYV:
       return V4L2_PIX_FMT_YUYV;
@@ -327 +327 @@
   }
 }
 
-int V4LCamera::getSupportedPixelFormats(std::vector<PixelFormat>& pixelFormats) {
+int V4LCamera::getSupportedCamPixFormats(std::vector<CamPixFormat>& pixelFormats) {
   if (v4lstruct->opened) {
     pixelFormats.clear();
     
@@ -337 +337 @@
     fmtdesc.index = 0;
 
     while (xioctl(v4lstruct->device, VIDIOC_ENUM_FMT, &fmtdesc) != -1) {
-      pixelFormats.push_back(convertPixelFormat(fmtdesc.pixelformat));
+      pixelFormats.push_back(convertCamPixFormat(fmtdesc.pixelformat));
       fmtdesc.index++;
     }
   }
@@ -345 +345 @@
   return 0;
 }
 
-int V4LCamera::getSupportedFrameSizes(PixelFormat pixelFormat, std::vector<FrameSize>& frameSizes) {
+int V4LCamera::getSupportedFrameSizes(CamPixFormat pixelFormat, std::vector<FrameSize>& frameSizes) {
   if (v4lstruct->opened) {
     frameSizes.clear();
     
     v4l2_frmsizeenum frmsizeenum;
     memset(&frmsizeenum, 0, sizeof(v4l2_frmsizeenum));
-    frmsizeenum.pixel_format = convertPixelFormat(pixelFormat);
+    frmsizeenum.pixel_format = convertCamPixFormat(pixelFormat);
     frmsizeenum.index = 0;
     
     while (xioctl(v4lstruct->device, VIDIOC_ENUM_FRAMESIZES, &frmsizeenum) != -1) {
@@ -369 +369 @@
   return 0;
 }
 
-int V4LCamera::getSupportedFrameIntervals(PixelFormat pixelFormat, FrameSize& frameSize,
+int V4LCamera::getSupportedFrameIntervals(CamPixFormat pixelFormat, FrameSize& frameSize,
                                          std::vector<FrameInterval>& frameIntervals) {
   if (v4lstruct->opened) {
     v4l2_frmivalenum frmivalenum;
     memset(&frmivalenum, 0, sizeof(v4l2_frmivalenum));
-    frmivalenum.pixel_format = convertPixelFormat(pixelFormat);
+    frmivalenum.pixel_format = convertCamPixFormat(pixelFormat);
     frmivalenum.height = frameSize.height;
     frmivalenum.width = frameSize.width;
     frmivalenum.index = 0;
@@ -394 +394 @@
   return 0;
 }
 
-Camera::PixelFormat V4LCamera::getPixelFormat() const {
+Camera::CamPixFormat V4LCamera::getCamPixFormat() const {
   if (v4lstruct->opened) {
-    return convertPixelFormat(v4lstruct->format.pixelformat);
+    return convertCamPixFormat(v4lstruct->format.pixelformat);
   }
   else {
     return Camera::OTHER;
   }
 }
 
-void V4LCamera::setPixelFormat(PixelFormat pixelFormat) {
+void V4LCamera::setCamPixFormat(CamPixFormat pixelFormat) {
   if (v4lstruct->opened) {
     v4l2_format format;
     memset(&format, 0, sizeof(v4l2_format));
     format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
     format.fmt.pix = v4lstruct->format;
 
-    format.fmt.pix.pixelformat = convertPixelFormat(pixelFormat);
+    format.fmt.pix.pixelformat = convertCamPixFormat(pixelFormat);
 
     if (xioctl(v4lstruct->device, VIDIOC_S_FMT, &format) == -1) {
       perror("Error setting parameters (VIDIOC_S_FMT)");
@@ -601 +601 @@
 
 
 void V4LCamera::captureLoop() {
-  const PixelFormat pixelformat = getPixelFormat();
+  const CamPixFormat pixelformat = getCamPixFormat();
   
   while(!mustStop) {
     // Select manpage say that we can't trust the value of timeout after

src/daq/cxx/VideoReaderCamera.cc

@@ -105 +105 @@
   bob::core::info << videoReader->info().c_str() << std::endl;
 }
 
-Camera::PixelFormat VideoReaderCamera::getPixelFormat() const {
-  return RGB24;
+Camera::CamPixFormat VideoReaderCamera::getCamPixFormat() const {
+  return Camera::RGB24;
 }
 
-void VideoReaderCamera::setPixelFormat(Camera::PixelFormat pixelFormat) {
+void VideoReaderCamera::setCamPixFormat(Camera::CamPixFormat pixelFormat) {
   return;
 }
 
@@ -129 +129 @@
   return;
 }
 
-int VideoReaderCamera::getSupportedPixelFormats(std::vector<PixelFormat>& pixelFormats) {
+int VideoReaderCamera::getSupportedCamPixFormats(std::vector<Camera::CamPixFormat>& pixelFormats) {
   pixelFormats.clear();;
-  pixelFormats.push_back(getPixelFormat());
+  pixelFormats.push_back(getCamPixFormat());
 
   return 0;
 }
 
-int VideoReaderCamera::getSupportedFrameSizes(PixelFormat pixelFormat, std::vector<FrameSize>& frameSizes) {
+int VideoReaderCamera::getSupportedFrameSizes(Camera::CamPixFormat pixelFormat, std::vector<FrameSize>& frameSizes) {
   frameSizes.clear();
-  if (pixelFormat == getPixelFormat()) {
+  if (pixelFormat == getCamPixFormat()) {
     frameSizes.push_back(getFrameSize());
   }
 
   return 0;
 }
 
-int VideoReaderCamera::getSupportedFrameIntervals(PixelFormat pixelFormat, FrameSize& frameSize,
+int VideoReaderCamera::getSupportedFrameIntervals(Camera::CamPixFormat pixelFormat, FrameSize& frameSize,
                                          std::vector<FrameInterval>& frameIntervals) {
   frameIntervals.clear();
-  if (pixelFormat == getPixelFormat() && frameSize == getFrameSize()) {
+  if (pixelFormat == getCamPixFormat() && frameSize == getFrameSize()) {
     frameIntervals.push_back(getFrameInterval());
   }
   

src/daq/python/all.cc

@@ -45 +45 @@
 
 using namespace bob::daq;
 
-static boost::python::object getSupportedPixelFormats(Camera& cam) {
-  std::vector<Camera::PixelFormat> pfs;
-  cam.getSupportedPixelFormats(pfs);
+static boost::python::object getSupportedCamPixFormats(Camera& cam) {
+  std::vector<Camera::CamPixFormat> pfs;
+  cam.getSupportedCamPixFormats(pfs);
 
   boost::python::list l;
 
@@ -58 +58 @@
   return l;
 }
 
-static boost::python::object getSupportedFrameSizes(Camera& cam, Camera::PixelFormat pf) {
+static boost::python::object getSupportedFrameSizes(Camera& cam, Camera::CamPixFormat pf) {
   std::vector<Camera::FrameSize> vec;
   cam.getSupportedFrameSizes(pf, vec);
 
@@ -71 +71 @@
   return l;
 }
 
-static boost::python::object getSupportedFrameIntervals(Camera& cam, Camera::PixelFormat pf, Camera::FrameSize& fs) {
+static boost::python::object getSupportedFrameIntervals(Camera& cam, Camera::CamPixFormat pf, Camera::FrameSize& fs) {
   std::vector<Camera::FrameInterval> vec;
   cam.getSupportedFrameIntervals(pf, fs, vec);
 
@@ -169 +169 @@
     .def("on_detection", &FaceLocalizationCallback::onDetection, (arg("boundingbox")));
     
   /// Cameras
-  enum_<Camera::PixelFormat>("PixelFormat")
+  enum_<Camera::CamPixFormat>("PixelFormat")
     .value("YUYV", Camera::YUYV)
     .value("MJPEG", Camera::MJPEG)
     .value("RGB24", Camera::RGB24)
@@ -192 +192 @@
     .def("start", &Camera_start, (arg("self")))
     .def("add_camera_callback", &Camera::addCameraCallback, (arg("self"), arg("callback")))
     .def("remove_camera_callback", &Camera::removeCameraCallback, (arg("self"), arg("callback")))
-    .def("get_supported_pixel_formats", &getSupportedPixelFormats, (arg("self")), "Get the list of supported pixel formats")
+    .def("get_supported_pixel_formats", &getSupportedCamPixFormats, (arg("self")), "Get the list of supported pixel formats")
     .def("get_supported_frame_sizes", &getSupportedFrameSizes, (arg("self"), arg("pixel_format")), "Get the list of supported frame sizes for a pixel format")
     .def("get_supported_frame_intervals", &getSupportedFrameIntervals, (arg("self"), arg("pixel_format"), arg("frame_size")), "Get the list of supported frame intervals for a pixel format and a frame size")
-    .add_property("pixel_format", &Camera::getPixelFormat, &Camera::setPixelFormat)
+    .add_property("pixel_format", &Camera::getCamPixFormat, &Camera::setCamPixFormat)
     .add_property("frame_size", &Camera::getFrameSize, &Camera::setFrameSize)
     .add_property("frame_interval", &Camera::getFrameInterval, &Camera::setFrameInterval)
     .def("print_summary", &Camera::printSummary, (arg("self")), "Print information about the device");