9ebf1265da
We shouldn't do this automatically, as different kind of orientations might be wanted (sensor, device, UI). The default should be sensor orientation (no rotation applied). We should add an API to QCamera to enable automatic orientation of captured images. Change-Id: I56fff7f0c4aaaee37eb6ae2628e27073b4946b66 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
93 lines
3.1 KiB
Objective-C
93 lines
3.1 KiB
Objective-C
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2015 The Qt Company Ltd.
|
|
** Contact: http://www.qt.io/licensing/
|
|
**
|
|
** This file is part of the Qt Toolkit.
|
|
**
|
|
** $QT_BEGIN_LICENSE:LGPL21$
|
|
** Commercial License Usage
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
** accordance with the commercial license agreement provided with the
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
** a written agreement between you and The Qt Company. For licensing terms
|
|
** and conditions see http://www.qt.io/terms-conditions. For further
|
|
** information use the contact form at http://www.qt.io/contact-us.
|
|
**
|
|
** GNU Lesser General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
** General Public License version 2.1 or version 3 as published by the Free
|
|
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
|
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
|
** following information to ensure the GNU Lesser General Public License
|
|
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
|
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
**
|
|
** As a special exception, The Qt Company gives you certain additional
|
|
** rights. These rights are described in The Qt Company LGPL Exception
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
**
|
|
** $QT_END_LICENSE$
|
|
**
|
|
****************************************************************************/
|
|
|
|
#ifndef AVFIMAGECAPTURECONTROL_H
|
|
#define AVFIMAGECAPTURECONTROL_H
|
|
|
|
#import <AVFoundation/AVFoundation.h>
|
|
|
|
#include <QtCore/qqueue.h>
|
|
#include <QtCore/qsemaphore.h>
|
|
#include <QtMultimedia/qcameraimagecapturecontrol.h>
|
|
#include "avfcamerasession.h"
|
|
#include "avfstoragelocation.h"
|
|
|
|
QT_BEGIN_NAMESPACE
|
|
|
|
class AVFImageCaptureControl : public QCameraImageCaptureControl
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
struct CaptureRequest {
|
|
int captureId;
|
|
QSemaphore *previewReady;
|
|
};
|
|
|
|
AVFImageCaptureControl(AVFCameraService *service, QObject *parent = 0);
|
|
~AVFImageCaptureControl();
|
|
|
|
bool isReadyForCapture() const;
|
|
|
|
QCameraImageCapture::DriveMode driveMode() const { return QCameraImageCapture::SingleImageCapture; }
|
|
void setDriveMode(QCameraImageCapture::DriveMode ) {}
|
|
AVCaptureStillImageOutput *stillImageOutput() const {return m_stillImageOutput;}
|
|
|
|
int capture(const QString &fileName);
|
|
void cancelCapture();
|
|
|
|
private Q_SLOTS:
|
|
void updateCaptureConnection();
|
|
void updateReadyStatus();
|
|
void onNewViewfinderFrame(const QVideoFrame &frame);
|
|
|
|
private:
|
|
void makeCapturePreview(CaptureRequest request, const QVideoFrame &frame, int rotation);
|
|
|
|
AVFCameraSession *m_session;
|
|
AVFCameraControl *m_cameraControl;
|
|
bool m_ready;
|
|
int m_lastCaptureId;
|
|
AVCaptureStillImageOutput *m_stillImageOutput;
|
|
AVCaptureConnection *m_videoConnection;
|
|
AVFStorageLocation m_storageLocation;
|
|
|
|
QMutex m_requestsMutex;
|
|
QQueue<CaptureRequest> m_captureRequests;
|
|
};
|
|
|
|
Q_DECLARE_TYPEINFO(AVFImageCaptureControl::CaptureRequest, Q_PRIMITIVE_TYPE);
|
|
|
|
QT_END_NAMESPACE
|
|
|
|
#endif
|