Added support for Hap7 decoding.

HapInAVFoundation/AVAssetAdditions.m

@@ -37,6 +37,7 @@ - (BOOL) isHapTrack	{
 		case kHapYCoCgCodecSubType:
 		case kHapYCoCgACodecSubType:
 		case kHapAOnlyCodecSubType:
+		case kHap7CodecSubType:
 			returnMe = YES;
 			break;
 		default:

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.h

@@ -33,15 +33,16 @@ extern "C" {
 #endif
 
 /*
- These match the constants defined by GL_EXT_texture_compression_s3tc and
- GL_ARB_texture_compression_rgtc
+ These match the constants defined by GL_EXT_texture_compression_s3tc,
+ GL_ARB_texture_compression_rgtc and GL_ARB_texture_compression_bptc
  */
 
 enum HapTextureFormat {
     HapTextureFormat_RGB_DXT1 = 0x83F0,
     HapTextureFormat_RGBA_DXT5 = 0x83F3,
     HapTextureFormat_YCoCg_DXT5 = 0x01,
-    HapTextureFormat_A_RGTC1 = 0x8DBB
+    HapTextureFormat_A_RGTC1 = 0x8DBB,
+    HapTextureFormat_RGBA_BPTC_UNORM = 0x8E8C
 };
 
 enum HapCompressor {
@@ -143,6 +144,11 @@ unsigned int HapGetFrameTextureCount(const void *inputBuffer, unsigned long inpu
  */
 unsigned int HapGetFrameTextureFormat(const void *inputBuffer, unsigned long inputBufferBytes, unsigned int index, unsigned int *outputBufferTextureFormat);
 
+/*
+ On return sets chunk_count to the chunk count value of the texture at index in the frame.
+*/
+unsigned int HapGetFrameTextureChunkCount(const void *inputBuffer, unsigned long inputBufferBytes, unsigned int index, int *chunk_count);
+
 #ifdef __cplusplus
 }
 #endif

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);