[AVFoundation] Numerous improvements to the AVSampleCursor type + some other structs. #20685

rolfbjarne · 2024-06-04T15:16:19Z

The AVSampleCursor type was made available on all platforms two years ago (as
opposed to only macOS before that), so update availability attributes accordingly.
Also make a few structs used by AVSampleCursor blittable (AVSampleCursorSyncInfo,
AVSampleCursorDependencyInfo, AVSampleCursorChunkInfo, AVSampleCursorAudioDependencyInfo)

This got a bit complicated, because some of the non-blittable members of these structs
are public. This meant a workaround had to be implemented:
- Rename the properties that use these structures - appending "_Blittable" - and
  make them internal.
- Create internal "*_Blittable" versions of the structures, and a make the "_Blittable"
  properties return these structures.
- Bind the properties again, wrapping the internal versions and manually converting
  from the blittable structures to the non-blittable structures.
Note that since some of the properties are new on iOS and tvOS, we don't need the
compatibility workaround for these platforms.

Contributes towards #15684.

…e other structs. * The AVSampleCursor type was made available on all platforms two years ago (as opposed to only macOS before that), so update availability attributes accordingly. * Also make a few structs used by AVSampleCursor blittable (AVSampleCursorSyncInfo, AVSampleCursorDependencyInfo, AVSampleCursorChunkInfo, AVSampleCursorAudioDependencyInfo) This got a bit complicated, because some of the non-blittable members of these structs are public. This meant a workaround had to be implemented: * Rename the properties that use these structures - appending "_Blittable" - and make them internal. * Create internal "*_Blittable" versions of the structures, and a make the "_Blittable" properties return these structures. * Bind the properties again, wrapping the internal versions and manually converting from the blittable structures to the non-blittable structures. Note that since some of the properties are new on iOS and tvOS, we don't need the compatibility workaround for these platforms. Contributes towards xamarin#15684.

mandel-macaque · 2024-06-04T15:31:54Z

src/AVFoundation/AVTypes.cs

+		public AVSampleCursorDependencyInfo ToAVSampleCursorDependencyInfo ()
+		{
+			var rv = new AVSampleCursorDependencyInfo ();
+			rv.IndicatesWhetherItHasDependentSamples = IndicatesWhetherItHasDependentSamples;
+			rv.HasDependentSamples = HasDependentSamples;
+			rv.IndicatesWhetherItDependsOnOthers = IndicatesWhetherItDependsOnOthers;
+			rv.DependsOnOthers = DependsOnOthers;
+			rv.IndicatesWhetherItHasRedundantCoding = IndicatesWhetherItHasRedundantCoding;
+			rv.HasRedundantCoding = HasRedundantCoding;
+			return rv;
+		}


Reminder we can do something like this in the new c#

Suggested change

public AVSampleCursorDependencyInfo ToAVSampleCursorDependencyInfo ()

{

var rv = new AVSampleCursorDependencyInfo ();

rv.IndicatesWhetherItHasDependentSamples = IndicatesWhetherItHasDependentSamples;

rv.HasDependentSamples = HasDependentSamples;

rv.IndicatesWhetherItDependsOnOthers = IndicatesWhetherItDependsOnOthers;

rv.DependsOnOthers = DependsOnOthers;

rv.IndicatesWhetherItHasRedundantCoding = IndicatesWhetherItHasRedundantCoding;

rv.HasRedundantCoding = HasRedundantCoding;

return rv;

}

public AVSampleCursorDependencyInfo ToAVSampleCursorDependencyInfo ()

{

var rv = new AVSampleCursorDependencyInfo () {

IndicatesWhetherItHasDependentSamples = IndicatesWhetherItHasDependentSamples,

HasDependentSamples = HasDependentSamples,

IndicatesWhetherItDependsOnOthers = IndicatesWhetherItDependsOnOthers,

DependsOnOthers = DependsOnOthers,

IndicatesWhetherItHasRedundantCoding = IndicatesWhetherItHasRedundantCoding,

HasRedundantCoding = HasRedundantCoding,

}

return rv;

}

Do I care we did not use it, no :)

dalexsoto

After checking tests

…do the right thing.

…e-structs

vs-mobiletools-engineering-service2 · 2024-06-06T09:22:18Z

💻 [PR Build] Tests on macOS M1 - Mac Big Sur (11) passed 💻

✅ All tests on macOS M1 - Mac Big Sur (11) passed.

Pipeline on Agent
Hash: [PR build]

vs-mobiletools-engineering-service2 · 2024-06-06T09:23:56Z

💻 [PR Build] Tests on macOS M1 - Mac Monterey (12) passed 💻

✅ All tests on macOS M1 - Mac Monterey (12) passed.

Pipeline on Agent
Hash: [PR build]

vs-mobiletools-engineering-service2 · 2024-06-06T09:24:02Z

💻 [PR Build] Tests on macOS M1 - Mac Ventura (13) passed 💻

✅ All tests on macOS M1 - Mac Ventura (13) passed.

Pipeline on Agent
Hash: [PR build]

vs-mobiletools-engineering-service2 · 2024-06-06T09:24:56Z

📚 [PR Build] Artifacts 📚

Packages generated

View packages

Pipeline on Agent
Hash: [PR build]

vs-mobiletools-engineering-service2 · 2024-06-06T09:38:38Z

