diff options
Diffstat (limited to 'src/multimedia/platform/darwin/camera/avfmediaencoder.mm')
| -rw-r--r-- | src/multimedia/platform/darwin/camera/avfmediaencoder.mm | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/multimedia/platform/darwin/camera/avfmediaencoder.mm b/src/multimedia/platform/darwin/camera/avfmediaencoder.mm index 916d9fe7e..6f881f986 100644 --- a/src/multimedia/platform/darwin/camera/avfmediaencoder.mm +++ b/src/multimedia/platform/darwin/camera/avfmediaencoder.mm @@ -166,22 +166,22 @@ static NSDictionary *avfAudioSettings(const QMediaEncoderSettings &encoderSettin #ifdef Q_OS_MACOS // Setting AVEncoderQualityKey is not allowed when format ID is alac or lpcm if (codecId != kAudioFormatAppleLossless && codecId != kAudioFormatLinearPCM - && encoderSettings.encodingMode() == QMediaEncoderSettings::ConstantQualityEncoding) { + && encoderSettings.encodingMode() == QMediaRecorder::ConstantQualityEncoding) { int quality; switch (encoderSettings.quality()) { - case QMediaEncoderSettings::VeryLowQuality: + case QMediaRecorder::VeryLowQuality: quality = AVAudioQualityMin; break; - case QMediaEncoderSettings::LowQuality: + case QMediaRecorder::LowQuality: quality = AVAudioQualityLow; break; - case QMediaEncoderSettings::HighQuality: + case QMediaRecorder::HighQuality: quality = AVAudioQualityHigh; break; - case QMediaEncoderSettings::VeryHighQuality: + case QMediaRecorder::VeryHighQuality: quality = AVAudioQualityMax; break; - case QMediaEncoderSettings::NormalQuality: + case QMediaRecorder::NormalQuality: default: quality = AVAudioQualityMedium; break; @@ -300,7 +300,7 @@ NSDictionary *avfVideoSettings(QMediaEncoderSettings &encoderSettings, AVCapture [videoSettings setObject:[NSNumber numberWithInt:w] forKey:AVVideoWidthKey]; [videoSettings setObject:[NSNumber numberWithInt:h] forKey:AVVideoHeightKey]; - encoderSettings.setVideoResolution(w, h); + encoderSettings.setVideoResolution(QSize(w, h)); } else { encoderSettings.setVideoResolution(qt_device_format_resolution(device.activeFormat)); } @@ -319,22 +319,22 @@ NSDictionary *avfVideoSettings(QMediaEncoderSettings &encoderSettings, AVCapture int bitrate = -1; float quality = -1.f; - if (encoderSettings.encodingMode() == QMediaEncoderSettings::ConstantQualityEncoding) { - if (encoderSettings.quality() != QMediaEncoderSettings::NormalQuality) { + if (encoderSettings.encodingMode() == QMediaRecorder::ConstantQualityEncoding) { + if (encoderSettings.quality() != QMediaRecorder::NormalQuality) { if (codec != QMediaFormat::VideoCodec::MotionJPEG) { qWarning("ConstantQualityEncoding is not supported for MotionJPEG"); } else { switch (encoderSettings.quality()) { - case QMediaEncoderSettings::VeryLowQuality: + case QMediaRecorder::VeryLowQuality: quality = 0.f; break; - case QMediaEncoderSettings::LowQuality: + case QMediaRecorder::LowQuality: quality = 0.25f; break; - case QMediaEncoderSettings::HighQuality: + case QMediaRecorder::HighQuality: quality = 0.75f; break; - case QMediaEncoderSettings::VeryHighQuality: + case QMediaRecorder::VeryHighQuality: quality = 1.f; break; default: @@ -343,7 +343,7 @@ NSDictionary *avfVideoSettings(QMediaEncoderSettings &encoderSettings, AVCapture } } } - } else if (encoderSettings.encodingMode() == QMediaEncoderSettings::AverageBitRateEncoding){ + } else if (encoderSettings.encodingMode() == QMediaRecorder::AverageBitRateEncoding){ if (codec != QMediaFormat::VideoCodec::H264 && codec != QMediaFormat::VideoCodec::H265) qWarning() << "AverageBitRateEncoding is not supported for codec" << QMediaFormat::videoCodecName(codec); else @@ -371,7 +371,7 @@ void AVFMediaEncoder::applySettings() if (m_state != QMediaRecorder::StoppedState) return; - const auto flag = (session->activeCameraInfo().isNull()) + const auto flag = (session->activecameraDevice().isNull()) ? QMediaFormat::NoFlags : QMediaFormat::RequiresVideo; @@ -413,7 +413,7 @@ void AVFMediaEncoder::setEncoderSettings(const QMediaEncoderSettings &settings) QMediaEncoderSettings AVFMediaEncoder::encoderSettings() const { QMediaEncoderSettings s = m_settings; - const auto flag = (m_service->session()->activeCameraInfo().isNull()) + const auto flag = (m_service->session()->activecameraDevice().isNull()) ? QMediaFormat::NoFlags : QMediaFormat::RequiresVideo; s.resolveFormat(flag); @@ -483,14 +483,14 @@ void AVFMediaEncoder::record() // Make sure the video is recorded in device orientation. // The top of the video will match the side of the device which is on top // when recording starts (regardless of the UI orientation). - // QCameraDevice cameraInfo = m_service->session()->activeCameraInfo(); + // QCameraDevice cameraDevice = m_service->session()->activecameraDevice(); // int screenOrientation = 360 - m_orientationHandler.currentOrientation(); // ### - // if (cameraInfo.position() == QCameraDevice::FrontFace) - // rotation = (screenOrientation + cameraInfo.orientation()) % 360; + // if (cameraDevice.position() == QCameraDevice::FrontFace) + // rotation = (screenOrientation + cameraDevice.orientation()) % 360; // else - // rotation = (screenOrientation + (360 - cameraInfo.orientation())) % 360; + // rotation = (screenOrientation + (360 - cameraDevice.orientation())) % 360; } const QString path(m_outputLocation.scheme() == QLatin1String("file") ? |