[camera] Pause/resume video recording for Android (#1370)
* Pause/resume video recording for Android
* Specify type
* Add pausing and resuming to example app
* iOS side of pausing/resuming
* More documentation
* Version bump
* Add video pausing and resuming
* get pausing and recording to work for no audio
* It works
* Formatting
* Add test for pausing and resuming
* Call success outside try catch block
* formatting
* Disable audio in test and call result on iOS
diff --git a/packages/camera/CHANGELOG.md b/packages/camera/CHANGELOG.md
index ff0593a..49535b7 100644
--- a/packages/camera/CHANGELOG.md
+++ b/packages/camera/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.4
+
+* Add feature to pause and resume video recording.
+
## 0.5.3+1
* Fix too large request code for FragmentActivity users.
diff --git a/packages/camera/android/src/main/java/io/flutter/plugins/camera/Camera.java b/packages/camera/android/src/main/java/io/flutter/plugins/camera/Camera.java
index 763e3b5..110c5b6 100644
--- a/packages/camera/android/src/main/java/io/flutter/plugins/camera/Camera.java
+++ b/packages/camera/android/src/main/java/io/flutter/plugins/camera/Camera.java
@@ -388,6 +388,38 @@
}
}
+ public void pauseVideoRecording(@NonNull final Result result) {
+ if (!recordingVideo) {
+ result.success(null);
+ return;
+ }
+
+ try {
+ mediaRecorder.pause();
+ } catch (IllegalStateException e) {
+ result.error("videoRecordingFailed", e.getMessage(), null);
+ return;
+ }
+
+ result.success(null);
+ }
+
+ public void resumeVideoRecording(@NonNull final Result result) {
+ if (!recordingVideo) {
+ result.success(null);
+ return;
+ }
+
+ try {
+ mediaRecorder.resume();
+ } catch (IllegalStateException e) {
+ result.error("videoRecordingFailed", e.getMessage(), null);
+ return;
+ }
+
+ result.success(null);
+ }
+
public void startPreview() throws CameraAccessException {
createCaptureSession(CameraDevice.TEMPLATE_PREVIEW, pictureImageReader.getSurface());
}
diff --git a/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java b/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
index 69633a4..b3a1da8 100644
--- a/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
+++ b/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java
@@ -112,6 +112,16 @@
camera.stopVideoRecording(result);
break;
}
+ case "pauseVideoRecording":
+ {
+ camera.pauseVideoRecording(result);
+ break;
+ }
+ case "resumeVideoRecording":
+ {
+ camera.resumeVideoRecording(result);
+ break;
+ }
case "startImageStream":
{
try {
diff --git a/packages/camera/example/lib/main.dart b/packages/camera/example/lib/main.dart
index f66b5b9..cfdcd1d 100644
--- a/packages/camera/example/lib/main.dart
+++ b/packages/camera/example/lib/main.dart
@@ -215,6 +215,19 @@
: null,
),
IconButton(
+ icon: controller != null && controller.value.isRecordingPaused
+ ? Icon(Icons.play_arrow)
+ : Icon(Icons.pause),
+ color: Colors.blue,
+ onPressed: controller != null &&
+ controller.value.isInitialized &&
+ controller.value.isRecordingVideo
+ ? (controller != null && controller.value.isRecordingPaused
+ ? onResumeButtonPressed
+ : onPauseButtonPressed)
+ : null,
+ ),
+ IconButton(
icon: const Icon(Icons.stop),
color: Colors.red,
onPressed: controller != null &&
@@ -316,6 +329,20 @@
});
}
+ void onPauseButtonPressed() {
+ pauseVideoRecording().then((_) {
+ if (mounted) setState(() {});
+ showInSnackBar('Video recording paused');
+ });
+ }
+
+ void onResumeButtonPressed() {
+ resumeVideoRecording().then((_) {
+ if (mounted) setState(() {});
+ showInSnackBar('Video recording resumed');
+ });
+ }
+
Future<String> startVideoRecording() async {
if (!controller.value.isInitialized) {
showInSnackBar('Error: select a camera first.');
@@ -357,6 +384,32 @@
await _startVideoPlayer();
}
+ Future<void> pauseVideoRecording() async {
+ if (!controller.value.isRecordingVideo) {
+ return null;
+ }
+
+ try {
+ await controller.pauseVideoRecording();
+ } on CameraException catch (e) {
+ _showCameraException(e);
+ return null;
+ }
+ }
+
+ Future<void> resumeVideoRecording() async {
+ if (!controller.value.isRecordingVideo) {
+ return null;
+ }
+
+ try {
+ await controller.resumeVideoRecording();
+ } on CameraException catch (e) {
+ _showCameraException(e);
+ return null;
+ }
+ }
+
Future<void> _startVideoPlayer() async {
final VideoPlayerController vcontroller =
VideoPlayerController.file(File(videoPath));
diff --git a/packages/camera/example/test_driver/camera.dart b/packages/camera/example/test_driver/camera.dart
index 7d59016..d68b8c5 100644
--- a/packages/camera/example/test_driver/camera.dart
+++ b/packages/camera/example/test_driver/camera.dart
@@ -143,4 +143,60 @@
}
}
});
+
+ test('Pause and resume video recording', () async {
+ final List<CameraDescription> cameras = await availableCameras();
+ if (cameras.isEmpty) {
+ return;
+ }
+
+ final CameraController controller = CameraController(
+ cameras[0],
+ ResolutionPreset.low,
+ enableAudio: false,
+ );
+
+ await controller.initialize();
+ await controller.prepareForVideoRecording();
+
+ final String filePath =
+ '${testDir.path}/${DateTime.now().millisecondsSinceEpoch}.mp4';
+
+ int startPause;
+ int timePaused = 0;
+
+ await controller.startVideoRecording(filePath);
+ final int recordingStart = DateTime.now().millisecondsSinceEpoch;
+ sleep(const Duration(milliseconds: 500));
+
+ await controller.pauseVideoRecording();
+ startPause = DateTime.now().millisecondsSinceEpoch;
+ sleep(const Duration(milliseconds: 500));
+ await controller.resumeVideoRecording();
+ timePaused += DateTime.now().millisecondsSinceEpoch - startPause;
+
+ sleep(const Duration(milliseconds: 500));
+
+ await controller.pauseVideoRecording();
+ startPause = DateTime.now().millisecondsSinceEpoch;
+ sleep(const Duration(milliseconds: 500));
+ await controller.resumeVideoRecording();
+ timePaused += DateTime.now().millisecondsSinceEpoch - startPause;
+
+ sleep(const Duration(milliseconds: 500));
+
+ await controller.stopVideoRecording();
+ final int recordingTime =
+ DateTime.now().millisecondsSinceEpoch - recordingStart;
+
+ final File videoFile = File(filePath);
+ final VideoPlayerController videoController = VideoPlayerController.file(
+ videoFile,
+ );
+ await videoController.initialize();
+ final int duration = videoController.value.duration.inMilliseconds;
+ await videoController.dispose();
+
+ expect(duration, lessThan(recordingTime - timePaused));
+ });
}
diff --git a/packages/camera/ios/Classes/CameraPlugin.m b/packages/camera/ios/Classes/CameraPlugin.m
index 8a08c43..42cdb6d 100644
--- a/packages/camera/ios/Classes/CameraPlugin.m
+++ b/packages/camera/ios/Classes/CameraPlugin.m
@@ -180,10 +180,18 @@
@property(strong, nonatomic) AVCaptureVideoDataOutput *videoOutput;
@property(strong, nonatomic) AVCaptureAudioDataOutput *audioOutput;
@property(assign, nonatomic) BOOL isRecording;
+@property(assign, nonatomic) BOOL isRecordingPaused;
+@property(assign, nonatomic) BOOL videoIsDisconnected;
+@property(assign, nonatomic) BOOL audioIsDisconnected;
@property(assign, nonatomic) BOOL isAudioSetup;
@property(assign, nonatomic) BOOL isStreamingImages;
@property(assign, nonatomic) ResolutionPreset resolutionPreset;
+@property(assign, nonatomic) CMTime lastVideoSampleTime;
+@property(assign, nonatomic) CMTime lastAudioSampleTime;
+@property(assign, nonatomic) CMTime videoTimeOffset;
+@property(assign, nonatomic) CMTime audioTimeOffset;
@property(nonatomic) CMMotionManager *motionManager;
+@property AVAssetWriterInputPixelBufferAdaptor *videoAdaptor;
- (instancetype)initWithCameraName:(NSString *)cameraName
resolutionPreset:(NSString *)resolutionPreset
enableAudio:(BOOL)enableAudio
@@ -417,7 +425,7 @@
CVPixelBufferUnlockBaseAddress(pixelBuffer, kCVPixelBufferLock_ReadOnly);
}
}
- if (_isRecording) {
+ if (_isRecording && !_isRecordingPaused) {
if (_videoWriter.status == AVAssetWriterStatusFailed) {
_eventSink(@{
@"event" : @"error",
@@ -425,19 +433,83 @@
});
return;
}
- CMTime lastSampleTime = CMSampleBufferGetPresentationTimeStamp(sampleBuffer);
+
+ CFRetain(sampleBuffer);
+ CMTime currentSampleTime = CMSampleBufferGetPresentationTimeStamp(sampleBuffer);
+
if (_videoWriter.status != AVAssetWriterStatusWriting) {
[_videoWriter startWriting];
- [_videoWriter startSessionAtSourceTime:lastSampleTime];
+ [_videoWriter startSessionAtSourceTime:currentSampleTime];
}
+
if (output == _captureVideoOutput) {
- [self newVideoSample:sampleBuffer];
- } else if (output == _audioOutput) {
+ if (_videoIsDisconnected) {
+ _videoIsDisconnected = NO;
+
+ if (_videoTimeOffset.value == 0) {
+ _videoTimeOffset = CMTimeSubtract(currentSampleTime, _lastVideoSampleTime);
+ } else {
+ CMTime offset = CMTimeSubtract(currentSampleTime, _lastVideoSampleTime);
+ _videoTimeOffset = CMTimeAdd(_videoTimeOffset, offset);
+ }
+
+ return;
+ }
+
+ _lastVideoSampleTime = currentSampleTime;
+
+ CVPixelBufferRef nextBuffer = CMSampleBufferGetImageBuffer(sampleBuffer);
+ CMTime nextSampleTime = CMTimeSubtract(_lastVideoSampleTime, _videoTimeOffset);
+ [_videoAdaptor appendPixelBuffer:nextBuffer withPresentationTime:nextSampleTime];
+ } else {
+ CMTime dur = CMSampleBufferGetDuration(sampleBuffer);
+
+ if (dur.value > 0) {
+ currentSampleTime = CMTimeAdd(currentSampleTime, dur);
+ }
+
+ if (_audioIsDisconnected) {
+ _audioIsDisconnected = NO;
+
+ if (_audioTimeOffset.value == 0) {
+ _audioTimeOffset = CMTimeSubtract(currentSampleTime, _lastAudioSampleTime);
+ } else {
+ CMTime offset = CMTimeSubtract(currentSampleTime, _lastAudioSampleTime);
+ _audioTimeOffset = CMTimeAdd(_audioTimeOffset, offset);
+ }
+
+ return;
+ }
+
+ _lastAudioSampleTime = currentSampleTime;
+
+ if (_audioTimeOffset.value != 0) {
+ CFRelease(sampleBuffer);
+ sampleBuffer = [self adjustTime:sampleBuffer by:_audioTimeOffset];
+ }
+
[self newAudioSample:sampleBuffer];
}
+
+ CFRelease(sampleBuffer);
}
}
+- (CMSampleBufferRef)adjustTime:(CMSampleBufferRef)sample by:(CMTime)offset {
+ CMItemCount count;
+ CMSampleBufferGetSampleTimingInfoArray(sample, 0, nil, &count);
+ CMSampleTimingInfo *pInfo = malloc(sizeof(CMSampleTimingInfo) * count);
+ CMSampleBufferGetSampleTimingInfoArray(sample, count, pInfo, &count);
+ for (CMItemCount i = 0; i < count; i++) {
+ pInfo[i].decodeTimeStamp = CMTimeSubtract(pInfo[i].decodeTimeStamp, offset);
+ pInfo[i].presentationTimeStamp = CMTimeSubtract(pInfo[i].presentationTimeStamp, offset);
+ }
+ CMSampleBufferRef sout;
+ CMSampleBufferCreateCopyWithNewTiming(nil, sample, count, pInfo, &sout);
+ free(pInfo);
+ return sout;
+}
+
- (void)newVideoSample:(CMSampleBufferRef)sampleBuffer {
if (_videoWriter.status != AVAssetWriterStatusWriting) {
if (_videoWriter.status == AVAssetWriterStatusFailed) {
@@ -526,6 +598,11 @@
return;
}
_isRecording = YES;
+ _isRecordingPaused = NO;
+ _videoTimeOffset = CMTimeMake(0, 1);
+ _audioTimeOffset = CMTimeMake(0, 1);
+ _videoIsDisconnected = NO;
+ _audioIsDisconnected = NO;
result(nil);
} else {
_eventSink(@{@"event" : @"error", @"errorDescription" : @"Video is already recording!"});
@@ -556,6 +633,16 @@
}
}
+- (void)pauseVideoRecording {
+ _isRecordingPaused = YES;
+ _videoIsDisconnected = YES;
+ _audioIsDisconnected = YES;
+}
+
+- (void)resumeVideoRecording {
+ _isRecordingPaused = NO;
+}
+
- (void)startImageStreamWithMessenger:(NSObject<FlutterBinaryMessenger> *)messenger {
if (!_isStreamingImages) {
FlutterEventChannel *eventChannel =
@@ -608,6 +695,13 @@
nil];
_videoWriterInput = [AVAssetWriterInput assetWriterInputWithMediaType:AVMediaTypeVideo
outputSettings:videoSettings];
+
+ _videoAdaptor = [AVAssetWriterInputPixelBufferAdaptor
+ assetWriterInputPixelBufferAdaptorWithAssetWriterInput:_videoWriterInput
+ sourcePixelBufferAttributes:@{
+ (NSString *)kCVPixelBufferPixelFormatTypeKey : @(videoFormat)
+ }];
+
NSParameterAssert(_videoWriterInput);
_videoWriterInput.expectsMediaDataInRealTime = YES;
@@ -777,6 +871,12 @@
} else if ([@"stopImageStream" isEqualToString:call.method]) {
[_camera stopImageStream];
result(nil);
+ } else if ([@"pauseVideoRecording" isEqualToString:call.method]) {
+ [_camera pauseVideoRecording];
+ result(nil);
+ } else if ([@"resumeVideoRecording" isEqualToString:call.method]) {
+ [_camera resumeVideoRecording];
+ result(nil);
} else {
NSDictionary *argsMap = call.arguments;
NSUInteger textureId = ((NSNumber *)argsMap[@"textureId"]).unsignedIntegerValue;
diff --git a/packages/camera/lib/camera.dart b/packages/camera/lib/camera.dart
index cd2b399..ee1892c 100644
--- a/packages/camera/lib/camera.dart
+++ b/packages/camera/lib/camera.dart
@@ -157,14 +157,17 @@
this.isRecordingVideo,
this.isTakingPicture,
this.isStreamingImages,
- });
+ bool isRecordingPaused,
+ }) : _isRecordingPaused = isRecordingPaused;
const CameraValue.uninitialized()
: this(
- isInitialized: false,
- isRecordingVideo: false,
- isTakingPicture: false,
- isStreamingImages: false);
+ isInitialized: false,
+ isRecordingVideo: false,
+ isTakingPicture: false,
+ isStreamingImages: false,
+ isRecordingPaused: false,
+ );
/// True after [CameraController.initialize] has completed successfully.
final bool isInitialized;
@@ -178,6 +181,11 @@
/// True when images from the camera are being streamed.
final bool isStreamingImages;
+ final bool _isRecordingPaused;
+
+ /// True when camera [isRecordingVideo] and recording is paused.
+ bool get isRecordingPaused => isRecordingVideo && _isRecordingPaused;
+
final String errorDescription;
/// The size of the preview in pixels.
@@ -199,6 +207,7 @@
bool isStreamingImages,
String errorDescription,
Size previewSize,
+ bool isRecordingPaused,
}) {
return CameraValue(
isInitialized: isInitialized ?? this.isInitialized,
@@ -207,6 +216,7 @@
isRecordingVideo: isRecordingVideo ?? this.isRecordingVideo,
isTakingPicture: isTakingPicture ?? this.isTakingPicture,
isStreamingImages: isStreamingImages ?? this.isStreamingImages,
+ isRecordingPaused: isRecordingPaused ?? _isRecordingPaused,
);
}
@@ -473,7 +483,7 @@
'startVideoRecording',
<String, dynamic>{'textureId': _textureId, 'filePath': filePath},
);
- value = value.copyWith(isRecordingVideo: true);
+ value = value.copyWith(isRecordingVideo: true, isRecordingPaused: false);
} on PlatformException catch (e) {
throw CameraException(e.code, e.message);
}
@@ -504,6 +514,60 @@
}
}
+ /// Pause video recording.
+ ///
+ /// This feature is only available on iOS and Android sdk 24+.
+ Future<void> pauseVideoRecording() async {
+ if (!value.isInitialized || _isDisposed) {
+ throw CameraException(
+ 'Uninitialized CameraController',
+ 'pauseVideoRecording was called on uninitialized CameraController',
+ );
+ }
+ if (!value.isRecordingVideo) {
+ throw CameraException(
+ 'No video is recording',
+ 'pauseVideoRecording was called when no video is recording.',
+ );
+ }
+ try {
+ value = value.copyWith(isRecordingPaused: true);
+ await _channel.invokeMethod<void>(
+ 'pauseVideoRecording',
+ <String, dynamic>{'textureId': _textureId},
+ );
+ } on PlatformException catch (e) {
+ throw CameraException(e.code, e.message);
+ }
+ }
+
+ /// Resume video recording after pausing.
+ ///
+ /// This feature is only available on iOS and Android sdk 24+.
+ Future<void> resumeVideoRecording() async {
+ if (!value.isInitialized || _isDisposed) {
+ throw CameraException(
+ 'Uninitialized CameraController',
+ 'resumeVideoRecording was called on uninitialized CameraController',
+ );
+ }
+ if (!value.isRecordingVideo) {
+ throw CameraException(
+ 'No video is recording',
+ 'resumeVideoRecording was called when no video is recording.',
+ );
+ }
+ try {
+ value = value.copyWith(isRecordingPaused: false);
+ await _channel.invokeMethod<void>(
+ 'resumeVideoRecording',
+ <String, dynamic>{'textureId': _textureId},
+ );
+ } on PlatformException catch (e) {
+ throw CameraException(e.code, e.message);
+ }
+ }
+
/// Releases the resources of this camera.
@override
Future<void> dispose() async {
diff --git a/packages/camera/pubspec.yaml b/packages/camera/pubspec.yaml
index 3a82ee4..e94d4bd 100644
--- a/packages/camera/pubspec.yaml
+++ b/packages/camera/pubspec.yaml
@@ -2,7 +2,7 @@
description: A Flutter plugin for getting information about and controlling the
camera on Android and iOS. Supports previewing the camera feed, capturing images, capturing video,
and streaming image buffers to dart.
-version: 0.5.3+1
+version: 0.5.4
authors:
- Flutter Team <flutter-dev@googlegroups.com>
