DirectShow: Use the new sample grabber in DsCamera

There's no need to have a separate implementation in the camera code, so
removing this one in favor of the new sample grabber.

Change-Id: I5b68d804788745b6ed3d3fceba295d1d99bb5915
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>

1 files changed, 3 insertions, 5 deletions

diff --git a/src/plugins/directshow/camera/dscamerasession.h b/src/plugins/directshow/camera/dscamerasession.h
index 3e5dc5efd..37730736f 100644
--- a/src/plugins/directshow/camera/dscamerasession.h
+++ b/src/plugins/directshow/camera/dscamerasession.h
@@ -72,11 +72,10 @@
 #define __IDxtKey_INTERFACE_DEFINED__
 
 struct ICaptureGraphBuilder2;
-struct ISampleGrabber;
 
 QT_BEGIN_NAMESPACE
 
-class SampleGrabberCallbackPrivate;
+class DirectShowSampleGrabber;
 
 class DSCameraSession : public QObject
 {
@@ -155,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();
@@ -189,8 +188,7 @@ private:
     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;