Added support for Hap7 decoding.

HapInAVFoundation/AVPlayerItemAdditions.m

@@ -20,6 +20,7 @@ - (AVAssetTrack *) hapTrack	{
 			case 'HapY':
 			case 'HapM':
 			case 'HapA':
+			case 'Hap7':
 				hapTrack = trackPtr;
 				break;
 			default:

HapInAVFoundation/HapDecoderFrame.m

@@ -135,6 +135,12 @@ - (id) initEmptyWithHapSampleBuffer:(CMSampleBufferRef)sb	{
 			dxtPixelFormats[1] = 0;
 			dxtMinDataSizes[1] = 0;
 			break;
+		case kHap7CodecSubType:
+			dxtPlaneCount = 1;
+			dxtPixelFormats[0] = kHapCVPixelFormat_RGBA_BC7;
+			dxtPixelFormats[1] = 0;
+			dxtMinDataSizes[1] = 0;
+			break;
 		}
 		rgbMinDataSize = 32 * imgSize.width * imgSize.height / 8;
 	}

external/hap/hap.c

@@ -46,6 +46,7 @@
 #define kHapFormatRGBADXT5 0xE
 #define kHapFormatYCoCgDXT5 0xF
 #define kHapFormatARGTC1 0x1
+#define kHapFormatRGBABC7 0xC
 
 /*
  Packed byte values for Hap
@@ -212,6 +213,8 @@ static unsigned int hap_texture_format_constant_for_format_identifier(unsigned i
             return HapTextureFormat_YCoCg_DXT5;
         case kHapFormatARGTC1:
             return HapTextureFormat_A_RGTC1;
+		case kHapFormatRGBABC7:
+			return HapTextureFormat_RGBA_BC7;
         default:
             return 0;
 
@@ -231,6 +234,8 @@ static unsigned int hap_texture_format_identifier_for_format_constant(unsigned i
             return kHapFormatYCoCgDXT5;
         case HapTextureFormat_A_RGTC1:
             return kHapFormatARGTC1;
+		case HapTextureFormat_RGBA_BC7:
+			return kHapFormatRGBABC7;
         default:
             return 0;
     }

external/hap/hap.h

@@ -41,7 +41,8 @@ enum HapTextureFormat {
     HapTextureFormat_RGB_DXT1 = 0x83F0,
     HapTextureFormat_RGBA_DXT5 = 0x83F3,
     HapTextureFormat_YCoCg_DXT5 = 0x01,
-    HapTextureFormat_A_RGTC1 = 0x8DBB
+    HapTextureFormat_A_RGTC1 = 0x8DBB,
+	HapTextureFormat_RGBA_BC7 = 0x8E8C,
 };
 
 enum HapCompressor {

source/HapCodecSubTypes.h

@@ -33,5 +33,6 @@
 #define kHapYCoCgCodecSubType 'HapY'
 #define kHapYCoCgACodecSubType 'HapM'
 #define kHapAOnlyCodecSubType 'HapA'
+#define kHap7CodecSubType 'Hap7'
 
 #endif

source/PixelFormats.c

@@ -170,6 +170,7 @@ void HapCodecRegisterPixelFormats(void)
         HapCodecRegisterDXTPixelFormat(kHapCVPixelFormat_YCoCg_DXT5, 8, 0x83F3, false);
         HapCodecRegisterYCoCgPixelFormat();
         HapCodecRegisterYCoCgDXTARGTC1PixelFormat();
+		HapCodecRegisterDXTPixelFormat(kHapCVPixelFormat_RGBA_BC7, 8, 0x8E8C, true);
         registered = true;
     }
 }

source/PixelFormats.h

@@ -62,6 +62,11 @@
  */
 #define kHapCVPixelFormat_A_RGTC1 'RGA1'
 
+/*
+ RGBA BC7
+ */
+#define kHapCVPixelFormat_RGBA_BC7 'BC7 '
+
 /*		CoreVideo requires us to "register" the DXT pixel format- if this isn't done, the various CV-related resources won't recognize it as a valid pixel format and stuff won't work.  this function only needs to be called once, before you do anything with hap.  the framework does this automatically in the +initialize methods of AVPlayerItemHapDXTOutput and AVAssetWriterHapInput.		*/
 void HapCodecRegisterDXTPixelFormat(OSType fmt, short bits_per_pixel, SInt32 open_gl_internal_format, Boolean has_alpha);
 void HapCodecRegisterYCoCgPixelFormat(void);