❌ [CI Build] Windows Integration Tests failed ❌

❌ Failed ❌

Pipeline on Agent
Hash: 4a1ebac4962372fc3e662609f29440d8e75f4189 [PR build]

vs-mobiletools-engineering-service2 · 2024-06-06T10:01:14Z

💻 [PR Build] Tests on macOS X64 - Mac Sonoma (14) passed 💻

✅ All tests on macOS X64 - Mac Sonoma (14) passed.

Pipeline on Agent
Hash: [PR build]

vs-mobiletools-engineering-service2 · 2024-06-06T10:05:21Z

✅ API diff for current PR / commit

Legacy Xamarin (No breaking changes)

iOS: vsdrops gist (No breaking changes)
tvOS: vsdrops gist (No breaking changes)
watchOS: vsdrops gist (No breaking changes)
macOS: vsdrops gist (No breaking changes)

.NET (No breaking changes)

iOS: vsdrops gist (No breaking changes)
tvOS: vsdrops gist (No breaking changes)
MacCatalyst: vsdrops gist (No breaking changes)
macOS: vsdrops gist (No breaking changes)

✅ API diff vs stable

Legacy Xamarin (No breaking changes)

iOS: vsdrops gist (No breaking changes)
tvOS: vsdrops gist (No breaking changes)
watchOS: vsdrops gist (No breaking changes)
macOS: vsdrops gist (No breaking changes)

.NET (No breaking changes)

iOS: vsdrops gist (No breaking changes)
tvOS: vsdrops gist (No breaking changes)
MacCatalyst: vsdrops gist (No breaking changes)
macOS: vsdrops gist (No breaking changes)
Microsoft.iOS vs Microsoft.MacCatalyst: vsdrops gist

Legacy Xamarin (stable) vs .NET

iOS: vsdrops gist
tvOS: vsdrops gist
macOS: vsdrops gist

ℹ️ Generator diff

Generator Diff: vsdrops (html) vsdrops (raw diff) gist (raw diff) - Please review changes)

Pipeline on Agent
Hash: 4a1ebac4962372fc3e662609f29440d8e75f4189 [PR build]

vs-mobiletools-engineering-service2 · 2024-06-06T10:41:35Z

💻 [CI Build] Windows Integration Tests passed 💻

✅ All Windows Integration Tests passed.

Pipeline on Agent
Hash: 4a1ebac4962372fc3e662609f29440d8e75f4189 [PR build]

rolfbjarne requested review from mandel-macaque and dalexsoto as code owners June 4, 2024 15:16

mandel-macaque approved these changes Jun 4, 2024

View reviewed changes

This comment has been minimized.

Sign in to view

haritha-mohan approved these changes Jun 5, 2024

View reviewed changes

dalexsoto approved these changes Jun 5, 2024

View reviewed changes

rolfbjarne added 3 commits June 5, 2024 14:07

Merge remote-tracking branch 'origin/main' into HEAD

7f0d7c7

Fix breaking API

5fbc2cb

Add NativeName attributes for the static registrar to know enough to …

f7f74b2

…do the right thing.

This comment has been minimized.

Sign in to view

More breaking changes.

cad4f1d

This comment has been minimized.

Sign in to view

Make a broken API throw NotSupportedException.

c8ad021

This comment has been minimized.

Sign in to view

Merge remote-tracking branch 'origin/main' into avfoundation-blittabl…

4a1ebac

…e-structs

This comment has been minimized.

Sign in to view

rolfbjarne merged commit ae155a9 into xamarin:main Jun 6, 2024
64 checks passed

rolfbjarne deleted the avfoundation-blittable-structs branch June 6, 2024 15:19

[AVFoundation] Numerous improvements to the AVSampleCursor type + some other structs. #20685

[AVFoundation] Numerous improvements to the AVSampleCursor type + some other structs. #20685

Conversation

rolfbjarne commented Jun 4, 2024

mandel-macaque Jun 4, 2024

Choose a reason for hiding this comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

dalexsoto left a comment

Choose a reason for hiding this comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

vs-mobiletools-engineering-service2 commented Jun 6, 2024

💻 [PR Build] Tests on macOS M1 - Mac Big Sur (11) passed 💻

vs-mobiletools-engineering-service2 commented Jun 6, 2024

💻 [PR Build] Tests on macOS M1 - Mac Monterey (12) passed 💻

vs-mobiletools-engineering-service2 commented Jun 6, 2024

💻 [PR Build] Tests on macOS M1 - Mac Ventura (13) passed 💻

vs-mobiletools-engineering-service2 commented Jun 6, 2024

📚 [PR Build] Artifacts 📚

Packages generated

vs-mobiletools-engineering-service2 commented Jun 6, 2024

❌ [CI Build] Windows Integration Tests failed ❌

vs-mobiletools-engineering-service2 commented Jun 6, 2024

💻 [PR Build] Tests on macOS X64 - Mac Sonoma (14) passed 💻

vs-mobiletools-engineering-service2 commented Jun 6, 2024

✅ API diff for current PR / commit

✅ API diff vs stable

ℹ️ Generator diff

vs-mobiletools-engineering-service2 commented Jun 6, 2024

💻 [CI Build] Windows Integration Tests passed 💻

This comment has been minimized.