slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

AVFoundation: implement QCameraInfoControl.

Browse Source 
Change-Id: I05f3daa5c4acb90e046e26d6d577ae40dfed0e30
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
This commit is contained in:
Yoann Lopes
2014-02-07 14:20:28 +01:00
committed by The Qt Project
parent 70415c3d97
commit 9a55f5ce57
11 changed files with 257 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/plugins/avfoundation/camera/avfcamerasession.mm
View File

@@ -57,6 +57,10 @@
QT_USE_NAMESPACE
QByteArray AVFCameraSession::m_defaultCameraDevice;
QList<QByteArray> AVFCameraSession::m_cameraDevices;
QMap<QByteArray, AVFCameraInfo> AVFCameraSession::m_cameraInfo;
@interface AVFCameraSessionObserver : NSObject
{
@private
@@ -151,6 +155,74 @@ AVFCameraSession::~AVFCameraSession()
[m_captureSession release];
}
const QByteArray &AVFCameraSession::defaultCameraDevice()
{
if (m_cameraDevices.isEmpty())
updateCameraDevices();
return m_defaultCameraDevice;
}
const QList<QByteArray> &AVFCameraSession::availableCameraDevices()
{
if (m_cameraDevices.isEmpty())
updateCameraDevices();
return m_cameraDevices;
}
AVFCameraInfo AVFCameraSession::cameraDeviceInfo(const QByteArray &device)
{
if (m_cameraDevices.isEmpty())
updateCameraDevices();
return m_cameraInfo.value(device);
}
void AVFCameraSession::updateCameraDevices()
{
m_defaultCameraDevice.clear();
m_cameraDevices.clear();
m_cameraInfo.clear();
AVCaptureDevice *defaultDevice = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeVideo];
if (defaultDevice)
m_defaultCameraDevice = QByteArray([[defaultDevice uniqueID] UTF8String]);
NSArray *videoDevices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo];
for (AVCaptureDevice *device in videoDevices) {
QByteArray deviceId([[device uniqueID] UTF8String]);
AVFCameraInfo info;
info.description = QString::fromNSString([device localizedName]);
// There is no API to get the camera sensor orientation, however, cameras are always
// mounted in landscape on iDevices.
// - Back-facing cameras have the top side of the sensor aligned with the right side of
// the screen when held in portrait ==> 270 degrees clockwise angle
// - Front-facing cameras have the top side of the sensor aligned with the left side of
// the screen when held in portrait ==> 270 degrees clockwise angle
// On Mac OS, the position will always be unspecified and the sensor orientation unknown.
switch (device.position) {
case AVCaptureDevicePositionBack:
info.position = QCamera::BackFace;
info.orientation = 270;
break;
case AVCaptureDevicePositionFront:
info.position = QCamera::FrontFace;
info.orientation = 270;
break;
default:
info.position = QCamera::UnspecifiedPosition;
info.orientation = 0;
break;
}
m_cameraDevices << deviceId;
m_cameraInfo.insert(deviceId, info);
}
}
void AVFCameraSession::setVideoOutput(AVFVideoRendererControl *output)
{
m_videoOutput = output;