Added YUYV Metadata (#174)

* Added YUYV Metadata * Improved readability of new metadata --------- Co-authored-by: Akhil Kumar <kumaakh@users.noreply.github.com>
Apra-Labs · Feb 3, 2023 · 855990f · 855990f
1 parent 5516641
commit 855990f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/base/include/DMAAllocator.h b/base/include/DMAAllocator.h
@@ -29,6 +29,9 @@ class DMAAllocator : public HostAllocator
         case ImageMetadata::UYVY:
             colorFormat = NvBufferColorFormat_UYVY;
             break;
+        case ImageMetadata::YUYV:
+            colorFormat = NvBufferColorFormat_YUYV;
+            break;      
         case ImageMetadata::RGBA:
             colorFormat = NvBufferColorFormat_ABGR32;
             break;
@@ -132,8 +135,9 @@ class DMAAllocator : public HostAllocator
                 type = CV_8UC4;
                 break;
             case ImageMetadata::ImageType::UYVY:
+            case ImageMetadata::ImageType::YUYV:
                 type = CV_8UC3;
-                break;
+                break;    
             default:
                 throw AIPException(AIP_FATAL, "Only Image Type accepted are UYVY or ARGB found " + std::to_string(imageType));
             }

diff --git a/base/include/ImageMetadata.h b/base/include/ImageMetadata.h
@@ -15,16 +15,18 @@ class ImageMetadata
 		BGRA, // Interleaved
 		RGB, // Interleaved
 		RGBA, // Interleaved
-		YUV411_I, // Interleaved
+		YUV411_I = 10, // Interleaved
         YUV444, // Planar
 		YUV420, // Planar
-		UYVY,	// Interleaved		
+		UYVY,	// Interleaved	
+		YUYV, 	
 		NV12,
-		BAYERBG10, // BGGR
+		BAYERBG10 = 20, // BGGR
 		BAYERBG8, // BGGR
 		BAYERGB8, // GBRG
 		BAYERGR8, // GRBG
 		BAYERRG8  // RGGB
+
 	};
 
 	static size_t getElemSize(int depth)

diff --git a/base/include/RawImageMetadata.h b/base/include/RawImageMetadata.h
@@ -49,8 +49,9 @@ class RawImageMetadata : public FrameMetadata
 			_step = _width;
 			break;
 		case ImageMetadata::UYVY:
+		case ImageMetadata::YUYV:
 			_step = _width * 2;
-			break;
+			break;	
 		case ImageMetadata::BGR:
 		case ImageMetadata::RGB:
 			_step = _width * 3;
@@ -139,6 +140,7 @@ class RawImageMetadata : public FrameMetadata
 		case ImageMetadata::MONO:
 			multiple = 1;
 			break;
+		case ImageMetadata::YUYV:
 		case ImageMetadata::UYVY:
 			multiple = 2;
 			break;
@@ -206,6 +208,7 @@ class RawImageMetadata : public FrameMetadata
 		case ImageMetadata::MONO:
 			channels = 1;
 			break;
+		case ImageMetadata::YUYV:	
 		case ImageMetadata::UYVY:
 		case ImageMetadata::BGR:
 		case ImageMetadata::RGB:

diff --git a/base/src/DMAFDToHostCopy.cpp b/base/src/DMAFDToHostCopy.cpp
@@ -157,6 +157,8 @@ bool DMAFDToHostCopy::processSOS(frame_sp &frame)
 	{
 	case ImageMetadata::ImageType::RGBA:
 	case ImageMetadata::ImageType::BGRA:
+	case ImageMetadata::ImageType::YUYV:
+		break;	
 	case ImageMetadata::ImageType::UYVY:
 		break;
 	case ImageMetadata::ImageType::YUV420: