Skip to content

Commit af462ff

Browse files
authored
[AVFoundation] Fix naming of AVMetadataObjectType.CatHead, and update corresponding test to work on earlier OS versions. (#24137)
1 parent 5b6b3c4 commit af462ff

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

src/avfoundation.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12395,9 +12395,15 @@ enum AVMetadataObjectType : ulong {
1239512395
[Field ("AVMetadataObjectTypeHumanFullBody")]
1239612396
HumanFullBody = 1 << 24,
1239712397

12398+
#if !XAMCORE_5_0
12399+
[Obsolete ("Use 'CatHead' instead.")]
1239812400
[MacCatalyst (26, 0), TV (26, 0), Mac (26, 0), iOS (26, 0)]
12399-
[Field ("AVMetadataObjectTypeCatHead")]
1240012401
AVMetadataObjectTypeCatHead = 1 << 25,
12402+
#endif
12403+
12404+
[MacCatalyst (26, 0), TV (26, 0), Mac (26, 0), iOS (26, 0)]
12405+
[Field ("AVMetadataObjectTypeCatHead")]
12406+
CatHead = 1 << 25,
1240112407

1240212408
[MacCatalyst (26, 0), TV (26, 0), Mac (26, 0), iOS (26, 0)]
1240312409
[Field ("AVMetadataObjectTypeDogHead")]

tests/cecil-tests/Documentation.KnownFailures.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1476,8 +1476,8 @@ F:AVFoundation.AVMediaCharacteristics.MachineGenerated
14761476
F:AVFoundation.AVMediaCharacteristics.TactileMinimal
14771477
F:AVFoundation.AVMediaTypes.AuxiliaryPicture
14781478
F:AVFoundation.AVMediaTypes.Haptic
1479-
F:AVFoundation.AVMetadataObjectType.AVMetadataObjectTypeCatHead
14801479
F:AVFoundation.AVMetadataObjectType.CatBody
1480+
F:AVFoundation.AVMetadataObjectType.CatHead
14811481
F:AVFoundation.AVMetadataObjectType.CodabarCode
14821482
F:AVFoundation.AVMetadataObjectType.DogBody
14831483
F:AVFoundation.AVMetadataObjectType.DogHead

tests/monotouch-test/AVFoundation/CaptureMetadataOutputTest.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,11 @@ public void MetadataObjectTypesTest ()
119119
if (!TestRuntime.CheckXcodeVersion (13, 3))
120120
continue;
121121
break;
122+
case AVMetadataObjectType.CatHead:
123+
case AVMetadataObjectType.DogHead:
124+
if (!TestRuntime.CheckXcodeVersion (26, 0))
125+
continue;
126+
break;
122127
}
123128
metadataOutput.MetadataObjectTypes = val;
124129
all |= val;

0 commit comments

Comments
 (0)