@@ -155,7 +155,9 @@ - (IplImage*)getOutput;
155155 uint8_t *mOutImagedata ;
156156 IplImage *mOutImage ;
157157 size_t currSize;
158+ /*
158159 int mMode;
160+ */
159161 int mFormat ;
160162
161163 bool setupReadingAt (CMTime position);
@@ -677,7 +679,9 @@ -(int) updateImage {
677679 mOutImage = NULL ;
678680 mOutImagedata = NULL ;
679681 currSize = 0 ;
682+ /*
680683 mMode = CV_CAP_MODE_BGR;
684+ */
681685 mFormat = CV_8UC3;
682686 mCurrentSampleBuffer = NULL ;
683687 mGrabbedPixels = NULL ;
@@ -741,12 +745,15 @@ -(int) updateImage {
741745
742746 // Capture in a pixel format that can be converted efficiently to the output mode.
743747 OSType pixelFormat;
748+ /*
744749 if (mMode == CV_CAP_MODE_BGR || mMode == CV_CAP_MODE_RGB) {
750+ */
745751 // For CV_CAP_MODE_BGR, read frames as BGRA (AV Foundation's YUV->RGB conversion is slightly faster than OpenCV's CV_YUV2BGR_YV12)
746752 // kCVPixelFormatType_32ABGR is reportedly faster on OS X, but OpenCV doesn't have a CV_ABGR2BGR conversion.
747753 // kCVPixelFormatType_24RGB is significanly slower than kCVPixelFormatType_32BGRA.
748754 pixelFormat = kCVPixelFormatType_32BGRA ;
749755 mFormat = CV_8UC3;
756+ /*
750757 } else if (mMode == CV_CAP_MODE_GRAY) {
751758 // For CV_CAP_MODE_GRAY, read frames as 420v (faster than 420f or 422 -- at least for H.264 files)
752759 pixelFormat = kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;
@@ -759,6 +766,7 @@ -(int) updateImage {
759766 fprintf(stderr, "VIDEOIO ERROR: AVF Mac: Unsupported mode: %d\n", mMode);
760767 return false;
761768 }
769+ */
762770
763771 NSDictionary *settings =
764772 @{
@@ -848,8 +856,11 @@ -(int) updateImage {
848856
849857 // Output image paramaters.
850858 int outChannels;
859+ /*
851860 if (mMode == CV_CAP_MODE_BGR || mMode == CV_CAP_MODE_RGB) {
861+ */
852862 outChannels = 3 ;
863+ /*
853864 } else if (mMode == CV_CAP_MODE_GRAY) {
854865 outChannels = 1;
855866 } else if (mMode == CV_CAP_MODE_YUYV) {
@@ -861,6 +872,7 @@ -(int) updateImage {
861872 mGrabbedPixels = NULL;
862873 return 0;
863874 }
875+ */
864876
865877 if ( currSize != width*outChannels*height ) {
866878 currSize = width*outChannels*height;
@@ -888,8 +900,11 @@ -(int) updateImage {
888900 if ( pixelFormat == kCVPixelFormatType_32BGRA ) {
889901 deviceChannels = 4 ;
890902
903+ /*
891904 if (mMode == CV_CAP_MODE_BGR) {
905+ */
892906 cvtCode = CV_BGRA2BGR;
907+ /*
893908 } else if (mMode == CV_CAP_MODE_RGB) {
894909 cvtCode = CV_BGRA2RGB;
895910 } else if (mMode == CV_CAP_MODE_GRAY) {
@@ -901,11 +916,15 @@ -(int) updateImage {
901916 fprintf(stderr, "OpenCV: unsupported pixel conversion mode\n");
902917 return 0;
903918 }
919+ */
904920 } else if ( pixelFormat == kCVPixelFormatType_24RGB ) {
905921 deviceChannels = 3 ;
906922
923+ /*
907924 if (mMode == CV_CAP_MODE_BGR) {
925+ */
908926 cvtCode = CV_RGB2BGR;
927+ /*
909928 } else if (mMode == CV_CAP_MODE_RGB) {
910929 cvtCode = 0;
911930 } else if (mMode == CV_CAP_MODE_GRAY) {
@@ -917,11 +936,15 @@ -(int) updateImage {
917936 fprintf(stderr, "OpenCV: unsupported pixel conversion mode\n");
918937 return 0;
919938 }
939+ */
920940 } else if ( pixelFormat == kCVPixelFormatType_422YpCbCr8 ) { // 422 (2vuy, UYVY)
921941 deviceChannels = 2 ;
922942
943+ /*
923944 if (mMode == CV_CAP_MODE_BGR) {
945+ */
924946 cvtCode = CV_YUV2BGR_UYVY;
947+ /*
925948 } else if (mMode == CV_CAP_MODE_RGB) {
926949 cvtCode = CV_YUV2RGB_UYVY;
927950 } else if (mMode == CV_CAP_MODE_GRAY) {
@@ -935,15 +958,19 @@ -(int) updateImage {
935958 fprintf(stderr, "OpenCV: unsupported pixel conversion mode\n");
936959 return 0;
937960 }
961+ */
938962 } else if ( pixelFormat == kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange || // 420v
939963 pixelFormat == kCVPixelFormatType_420YpCbCr8BiPlanarFullRange ) { // 420f
940964 // cvCvtColor(CV_YUV2GRAY_420) is expecting a single buffer with both the Y plane and the CrCb planes.
941965 // So, lie about the height of the buffer. cvCvtColor(CV_YUV2GRAY_420) will only read the first 2/3 of it.
942966 height = height * 3 / 2 ;
943967 deviceChannels = 1 ;
944968
969+ /*
945970 if (mMode == CV_CAP_MODE_BGR) {
971+ */
946972 cvtCode = CV_YUV2BGR_YV12;
973+ /*
947974 } else if (mMode == CV_CAP_MODE_RGB) {
948975 cvtCode = CV_YUV2RGB_YV12;
949976 } else if (mMode == CV_CAP_MODE_GRAY) {
@@ -955,6 +982,7 @@ -(int) updateImage {
955982 fprintf(stderr, "OpenCV: unsupported pixel conversion mode\n");
956983 return 0;
957984 }
985+ */
958986 } else {
959987 fprintf (stderr, " OpenCV: unsupported pixel format 0x%08X\n "
960988 CVPixelBufferUnlockBaseAddress (mGrabbedPixels , 0 );
@@ -1020,8 +1048,10 @@ -(int) updateImage {
10201048 return round ((t.value * mAssetTrack .nominalFrameRate ) / double (t.timescale ));
10211049 case CV_CAP_PROP_FORMAT:
10221050 return mFormat ;
1051+ /*
10231052 case CV_CAP_PROP_MODE:
10241053 return mMode;
1054+ */
10251055 default :
10261056 break ;
10271057 }
@@ -1054,6 +1084,7 @@ -(int) updateImage {
10541084 setupReadingAt (t);
10551085 retval = true ;
10561086 break ;
1087+ /*
10571088 case CV_CAP_PROP_MODE:
10581089 int mode;
10591090 mode = cvRound(value);
@@ -1076,6 +1107,7 @@ -(int) updateImage {
10761107 }
10771108 }
10781109 break;
1110+ */
10791111 default :
10801112 break ;
10811113 }
0 commit comments