Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Encode gif if CameraMode is set to GIF #159

Merged
merged 6 commits into from
Jun 2, 2023
Merged

Encode gif if CameraMode is set to GIF #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6729123
Inject GIFEncoder
Deco354 May 30, 2023
902b0e9
Add gif encoding test
Deco354 May 30, 2023
a66a7e4
Use cameraMode as source of truth for gif encoding
Deco354 May 30, 2023
ea0b16a
Replace optional binding with chaining
Deco354 May 31, 2023
3f72e6e
Remove erroneus line break
Deco354 Jun 2, 2023
9b5d460
Merge branch 'main' into declan/PROD-17928-GIFs-encoding-fix
Deco354 Jun 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 23 additions & 14 deletions Classes/Preview/CameraPreviewViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ final class CameraPreviewViewController: UIViewController, MediaPlayerController
private let segments: [CameraSegment]
private let assetsHandler: AssetsHandlerType
private let cameraMode: CameraMode?
private let gifEncoder: GIFEncoder

private var currentSegmentIndex: Int = 0
private var timer: Timer = Timer()
Expand Down Expand Up @@ -73,12 +74,19 @@ final class CameraPreviewViewController: UIViewController, MediaPlayerController
/// - segments: The segments to playback
/// - assetsHandler: The assets handler type, for testing.
/// - cameraMode: The camera mode that the preview was coming from, if any
init(settings: CameraSettings, segments: [CameraSegment], assetsHandler: AssetsHandlerType, cameraMode: CameraMode?) {
/// - gifEncoder: The encoder used to convert videos in to gifs
init(settings: CameraSettings,
segments: [CameraSegment],
assetsHandler: AssetsHandlerType,
cameraMode: CameraMode?,
gifEncoder: GIFEncoder = GIFEncoderImageIO()) {

self.settings = settings
self.segments = segments
self.assetsHandler = assetsHandler
self.cameraMode = cameraMode
self.currentPlayer = firstPlayer
self.gifEncoder = gifEncoder

super.init(nibName: .none, bundle: .none)
setupNotifications()
Expand Down Expand Up @@ -283,23 +291,24 @@ extension CameraPreviewViewController: CameraPreviewViewDelegate {
self.hideLoading()
}
}
case .video(let videoURL, _):
// If the camera mode is .stopMotion, .normal or .stitch (.video) and the `exportStopMotionPhotoAsVideo` is true,
// then single photos from that mode should still export as video.
if settings.features.gifs,
let group = cameraMode?.group, group == .gif {
GIFEncoderImageIO().encode(video: videoURL, loopCount: 0, framesPerSecond: KanvasTimes.gifPreferredFramesPerSecond) { gifURL in
performUIUpdate {
self.delegate?.didFinishExportingFrames(url: gifURL)
self.hideLoading()
}
}
} else {
case .video(let videoURL, _):
// If the camera mode is .stopMotion, .normal or .stitch (.video) and the `exportStopMotionPhotoAsVideo` is true,
// then single photos from that mode should still export as video.
if cameraMode?.group == .gif {
gifEncoder.encode(video: videoURL,
loopCount: 0,
framesPerSecond: KanvasTimes.gifPreferredFramesPerSecond) { gifURL in
performUIUpdate {
self.delegate?.didFinishExportingVideo(url: videoURL)
self.delegate?.didFinishExportingFrames(url: gifURL)
self.hideLoading()
}
}
} else {
performUIUpdate {
self.delegate?.didFinishExportingVideo(url: videoURL)
self.hideLoading()
}
}
}
}
else {
Expand Down
37 changes: 30 additions & 7 deletions Example/KanvasExampleTests/CameraPreview/CameraPreviewControllerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,11 @@ final class CameraPreviewControllerTests: FBSnapshotTestCase {
return []
}

func getVideoSegments() -> [CameraSegment] {
func getVideoSegments(count: Int = 2) -> [CameraSegment] {

if let videoURL = Bundle(for: type(of: self)).url(forResource: "sample", withExtension: "mp4") {
let mediaInfo = MediaInfo(source: .kanvas_camera)
return [
CameraSegment.video(videoURL, mediaInfo),
CameraSegment.video(videoURL, mediaInfo)
]
return Array(repeating: CameraSegment.video(videoURL, mediaInfo), count: count)
}
return []
}
Expand Down Expand Up @@ -66,9 +64,19 @@ final class CameraPreviewControllerTests: FBSnapshotTestCase {
return []
}

func newViewController(settings: CameraSettings = CameraSettings(), segments: [CameraSegment], delegate: CameraPreviewControllerDelegate? = nil, assetsHandler: AssetsHandlerType? = nil, cameraMode: CameraMode? = nil) -> CameraPreviewViewController {
func newViewController(settings: CameraSettings = CameraSettings(),
segments: [CameraSegment],
delegate: CameraPreviewControllerDelegate? = nil,
assetsHandler: AssetsHandlerType? = nil,
cameraMode: CameraMode? = nil,
gifEncoder: GIFEncoder = GIFEncoderImageIO()) -> CameraPreviewViewController {

let handler = assetsHandler ?? AssetsHandlerStub()
let viewController = CameraPreviewViewController(settings: settings, segments: segments, assetsHandler: handler, cameraMode: cameraMode)
let viewController = CameraPreviewViewController(settings: settings,
segments: segments,
assetsHandler: handler,
cameraMode: cameraMode,
gifEncoder: gifEncoder)
viewController.delegate = delegate ?? newDelegateStub()
viewController.view.frame = CGRect(x: 0, y: 0, width: 320, height: 480)
return viewController
Expand Down Expand Up @@ -196,6 +204,21 @@ final class CameraPreviewControllerTests: FBSnapshotTestCase {
FBSnapshotArchFriendlyVerifyView(viewController.view)
XCTAssert(delegate.closeCalled, "Delegate close function not called")
}

func testConfirmButtonEncodesGIFWhenCameraModeWasGIF() {
let segments = getVideoSegments(count: 1)
let delegate = newDelegateStub()
let gifEncoderStub = GIFEncoderStub()
let viewController = newViewController(segments: segments,
delegate: delegate,
cameraMode: .gif,
gifEncoder: gifEncoderStub)

UIView.setAnimationsEnabled(false)
viewController.confirmButtonPressed()

XCTAssert(gifEncoderStub.encodeGIFCalled)
}

}

Expand Down