diff options
Diffstat (limited to 'src')
3 files changed, 33 insertions, 41 deletions
diff --git a/src/plugins/avfoundation/camera/avfcamerarenderercontrol.mm b/src/plugins/avfoundation/camera/avfcamerarenderercontrol.mm index cf13635f0..1fa1df99e 100644 --- a/src/plugins/avfoundation/camera/avfcamerarenderercontrol.mm +++ b/src/plugins/avfoundation/camera/avfcamerarenderercontrol.mm @@ -167,19 +167,13 @@ private: int width = CVPixelBufferGetWidth(imageBuffer); int height = CVPixelBufferGetHeight(imageBuffer); + QVideoFrame::PixelFormat format = + AVFCameraViewfinderSettingsControl2::QtPixelFormatFromCVFormat(CVPixelBufferGetPixelFormatType(imageBuffer)); - QAbstractVideoBuffer *buffer = new CVPixelBufferVideoBuffer(imageBuffer); - - QVideoFrame::PixelFormat format = QVideoFrame::Format_RGB32; - if ([captureOutput isKindOfClass:[AVCaptureVideoDataOutput class]]) { - NSDictionary *settings = ((AVCaptureVideoDataOutput *)captureOutput).videoSettings; - if (settings && [settings objectForKey:(id)kCVPixelBufferPixelFormatTypeKey]) { - NSNumber *avf = [settings objectForKey:(id)kCVPixelBufferPixelFormatTypeKey]; - format = AVFCameraViewfinderSettingsControl2::QtPixelFormatFromCVFormat([avf unsignedIntValue]); - } - } + if (format == QVideoFrame::Format_Invalid) + return; - QVideoFrame frame(buffer, QSize(width, height), format); + QVideoFrame frame(new CVPixelBufferVideoBuffer(imageBuffer), QSize(width, height), format); m_renderer->syncHandleViewfinderFrame(frame); } @end @@ -229,12 +223,6 @@ void AVFCameraRendererControl::configureAVCaptureSession(AVFCameraSession *camer queue:queue]; dispatch_release(queue); - // Specify the pixel format - m_videoDataOutput.videoSettings = - [NSDictionary dictionaryWithObject: - [NSNumber numberWithInt:kCVPixelFormatType_32BGRA] - forKey:(id)kCVPixelBufferPixelFormatTypeKey]; - [m_cameraSession->captureSession() addOutput:m_videoDataOutput]; } diff --git a/src/plugins/avfoundation/camera/avfcamerasession.mm b/src/plugins/avfoundation/camera/avfcamerasession.mm index 6e4803f30..2cb3824db 100644 --- a/src/plugins/avfoundation/camera/avfcamerasession.mm +++ b/src/plugins/avfoundation/camera/avfcamerasession.mm @@ -283,12 +283,12 @@ void AVFCameraSession::setState(QCamera::State newState) if (m_state == QCamera::ActiveState) { Q_EMIT readyToConfigureConnections(); - [m_captureSession commitConfiguration]; - [m_captureSession startRunning]; m_defaultCodec = 0; defaultCodec(); applyImageEncoderSettings(); applyViewfinderSettings(); + [m_captureSession commitConfiguration]; + [m_captureSession startRunning]; } if (oldState == QCamera::ActiveState) { @@ -374,8 +374,7 @@ void AVFCameraSession::applyViewfinderSettings() } } - if (!vfSettings.isNull()) - vfControl->applySettings(); + vfControl->applySettings(); } } diff --git a/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm b/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm index e71e6b16f..b32c0cd63 100644 --- a/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm +++ b/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm @@ -485,13 +485,7 @@ QVector<QVideoFrame::PixelFormat> AVFCameraViewfinderSettingsControl2::viewfinde Q_ASSERT(m_videoOutput); QVector<QVideoFrame::PixelFormat> qtFormats; - QList<QVideoFrame::PixelFormat> filter; - NSArray *pixelFormats = [m_videoOutput availableVideoCVPixelFormatTypes]; - const QAbstractVideoSurface *surface = m_service->videoOutput() ? m_service->videoOutput()->surface() : 0; - - if (surface) - filter = surface->supportedPixelFormats(); for (NSObject *obj in pixelFormats) { if (![obj isKindOfClass:[NSNumber class]]) @@ -500,8 +494,8 @@ QVector<QVideoFrame::PixelFormat> AVFCameraViewfinderSettingsControl2::viewfinde NSNumber *formatAsNSNumber = static_cast<NSNumber *>(obj); // It's actually FourCharCode (== UInt32): const QVideoFrame::PixelFormat qtFormat(QtPixelFormatFromCVFormat([formatAsNSNumber unsignedIntValue])); - if (qtFormat != QVideoFrame::Format_Invalid && (!surface || filter.contains(qtFormat)) - && !qtFormats.contains(qtFormat)) { // Can happen, for example, with 8BiPlanar existing in video/full range. + if (qtFormat != QVideoFrame::Format_Invalid + && !qtFormats.contains(qtFormat)) { // Can happen, for example, with 8BiPlanar existing in video/full range. qtFormats << qtFormat; } } @@ -576,22 +570,33 @@ void AVFCameraViewfinderSettingsControl2::applySettings() #endif unsigned avfPixelFormat = 0; - if (m_settings.pixelFormat() != QVideoFrame::Format_Invalid && - convertPixelFormatIfSupported(m_settings.pixelFormat(), avfPixelFormat)) { - [videoSettings setObject:[NSNumber numberWithUnsignedInt:avfPixelFormat] - forKey:(id)kCVPixelBufferPixelFormatTypeKey]; - } else { - // We have to set the pixel format, otherwise AVFoundation can change it to something we do not support. - if (NSObject *oldFormat = [m_videoOutput.videoSettings objectForKey:(id)kCVPixelBufferPixelFormatTypeKey]) { - [videoSettings setObject:oldFormat forKey:(id)kCVPixelBufferPixelFormatTypeKey]; - } else { - [videoSettings setObject:[NSNumber numberWithUnsignedInt:kCVPixelFormatType_32BGRA] - forKey:(id)kCVPixelBufferPixelFormatTypeKey]; + if (!convertPixelFormatIfSupported(m_settings.pixelFormat(), avfPixelFormat)) { + // If the the pixel format is not specified or invalid, pick the preferred video surface + // format, or if no surface is set, the preferred capture device format + const QVector<QVideoFrame::PixelFormat> deviceFormats = viewfinderPixelFormats(); + QList<QVideoFrame::PixelFormat> surfaceFormats; + if (m_service->videoOutput() && m_service->videoOutput()->surface()) + surfaceFormats = m_service->videoOutput()->surface()->supportedPixelFormats(); + + QVideoFrame::PixelFormat format = deviceFormats.first(); + + for (int i = 0; i < surfaceFormats.count(); ++i) { + const QVideoFrame::PixelFormat surfaceFormat = surfaceFormats.at(i); + if (deviceFormats.contains(surfaceFormat)) { + format = surfaceFormat; + break; + } } + + CVPixelFormatFromQtFormat(format, avfPixelFormat); } - if (videoSettings.count) + if (avfPixelFormat != 0) { + [videoSettings setObject:[NSNumber numberWithUnsignedInt:avfPixelFormat] + forKey:(id)kCVPixelBufferPixelFormatTypeKey]; + m_videoOutput.videoSettings = videoSettings; + } qt_set_framerate_limits(m_captureDevice, m_videoConnection, m_settings); } |