Skip to content

Commit 66e328f

Browse files
author
Stuart Morgan
committed
Cleanup: visibility, style, file order
1 parent a146a42 commit 66e328f

5 files changed

Lines changed: 308 additions & 307 deletions

File tree

‎packages/video_player/video_player_avfoundation/darwin/RunnerTests/VideoPlayerTests.swift‎

Lines changed: 57 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -266,71 +266,69 @@ private let hlsAudioTestURI =
266266
#expect(durationApproximatelyEquals(eventListener.initializationDuration, 4000, tolerance: 200))
267267
}
268268

269-
#if os(iOS)
270-
@Test func transformFixOrientationUp() {
271-
let size = CGSize(width: 800, height: 600)
272-
let naturalTransform = CGAffineTransform.identity
273-
let t = getStandardizedTrackTransform(transform: naturalTransform, size: size)
274-
#expect(t.tx == 0)
275-
#expect(t.ty == 0)
276-
}
269+
@Test func transformFixOrientationUp() {
270+
let size = CGSize(width: 800, height: 600)
271+
let naturalTransform = CGAffineTransform.identity
272+
let t = standardizedTrackTransform(transform: naturalTransform, size: size)
273+
#expect(t.tx == 0)
274+
#expect(t.ty == 0)
275+
}
277276

278-
@Test func transformFixOrientationDown() {
279-
let size = CGSize(width: 800, height: 600)
280-
let naturalTransform = CGAffineTransform(a: -1, b: 0, c: 0, d: -1, tx: 0, ty: 0)
281-
let t = getStandardizedTrackTransform(transform: naturalTransform, size: size)
282-
#expect(t.tx == size.width)
283-
#expect(t.ty == size.height)
284-
}
277+
@Test func transformFixOrientationDown() {
278+
let size = CGSize(width: 800, height: 600)
279+
let naturalTransform = CGAffineTransform(a: -1, b: 0, c: 0, d: -1, tx: 0, ty: 0)
280+
let t = standardizedTrackTransform(transform: naturalTransform, size: size)
281+
#expect(t.tx == size.width)
282+
#expect(t.ty == size.height)
283+
}
285284

286-
@Test func transformFixOrientationLeft() {
287-
let size = CGSize(width: 800, height: 600)
288-
let naturalTransform = CGAffineTransform(a: 0, b: -1, c: 1, d: 0, tx: 0, ty: 0)
289-
let t = getStandardizedTrackTransform(transform: naturalTransform, size: size)
290-
#expect(t.tx == 0)
291-
#expect(t.ty == size.width)
292-
}
285+
@Test func transformFixOrientationLeft() {
286+
let size = CGSize(width: 800, height: 600)
287+
let naturalTransform = CGAffineTransform(a: 0, b: -1, c: 1, d: 0, tx: 0, ty: 0)
288+
let t = standardizedTrackTransform(transform: naturalTransform, size: size)
289+
#expect(t.tx == 0)
290+
#expect(t.ty == size.width)
291+
}
293292

294-
@Test func transformFixOrientationRight() {
295-
let size = CGSize(width: 800, height: 600)
296-
let naturalTransform = CGAffineTransform(a: 0, b: 1, c: -1, d: 0, tx: 0, ty: 0)
297-
let t = getStandardizedTrackTransform(transform: naturalTransform, size: size)
298-
#expect(t.tx == size.height)
299-
#expect(t.ty == 0)
300-
}
293+
@Test func transformFixOrientationRight() {
294+
let size = CGSize(width: 800, height: 600)
295+
let naturalTransform = CGAffineTransform(a: 0, b: 1, c: -1, d: 0, tx: 0, ty: 0)
296+
let t = standardizedTrackTransform(transform: naturalTransform, size: size)
297+
#expect(t.tx == size.height)
298+
#expect(t.ty == 0)
299+
}
301300

