From baa4a4252063ad1cbf72e75be640a757eec57c50 Mon Sep 17 00:00:00 2001
From: a7458969 <290198252@qq.com>
Date: Thu, 21 May 2020 23:12:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=91=84=E5=83=8F=E5=A4=B4=E6=8D=95=E8=8E=B7?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96=E7=B1=BB=E5=9E=8B=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/qt_gl_render/yuvgl/media/CameraCapture.cpp | 1 +
 client/qt_gl_render/yuvgl/media/CameraCapture.h   | 3 ++-
 client/qt_gl_render/yuvgl/media/Debuger.h         | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/qt_gl_render/yuvgl/media/CameraCapture.cpp b/client/qt_gl_render/yuvgl/media/CameraCapture.cpp
index 84ce824..50e59dc 100644
--- a/client/qt_gl_render/yuvgl/media/CameraCapture.cpp
+++ b/client/qt_gl_render/yuvgl/media/CameraCapture.cpp
@@ -307,6 +307,7 @@ bool Camera::Open(std::wstring &camera_name)
 	mVideoWidth = vih->bmiHeader.biWidth;
 	mVideoHeight = vih->bmiHeader.biHeight;
 	mPixFmt = mediaType.subtype;
+    mMediaType = mediaType.subtype;
     std::cout<<"guid media type is"<<mediaType.subtype.Data1<<" "<<
         mediaType.subtype.Data2<<" "<<
         mediaType.subtype.Data3<<" "<<
diff --git a/client/qt_gl_render/yuvgl/media/CameraCapture.h b/client/qt_gl_render/yuvgl/media/CameraCapture.h
index de6f68c..fdac3ab 100644
--- a/client/qt_gl_render/yuvgl/media/CameraCapture.h
+++ b/client/qt_gl_render/yuvgl/media/CameraCapture.h
@@ -6,7 +6,7 @@
 #include "qedit.h"
 #include <mutex>
 #include <vector>
-
+#include "guiddef.h"
 using namespace std;
 
 class Camera
@@ -60,6 +60,7 @@ private:
 	SampleGrabberCallback mSampleGrabberCB;
 	HRESULT InitializeEnv();
 	HRESULT BindFilter(int deviceID, IBaseFilter **pBaseFilter);
+        GUID mMediaType;
 public:
 	int SetObserver(CameraObserver *);
 	int RemoveObserver(CameraObserver *p);
diff --git a/client/qt_gl_render/yuvgl/media/Debuger.h b/client/qt_gl_render/yuvgl/media/Debuger.h
index 9928a6c..1d65800 100644
--- a/client/qt_gl_render/yuvgl/media/Debuger.h
+++ b/client/qt_gl_render/yuvgl/media/Debuger.h
@@ -1,6 +1,5 @@
 #pragma once
 #include <string>
-
 using namespace std;
 
 class Debuger