diff options
Diffstat (limited to 'src/plugins/directshow/camera/dscamerasession.h')
| -rw-r--r-- | src/plugins/directshow/camera/dscamerasession.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/plugins/directshow/camera/dscamerasession.h b/src/plugins/directshow/camera/dscamerasession.h index 61b156d8a..37730736f 100644 --- a/src/plugins/directshow/camera/dscamerasession.h +++ b/src/plugins/directshow/camera/dscamerasession.h @@ -56,6 +56,7 @@ #include <dshow.h> #include <objbase.h> #include <initguid.h> +#include "directshowmediatype.h" #ifdef Q_CC_MSVC # pragma comment(lib, "strmiids.lib") # pragma comment(lib, "ole32.lib") @@ -71,11 +72,10 @@ #define __IDxtKey_INTERFACE_DEFINED__ struct ICaptureGraphBuilder2; -struct ISampleGrabber; QT_BEGIN_NAMESPACE -class SampleGrabberCallbackPrivate; +class DirectShowSampleGrabber; class DSCameraSession : public QObject { @@ -154,7 +154,7 @@ private: void setStatus(QCamera::Status status); - void onFrameAvailable(const char *frameData, long len); + void onFrameAvailable(double time, quint8 *buffer, long len); void saveCapturedImage(int id, const QImage &image, const QString &path); bool createFilterGraph(); @@ -182,14 +182,13 @@ private: QString m_sourceDeviceName; IBaseFilter* m_sourceFilter; bool m_needsHorizontalMirroring; - QList<AM_MEDIA_TYPE> m_supportedFormats; + QList<DirectShowMediaType> m_supportedFormats; QList<QCameraViewfinderSettings> m_supportedViewfinderSettings; - AM_MEDIA_TYPE m_sourceFormat; + DirectShowMediaType m_sourceFormat; QMap<QCameraImageProcessingControl::ProcessingParameter, ImageProcessingParameterInfo> m_imageProcessingParametersInfos; // Preview - IBaseFilter *m_previewFilter; - ISampleGrabber *m_previewSampleGrabber; + DirectShowSampleGrabber *m_previewSampleGrabber; IBaseFilter *m_nullRendererFilter; QVideoFrame m_currentFrame; bool m_previewStarted; |