302-
@Test func transformFixOrientationUpMirrored() {
303-
let size = CGSize(width: 800, height: 600)
304-
let naturalTransform = CGAffineTransform(a: -1, b: 0, c: 0, d: 1, tx: 0, ty: 0)
305-
let t = getStandardizedTrackTransform(transform: naturalTransform, size: size)
306-
#expect(t.tx == size.width)
307-
#expect(t.ty == 0)
308-
}
301+
@Test func transformFixOrientationUpMirrored() {
302+
let size = CGSize(width: 800, height: 600)
303+
let naturalTransform = CGAffineTransform(a: -1, b: 0, c: 0, d: 1, tx: 0, ty: 0)
304+
let t = standardizedTrackTransform(transform: naturalTransform, size: size)
305+
#expect(t.tx == size.width)
306+
#expect(t.ty == 0)
307+
}
309308

310-
@Test func transformFixOrientationDownMirrored() {
311-
let size = CGSize(width: 800, height: 600)
312-
let naturalTransform = CGAffineTransform(a: 1, b: 0, c: 0, d: -1, tx: 0, ty: 0)
313-
let t = getStandardizedTrackTransform(transform: naturalTransform, size: size)
314-
#expect(t.tx == 0)
315-
#expect(t.ty == size.height)
316-
}
309+
@Test func transformFixOrientationDownMirrored() {
310+
let size = CGSize(width: 800, height: 600)
311+
let naturalTransform = CGAffineTransform(a: 1, b: 0, c: 0, d: -1, tx: 0, ty: 0)
312+
let t = standardizedTrackTransform(transform: naturalTransform, size: size)
313+
#expect(t.tx == 0)
314+
#expect(t.ty == size.height)
315+
}
317316

318-
@Test func transformFixOrientationLeftMirrored() {
319-
let size = CGSize(width: 800, height: 600)
320-
let naturalTransform = CGAffineTransform(a: 0, b: -1, c: -1, d: 0, tx: 0, ty: 0)
321-
let t = getStandardizedTrackTransform(transform: naturalTransform, size: size)
322-
#expect(t.tx == size.height)
323-
#expect(t.ty == size.width)
324-
}
317+
@Test func transformFixOrientationLeftMirrored() {
318+
let size = CGSize(width: 800, height: 600)
319+
let naturalTransform = CGAffineTransform(a: 0, b: -1, c: -1, d: 0, tx: 0, ty: 0)
320+
let t = standardizedTrackTransform(transform: naturalTransform, size: size)
321+
#expect(t.tx == size.height)
322+
#expect(t.ty == size.width)
323+
}
325324

326-
@Test func transformFixOrientationRightMirrored() {
327-
let size = CGSize(width: 800, height: 600)
328-
let naturalTransform = CGAffineTransform(a: 0, b: 1, c: 1, d: 0, tx: 0, ty: 0)
329-
let t = getStandardizedTrackTransform(transform: naturalTransform, size: size)
330-
#expect(t.tx == 0)
331-
#expect(t.ty == 0)
332-
}
333-
#endif
325+
@Test func transformFixOrientationRightMirrored() {
326+
let size = CGSize(width: 800, height: 600)
327+
let naturalTransform = CGAffineTransform(a: 0, b: 1, c: 1, d: 0, tx: 0, ty: 0)
328+
let t = standardizedTrackTransform(transform: naturalTransform, size: size)
329+
#expect(t.tx == 0)
330+
#expect(t.ty == 0)
331+
}
334332

335333
@Test func seekToleranceWhenNotSeekingToEnd() async {
336334
let inspectableAVPlayer = InspectableAVPlayer()
@@ -748,7 +746,7 @@ private let hlsAudioTestURI =
748746
}
749747

750748
@Test func loadTracksWithMediaTypeIsCalledOnNewerOS() {
751-
let mockAsset = TestAsset(duration: CMTimeMake(value: 1, timescale: 1), tracks: [])
749+
let mockAsset = TestAsset(duration: CMTime(value: 1, timescale: 1), tracks: [])
752750
let item = StubPlayerItem(asset: mockAsset)
753751

754752
let stubAVFactory = StubFVPAVFactory(player: nil, playerItem: item, pixelBufferSource: nil)

‎packages/video_player/video_player_avfoundation/darwin/video_player_avfoundation/Sources/video_player_avfoundation/AVAssetTrackUtils.swift‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,44 +9,47 @@ import AVFoundation
99
///
1010
/// Note: https://stackoverflow.com/questions/64161544
1111
/// `AVAssetTrack.preferredTransform` can have wrong `tx` and `ty`.
12-
func getStandardizedTrackTransform(transform t: CGAffineTransform, size: CGSize)
12+
func standardizedTrackTransform(transform t: CGAffineTransform, size: CGSize)
1313
-> CGAffineTransform
1414
{
1515
// Each case of control flows corresponds to a specific
1616
// `UIImageOrientation`, with 8 cases in total.
1717
var st = t
18-
if t.a == 1 && t.b == 0 && t.c == 0 && t.d == 1 {
18+
switch (t.a, t.b, t.c, t.d) {
19+
case (1, 0, 0, 1):
1920
// UIImageOrientationUp
2021
st.tx = 0
2122
st.ty = 0
22-
} else if t.a == -1 && t.b == 0 && t.c == 0 && t.d == -1 {
23+
case (-1, 0, 0, -1):
2324
// UIImageOrientationDown
2425
st.tx = size.width
2526
st.ty = size.height
26-
} else if t.a == 0 && t.b == -1 && t.c == 1 && t.d == 0 {
27+
case (0, -1, 1, 0):
2728
// UIImageOrientationLeft
2829
st.tx = 0
2930
st.ty = size.width
30-
} else if t.a == 0 && t.b == 1 && t.c == -1 && t.d == 0 {
31+
case (0, 1, -1, 0):
3132
// UIImageOrientationRight
3233
st.tx = size.height
3334
st.ty = 0
34-
} else if t.a == -1 && t.b == 0 && t.c == 0 && t.d == 1 {
35+
case (-1, 0, 0, 1):
3536
// UIImageOrientationUpMirrored
3637
st.tx = size.width
3738
st.ty = 0
38-
} else if t.a == 1 && t.b == 0 && t.c == 0 && t.d == -1 {
39+
case (1, 0, 0, -1):
3940
// UIImageOrientationDownMirrored
4041
st.tx = 0
4142
st.ty = size.height
42-
} else if t.a == 0 && t.b == -1 && t.c == -1 && t.d == 0 {
43+
case (0, -1, -1, 0):
4344
// UIImageOrientationLeftMirrored
4445
st.tx = size.height
4546
st.ty = size.width
46-
} else if t.a == 0 && t.b == 1 && t.c == 1 && t.d == 0 {
47+
case (0, 1, 1, 0):
4748
// UIImageOrientationRightMirrored
4849
st.tx = 0
4950
st.ty = 0
51+
default:
52+
break
5053
}
5154
return st
5255
}

‎packages/video_player/video_player_avfoundation/darwin/video_player_avfoundation/Sources/video_player_avfoundation/TextureBasedVideoPlayer.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class TextureBasedVideoPlayer: VideoPlayer, FlutterTexture {
4949
/// video streams (not just iOS 16). (https://github.com/flutter/flutter/issues/109116). An
5050
/// invisible AVPlayerLayer is used to overwrite the protection of pixel buffers in those streams
5151
/// for issue #1, and restore the correct width and height for issue #2.
52-
var playerLayer: AVPlayerLayer?
52+
private(set) var playerLayer: AVPlayerLayer?
5353

5454
/// Initializes a new instance of TextureBasedVideoPlayer with the given player item,
5555
/// frame updater, display link, AV factory, and view provider.
@@ -91,7 +91,7 @@ class TextureBasedVideoPlayer: VideoPlayer, FlutterTexture {
9191
}
9292

9393
/// Ensures that the frame updater runs until a frame is rendered, regardless of play/pause state.
94-
func expectFrame() {
94+
private func expectFrame() {
9595
waitingForFrame = true
9696
displayLink?.running = true
9797
}

0 commit comments

Comments
 (0)