Changeset 125 in flair-src for trunk

Timestamp:

Jan 13, 2017, 12:23:17 PM (8 years ago)

Author:

Sanahuja Guillaume

Message:

maj jpg

Location:

trunk

Files:

• demos/OpticalFlow/uav/build_arm/bin/OpticalFlow_ardrone2.sh (modified) (1 diff)
• lib/FlairSensorActuator/src/Camera.cpp (modified) (2 diffs)
• lib/FlairVisionFilter/src/VisionFilter.h (modified) (1 diff)
• lib/FlairVisionFilter/src/unexported/compile_info.h (deleted)

trunk/demos/OpticalFlow/uav/build_arm/bin/OpticalFlow_ardrone2.sh

@@ -1 @@
-./demo_fo_nrt -a 192.168.147.193 -p 9000 -l /tmp -x OpticalFlow_ardrone2.xml -n Drone_0 -t ardrone2 -d ./dspcv_dsp.out
+./OpticalFlow_nrt -a 192.168.147.217 -p 9000 -l /tmp -x OpticalFlow_ardrone2.xml -n Drone_0 -t ardrone2 -v ./dspcv_dsp.out

trunk/lib/FlairSensorActuator/src/Camera.cpp

@@ -128 +128 @@
                                         break;
                                 case cvimage::Type::Format::UYVY:
-                                        saveToJpeg(img,filename,PictureFormat_t::UYVY,PictureFormat_t::UYVY);
+                                        saveToJpeg(img,filename,PictureFormat_t::YUV_422ile,PictureFormat_t::YUV_422p);
                                         break;
                                 default:
@@ -151 +151 @@
                         if(output->GetDataType().GetFormat()==cvimage::Type::Format::Gray) saveToJpeg(output->img,filename,PictureFormat_t::Gray,PictureFormat_t::Gray);
                         if(output->GetDataType().GetFormat()==cvimage::Type::Format::BGR) saveToJpeg(output->img,filename,PictureFormat_t::RGB,PictureFormat_t::RGB);
-                        if(output->GetDataType().GetFormat()==cvimage::Type::Format::UYVY) saveToJpeg(output->img,filename,PictureFormat_t::UYVY,PictureFormat_t::UYVY);
+                        if(output->GetDataType().GetFormat()==cvimage::Type::Format::UYVY) saveToJpeg(output->img,filename,PictureFormat_t::YUV_422ile,PictureFormat_t::YUV_422p);
                 } else {
                         cvSaveImage(filename.c_str(),output->img);

trunk/lib/FlairVisionFilter/src/VisionFilter.h

@@ -14 +14 @@
 enum class PictureFormat_t {
                 Gray,/*!< gray 8 bits */
-                                                                RGB,/*!< rgb 24 bits */
-                                                                UYVY,/*!< YUV 4:2:2 planer */
+                RGB,/*!< rgb 24 bits */
+                YUV_422ile,/*!< YUV 4:2:2 interleaved */
+                YUV_422p,/*!< YUV 4:2:2 planer */
                 } ;