@@ -14,17 +14,13 @@ class VideoRecorder: NSObject {
1414 // MARK: - Private properties
1515 private var currentDeviceOrientation = UIDeviceOrientation . portrait
1616 private var cameraAvailable : Bool
17- private var captureVideoPreviewLayer : AVCaptureVideoPreviewLayer ?
18-
19- private var defaultAVCaptureVideoOrientation = AVCaptureVideoOrientation . portrait
17+ private var captureVideoPreviewLayer : AVCaptureVideoPreviewLayer !
2018
2119 private var captureSession : AVCaptureSession !
2220 private var captureSessionLoaded = false
2321
24- private var parentView : UIView
25-
2622 private let dataOutputQueue = DispatchQueue ( label: " DataOutputQueue " )
27- private var isAssetWriterSessionStarted = false
23+ private var isRecordingSessionStarted = false
2824
2925 private var assetVideoWriterInput : AVAssetWriterInput !
3026 private var assetAudioWriterInput : AVAssetWriterInput !
@@ -44,10 +40,11 @@ class VideoRecorder: NSObject {
4440 private let videoFileURL =
4541 FileManager . default. temporaryDirectory. appendingPathComponent ( " recorded_video.mp4 " )
4642
47- // MARK: - Initiallization
48- init ( withParent parent: UIView ) {
43+ // MARK: - Initialization
44+ init ( withParent parent: VideoPreviewView ) {
4945 cameraAvailable = UIImagePickerController . isSourceTypeAvailable ( . camera)
50- parentView = parent
46+ captureVideoPreviewLayer = parent. videoPreviewLayer
47+
5148 super. init ( )
5249 }
5350}
@@ -82,9 +79,7 @@ extension VideoRecorder {
8279
8380 captureSession. stopRunning ( )
8481
85- captureVideoPreviewLayer? . removeFromSuperlayer ( )
86- captureVideoPreviewLayer = nil
87-
82+ captureVideoPreviewLayer. session = nil
8883 captureSessionLoaded = false
8984
9085 stopRecord ( )
@@ -119,7 +114,7 @@ private extension VideoRecorder {
119114
120115 captureSession. commitConfiguration ( )
121116
122- addVideoPreviewLayer ( )
117+ assignVideoPreviewLayerSession ( )
123118
124119 captureSessionLoaded = true
125120 captureSession. startRunning ( )
@@ -207,19 +202,13 @@ private extension VideoRecorder {
207202 if captureSession. canAddOutput ( captureVideoDataOutput) {
208203 captureSession. addOutput ( captureVideoDataOutput)
209204 }
205+
210206 captureVideoDataOutput. connection ( with: . video) ? . isEnabled = true
207+ captureVideoDataOutput. setSampleBufferDelegate ( self , queue: dataOutputQueue)
211208
212- // set default video orientation
213- if ( captureVideoDataOutput. connection ( with: . video) ? . isVideoOrientationSupported) ! {
214- captureVideoDataOutput. connection ( with: . video) ? . videoOrientation = defaultAVCaptureVideoOrientation
209+ if let connection = captureVideoDataOutput. connection ( with: . video) , connection. isVideoOrientationSupported {
210+ connection. videoOrientation = . portrait
215211 }
216-
217- // create a serial dispatch queue used for the sample buffer delegate as well as when
218- // a still image is captured a serial dispatch queue must be used to guarantee that
219- // video frames will be delivered in order see the header doc for
220- // setSampleBufferDelegate:queue: for more information
221- //let dataOutputQueue = DispatchQueue(label: "VideoDataOutputQueue")
222- captureVideoDataOutput. setSampleBufferDelegate ( self , queue: dataOutputQueue)
223212 }
224213
225214 func addCaptureAudioDataOutput( ) {
@@ -228,23 +217,35 @@ private extension VideoRecorder {
228217 if captureSession. canAddOutput ( captureAudioDataOutput) {
229218 captureSession. addOutput ( captureAudioDataOutput)
230219 }
231- captureAudioDataOutput. connection ( with: . audio) ? . isEnabled = true
232220
233- //let dataOutputQueue = DispatchQueue(label: "AudioDataOutputQueue")
221+ captureAudioDataOutput . connection ( with : . audio ) ? . isEnabled = true
234222 captureAudioDataOutput. setSampleBufferDelegate ( self , queue: dataOutputQueue)
235223 }
236224
237- func addVideoPreviewLayer( ) {
238- captureVideoPreviewLayer = AVCaptureVideoPreviewLayer ( session: captureSession)
239-
240- if ( captureVideoPreviewLayer? . connection? . isVideoOrientationSupported) ! {
241- captureVideoPreviewLayer? . connection? . videoOrientation = defaultAVCaptureVideoOrientation
225+ func assignVideoPreviewLayerSession( ) {
226+ captureVideoPreviewLayer. session = captureSession
227+ }
228+ }
229+
230+ // MARK: - Handle device rotation
231+ extension VideoRecorder {
232+ func viewWillLayoutSubviews( ) {
233+ guard let connection = captureVideoPreviewLayer. connection, connection. isVideoOrientationSupported else {
234+ return
235+ }
236+
237+ switch ( UIDevice . current. orientation) {
238+ case . portrait:
239+ connection. videoOrientation = . portrait
240+ case . portraitUpsideDown:
241+ connection. videoOrientation = . portraitUpsideDown
242+ case . landscapeLeft:
243+ connection. videoOrientation = . landscapeRight
244+ case . landscapeRight:
245+ connection. videoOrientation = . landscapeLeft
246+ default :
247+ break
242248 }
243-
244- captureVideoPreviewLayer? . frame = parentView. frame
245-
246- captureVideoPreviewLayer? . videoGravity = . resizeAspectFill
247- parentView. layer. addSublayer ( captureVideoPreviewLayer!)
248249 }
249250}
250251
@@ -317,7 +318,7 @@ extension VideoRecorder {
317318 assetWriterInputPixelBufferAdaptor = nil
318319 assetVideoWriterInput = nil
319320 assetAudioWriterInput = nil
320- isAssetWriterSessionStarted = false
321+ isRecordingSessionStarted = false
321322 }
322323}
323324
@@ -335,9 +336,9 @@ extension VideoRecorder: AVCaptureVideoDataOutputSampleBufferDelegate, AVCapture
335336 let isRecording = assetWriter != nil && assetWriter. status == . writing
336337
337338 if isRecording {
338- if ( !isAssetWriterSessionStarted ) {
339+ if ( !isRecordingSessionStarted ) {
339340 assetWriter. startSession ( atSourceTime: sourceSampleTimeStamp)
340- isAssetWriterSessionStarted = true
341+ isRecordingSessionStarted = true
341342 }
342343 }
343344
0 commit comments