Pixel: add support of pixel formats 4:4:0, 4:1:1 and 4:1:0

Clement Champetier · Clement Champetier · commit 0011865368b7 · 2014-12-03T14:18:56.000+01:00
diff --git a/src/AvTranscoder/frame/Pixel.cpp b/src/AvTranscoder/frame/Pixel.cpp
@@ -87,16 +87,31 @@ void Pixel::init( const AVPixelFormat avPixelFormat )
 
 	setSubsampling( eSubsamplingNone );
 
-	if( ( pix_desc->log2_chroma_w == true ) &&
-		( pix_desc->log2_chroma_h == false ) )
+	if( ( pix_desc->log2_chroma_w == 0 ) &&
+		( pix_desc->log2_chroma_h == 1 ) )
+	{
+		setSubsampling( eSubsampling440 );
+	}
+	else if( ( pix_desc->log2_chroma_w == 1 ) &&
+		( pix_desc->log2_chroma_h == 0 ) )
 	{
 		setSubsampling( eSubsampling422 );
 	}
-	if( ( pix_desc->log2_chroma_w == true ) &&
-		( pix_desc->log2_chroma_h == true ) )
+	else if( ( pix_desc->log2_chroma_w == 1 ) &&
+		( pix_desc->log2_chroma_h == 1 ) )
 	{
 		setSubsampling( eSubsampling420 );
 	}
+	else if( ( pix_desc->log2_chroma_w == 3 ) &&
+		( pix_desc->log2_chroma_h == 0 ) )
+	{
+		setSubsampling( eSubsampling411 );
+	}
+	else if( ( pix_desc->log2_chroma_w == 2 ) &&
+		( pix_desc->log2_chroma_h == 2 ) )
+	{
+		setSubsampling( eSubsampling410 );
+	}
 }
 
 bool Pixel::asCorrectColorComponents( const AVPixFmtDescriptor* pix_desc, const EComponentType componentType ) const 
@@ -114,18 +129,33 @@ bool Pixel::asCorrectSubsampling( const AVPixFmtDescriptor* pix_desc, const ESub
 	{
 		case eSubsamplingNone :
 		{
-			return  ( pix_desc->log2_chroma_w == false ) &&
-					( pix_desc->log2_chroma_h == false );
+			return  ( pix_desc->log2_chroma_w == 0 ) &&
+			        ( pix_desc->log2_chroma_h == 0 );
+		}
+		case eSubsampling440 :
+		{
+			return  ( pix_desc->log2_chroma_w == 0 ) &&
+			        ( pix_desc->log2_chroma_h == 1 );
 		}
 		case eSubsampling422 :
 		{
-			return  ( pix_desc->log2_chroma_w == true  ) &&
-					( pix_desc->log2_chroma_h == false );
+			return  ( pix_desc->log2_chroma_w == 1 ) &&
+			        ( pix_desc->log2_chroma_h == 0 );
 		}
 		case eSubsampling420 :
 		{
-			return  ( pix_desc->log2_chroma_w == true  ) &&
-					( pix_desc->log2_chroma_h == true  );
+			return  ( pix_desc->log2_chroma_w == 1 ) &&
+			        ( pix_desc->log2_chroma_h == 1 );
+		}
+		case eSubsampling411:
+		{
+			return  ( pix_desc->log2_chroma_w == 3 ) &&
+			        ( pix_desc->log2_chroma_h == 0 );
+		}
+		case eSubsampling410 :
+		{
+			return  ( pix_desc->log2_chroma_w == 2 ) &&
+			        ( pix_desc->log2_chroma_h == 2  );
 		}
 	}
 	return false;
diff --git a/src/AvTranscoder/frame/Pixel.hpp b/src/AvTranscoder/frame/Pixel.hpp
@@ -23,8 +23,11 @@ enum EComponentType
 enum ESubsamplingType
 {
 	eSubsamplingNone = 0, // 4:4:4
+	eSubsampling440,      // 4:4:0
 	eSubsampling422,      // 4:2:2
-	eSubsampling420       // 4:2:0
+	eSubsampling420,      // 4:2:0
+	eSubsampling411,      // 4:1:1
+	eSubsampling410       // 4:1:0
 };
 
 class AvExport Pixel
