Remove DD renderer, which we no longer maintain.
Review URL: https://webrtc-codereview.appspot.com/796005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2771 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
wu@webrtc.org
parent
75dbe9f600
commit
5c01b18c75
@ -118,7 +118,6 @@
|
|||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
#if defined(_WIN32)
|
#if defined(_WIN32)
|
||||||
// #define DIRECTDRAW_RENDERING
|
|
||||||
#define DIRECT3D9_RENDERING // Requires DirectX 9.
|
#define DIRECT3D9_RENDERING // Requires DirectX 9.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@ -56,7 +56,6 @@
|
|||||||
# Windows
|
# Windows
|
||||||
'windows/i_video_render_win.h',
|
'windows/i_video_render_win.h',
|
||||||
'windows/video_render_direct3d9.h',
|
'windows/video_render_direct3d9.h',
|
||||||
'windows/video_render_directdraw.h',
|
|
||||||
'windows/video_render_windows_impl.h',
|
'windows/video_render_windows_impl.h',
|
||||||
# External
|
# External
|
||||||
'external/video_render_external_impl.h',
|
'external/video_render_external_impl.h',
|
||||||
@ -84,7 +83,6 @@
|
|||||||
'mac/cocoa_full_screen_window.mm',
|
'mac/cocoa_full_screen_window.mm',
|
||||||
# Windows
|
# Windows
|
||||||
'windows/video_render_direct3d9.cc',
|
'windows/video_render_direct3d9.cc',
|
||||||
'windows/video_render_directdraw.cc',
|
|
||||||
'windows/video_render_windows_impl.cc',
|
'windows/video_render_windows_impl.cc',
|
||||||
# External
|
# External
|
||||||
'external/video_render_external_impl.cc',
|
'external/video_render_external_impl.cc',
|
||||||
@ -147,10 +145,8 @@
|
|||||||
'sources!': [
|
'sources!': [
|
||||||
'windows/i_video_render_win.h',
|
'windows/i_video_render_win.h',
|
||||||
'windows/video_render_direct3d9.h',
|
'windows/video_render_direct3d9.h',
|
||||||
'windows/video_render_directdraw.h',
|
|
||||||
'windows/video_render_windows_impl.h',
|
'windows/video_render_windows_impl.h',
|
||||||
'windows/video_render_direct3d9.cc',
|
'windows/video_render_direct3d9.cc',
|
||||||
'windows/video_render_directdraw.cc',
|
|
||||||
'windows/video_render_windows_impl.cc',
|
'windows/video_render_windows_impl.cc',
|
||||||
],
|
],
|
||||||
}],
|
}],
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -1,399 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
|
|
||||||
*
|
|
||||||
* Use of this source code is governed by a BSD-style license
|
|
||||||
* that can be found in the LICENSE file in the root of the source
|
|
||||||
* tree. An additional intellectual property rights grant can be found
|
|
||||||
* in the file PATENTS. All contributing project authors may
|
|
||||||
* be found in the AUTHORS file in the root of the source tree.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_WINDOWS_VIDEO_RENDER_DIRECTDRAW_H_
|
|
||||||
#define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_WINDOWS_VIDEO_RENDER_DIRECTDRAW_H_
|
|
||||||
|
|
||||||
#include "typedefs.h"
|
|
||||||
#include "i_video_render_win.h"
|
|
||||||
#include "common_video/libyuv/include/webrtc_libyuv.h"
|
|
||||||
|
|
||||||
#include "ddraw.h"
|
|
||||||
#include <Map>
|
|
||||||
#include <List>
|
|
||||||
|
|
||||||
// Added
|
|
||||||
#include "video_render_defines.h"
|
|
||||||
|
|
||||||
#pragma comment(lib, "ddraw.lib") // located in DirectX SDK
|
|
||||||
|
|
||||||
namespace webrtc {
|
|
||||||
class CriticalSectionWrapper;
|
|
||||||
class EventWrapper;
|
|
||||||
class ThreadWrapper;
|
|
||||||
class Trace;
|
|
||||||
|
|
||||||
class VideoRenderDirectDraw;
|
|
||||||
|
|
||||||
// some typedefs to make it easy to test different versions
|
|
||||||
typedef IDirectDraw7 DirectDraw;
|
|
||||||
typedef IDirectDrawSurface7 DirectDrawSurface;
|
|
||||||
typedef DDSURFACEDESC2 DirectDrawSurfaceDesc;
|
|
||||||
typedef DDSCAPS2 DirectDrawCaps;
|
|
||||||
typedef std::pair<int, unsigned int> ZorderPair;
|
|
||||||
|
|
||||||
class WindowsThreadCpuUsage
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
WindowsThreadCpuUsage();
|
|
||||||
int GetCpuUsage(); //in % since last call
|
|
||||||
DWORD LastGetCpuTime()
|
|
||||||
{
|
|
||||||
return _lastGetCpuUsageTime;
|
|
||||||
}
|
|
||||||
const enum
|
|
||||||
{
|
|
||||||
CPU_CHECK_INTERVAL = 1000
|
|
||||||
};
|
|
||||||
private:
|
|
||||||
_int64 _lastCpuUsageTime;
|
|
||||||
DWORD _lastGetCpuUsageTime;
|
|
||||||
int _lastCpuUsage;
|
|
||||||
HANDLE _hThread;
|
|
||||||
int _cores;
|
|
||||||
};
|
|
||||||
|
|
||||||
class DirectDrawStreamSettings
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
DirectDrawStreamSettings();
|
|
||||||
|
|
||||||
float _startWidth;
|
|
||||||
float _stopWidth;
|
|
||||||
float _startHeight;
|
|
||||||
float _stopHeight;
|
|
||||||
|
|
||||||
float _cropStartWidth;
|
|
||||||
float _cropStopWidth;
|
|
||||||
float _cropStartHeight;
|
|
||||||
float _cropStopHeight;
|
|
||||||
};
|
|
||||||
|
|
||||||
class DirectDrawBitmapSettings
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
DirectDrawBitmapSettings();
|
|
||||||
~DirectDrawBitmapSettings();
|
|
||||||
|
|
||||||
int SetBitmap(Trace* trace, DirectDraw* directDraw);
|
|
||||||
|
|
||||||
HBITMAP _transparentBitMap;
|
|
||||||
float _transparentBitmapLeft;
|
|
||||||
float _transparentBitmapRight;
|
|
||||||
float _transparentBitmapTop;
|
|
||||||
float _transparentBitmapBottom;
|
|
||||||
int _transparentBitmapWidth;
|
|
||||||
int _transparentBitmapHeight;
|
|
||||||
DDCOLORKEY* _transparentBitmapColorKey;
|
|
||||||
DirectDrawSurface* _transparentBitmapSurface; // size of bitmap image
|
|
||||||
};
|
|
||||||
|
|
||||||
class DirectDrawTextSettings
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
DirectDrawTextSettings();
|
|
||||||
~DirectDrawTextSettings();
|
|
||||||
|
|
||||||
int SetText(const char* text, int textLength, COLORREF colorText,
|
|
||||||
COLORREF colorBg, float left, float top, float right,
|
|
||||||
float bottom);
|
|
||||||
|
|
||||||
char* _ptrText;
|
|
||||||
WebRtc_UWord32 _textLength;
|
|
||||||
COLORREF _colorRefText;
|
|
||||||
COLORREF _colorRefBackground;
|
|
||||||
float _textLeft;
|
|
||||||
float _textRight;
|
|
||||||
float _textTop;
|
|
||||||
float _textBottom;
|
|
||||||
bool _transparent;
|
|
||||||
};
|
|
||||||
|
|
||||||
class DirectDrawChannel: public VideoRenderCallback
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
DirectDrawChannel(DirectDraw* directDraw,
|
|
||||||
VideoType blitVideoType,
|
|
||||||
VideoType incomingVideoType,
|
|
||||||
VideoType screenVideoType,
|
|
||||||
VideoRenderDirectDraw* owner);
|
|
||||||
|
|
||||||
int FrameSizeChange(int width, int height, int numberOfStreams);
|
|
||||||
int DeliverFrame(unsigned char* buffer, int buffeSize,
|
|
||||||
unsigned int timeStamp90KHz);
|
|
||||||
virtual WebRtc_Word32 RenderFrame(const WebRtc_UWord32 streamId,
|
|
||||||
VideoFrame& videoFrame);
|
|
||||||
|
|
||||||
int ChangeDeliverColorFormat(bool useScreenType);
|
|
||||||
|
|
||||||
void AddRef();
|
|
||||||
void Release();
|
|
||||||
|
|
||||||
void SetStreamSettings(VideoRenderDirectDraw* DDObj, short streamId,
|
|
||||||
float startWidth, float startHeight,
|
|
||||||
float stopWidth, float stopHeight);
|
|
||||||
void SetStreamCropSettings(VideoRenderDirectDraw* DDObj,
|
|
||||||
short streamId, float startWidth,
|
|
||||||
float startHeight, float stopWidth,
|
|
||||||
float stopHeight);
|
|
||||||
|
|
||||||
int GetStreamSettings(VideoRenderDirectDraw* DDObj, short streamId,
|
|
||||||
float& startWidth, float& startHeight,
|
|
||||||
float& stopWidth, float& stopHeight);
|
|
||||||
|
|
||||||
void GetLargestSize(RECT* mixingRect);
|
|
||||||
int
|
|
||||||
BlitFromOffscreenBufferToMixingBuffer(
|
|
||||||
VideoRenderDirectDraw* DDObj,
|
|
||||||
short streamID,
|
|
||||||
DirectDrawSurface* mixingSurface,
|
|
||||||
RECT &dstRect, bool demuxing);
|
|
||||||
bool IsOffScreenSurfaceUpdated(VideoRenderDirectDraw* DDobj);
|
|
||||||
|
|
||||||
protected:
|
|
||||||
virtual ~DirectDrawChannel();
|
|
||||||
|
|
||||||
private:
|
|
||||||
CriticalSectionWrapper* _critSect; // protect members from change while using them
|
|
||||||
int _refCount;
|
|
||||||
int _width;
|
|
||||||
int _height;
|
|
||||||
int _numberOfStreams;
|
|
||||||
bool _deliverInScreenType;
|
|
||||||
bool _doubleBuffer;
|
|
||||||
DirectDraw* _directDraw;
|
|
||||||
DirectDrawSurface* _offScreenSurface; // size of incoming stream
|
|
||||||
DirectDrawSurface* _offScreenSurfaceNext; // size of incoming stream
|
|
||||||
VideoType _blitVideoType;
|
|
||||||
VideoType _originalBlitVideoType;
|
|
||||||
VideoType _incomingVideoType;
|
|
||||||
VideoType _screenVideoType;
|
|
||||||
enum
|
|
||||||
{
|
|
||||||
MAX_FRAMEDELIVER_TIME = 20
|
|
||||||
}; //Maximum time it might take to deliver a frame (process time in DeliverFrame)
|
|
||||||
enum
|
|
||||||
{
|
|
||||||
MAX_NO_OF_LATE_FRAMEDELIVER_TIME = 10
|
|
||||||
}; //No of times we allow DeliverFrame process time to exceed MAX_FRAMEDELIVER_TIME before we take action.
|
|
||||||
VideoFrame _tempRenderBuffer;
|
|
||||||
|
|
||||||
std::map<unsigned long long, DirectDrawStreamSettings*>
|
|
||||||
_streamIdToSettings;
|
|
||||||
bool _offScreenSurfaceUpdated;
|
|
||||||
VideoRenderDirectDraw* _owner;
|
|
||||||
};
|
|
||||||
|
|
||||||
class VideoRenderDirectDraw: IVideoRenderWin
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
VideoRenderDirectDraw(Trace* trace, HWND hWnd, bool fullscreen);
|
|
||||||
~VideoRenderDirectDraw();
|
|
||||||
public:
|
|
||||||
//IVideoRenderWin
|
|
||||||
|
|
||||||
/**************************************************************************
|
|
||||||
*
|
|
||||||
* Init
|
|
||||||
*
|
|
||||||
***************************************************************************/
|
|
||||||
virtual WebRtc_Word32 Init();
|
|
||||||
|
|
||||||
/**************************************************************************
|
|
||||||
*
|
|
||||||
* Incoming Streams
|
|
||||||
*
|
|
||||||
***************************************************************************/
|
|
||||||
virtual VideoRenderCallback
|
|
||||||
* CreateChannel(const WebRtc_UWord32 streamId,
|
|
||||||
const WebRtc_UWord32 zOrder, const float left,
|
|
||||||
const float top, const float right,
|
|
||||||
const float bottom);
|
|
||||||
|
|
||||||
virtual WebRtc_Word32 DeleteChannel(const WebRtc_UWord32 streamId);
|
|
||||||
|
|
||||||
virtual WebRtc_Word32 GetStreamSettings(const WebRtc_UWord32 channel,
|
|
||||||
const WebRtc_UWord16 streamId,
|
|
||||||
WebRtc_UWord32& zOrder,
|
|
||||||
float& left, float& top,
|
|
||||||
float& right, float& bottom);
|
|
||||||
|
|
||||||
/**************************************************************************
|
|
||||||
*
|
|
||||||
* Start/Stop
|
|
||||||
*
|
|
||||||
***************************************************************************/
|
|
||||||
|
|
||||||
virtual WebRtc_Word32 StartRender();
|
|
||||||
virtual WebRtc_Word32 StopRender();
|
|
||||||
|
|
||||||
/**************************************************************************
|
|
||||||
*
|
|
||||||
* Properties
|
|
||||||
*
|
|
||||||
***************************************************************************/
|
|
||||||
|
|
||||||
virtual bool IsFullScreen();
|
|
||||||
|
|
||||||
virtual WebRtc_Word32 SetCropping(const WebRtc_UWord32 channel,
|
|
||||||
const WebRtc_UWord16 streamId,
|
|
||||||
const float left, const float top,
|
|
||||||
const float right, const float bottom);
|
|
||||||
|
|
||||||
virtual WebRtc_Word32 SetTransparentBackground(const bool enable);
|
|
||||||
|
|
||||||
virtual WebRtc_Word32 ChangeWindow(void* window);
|
|
||||||
|
|
||||||
virtual WebRtc_Word32 GetGraphicsMemory(WebRtc_UWord64& totalMemory,
|
|
||||||
WebRtc_UWord64& availableMemory);
|
|
||||||
|
|
||||||
virtual WebRtc_Word32 SetText(const WebRtc_UWord8 textId,
|
|
||||||
const WebRtc_UWord8* text,
|
|
||||||
const WebRtc_Word32 textLength,
|
|
||||||
const WebRtc_UWord32 colorText,
|
|
||||||
const WebRtc_UWord32 colorBg,
|
|
||||||
const float left, const float top,
|
|
||||||
const float rigth, const float bottom);
|
|
||||||
|
|
||||||
virtual WebRtc_Word32 SetBitmap(const void* bitMap,
|
|
||||||
const WebRtc_UWord8 pictureId,
|
|
||||||
const void* colorKey, const float left,
|
|
||||||
const float top, const float right,
|
|
||||||
const float bottom);
|
|
||||||
|
|
||||||
virtual WebRtc_Word32 ConfigureRenderer(const WebRtc_UWord32 channel,
|
|
||||||
const WebRtc_UWord16 streamId,
|
|
||||||
const unsigned int zOrder,
|
|
||||||
const float left, const float top,
|
|
||||||
const float right,
|
|
||||||
const float bottom);
|
|
||||||
public:
|
|
||||||
|
|
||||||
// Used for emergency stops...
|
|
||||||
int Stop();
|
|
||||||
|
|
||||||
DirectDrawChannel* ShareDirectDrawChannel(int channel);
|
|
||||||
DirectDrawChannel* ConfigureDirectDrawChannel(int channel,
|
|
||||||
unsigned char streamID,
|
|
||||||
int zOrder, float left,
|
|
||||||
float top, float right,
|
|
||||||
float bottom);
|
|
||||||
|
|
||||||
int AddDirectDrawChannel(int channel, unsigned char streamID, int zOrder,
|
|
||||||
DirectDrawChannel*);
|
|
||||||
|
|
||||||
VideoType GetPerferedVideoFormat();
|
|
||||||
bool HasChannels();
|
|
||||||
bool HasChannel(int channel);
|
|
||||||
bool DeliverInScreenType();
|
|
||||||
int GetChannels(std::list<int>& channelList);
|
|
||||||
|
|
||||||
// code for getting graphics settings
|
|
||||||
int GetScreenResolution(int& screenWidth, int& screenHeight);
|
|
||||||
int UpdateSystemCPUUsage(int systemCPU);
|
|
||||||
|
|
||||||
int SetBitmap(HBITMAP bitMap, unsigned char pictureId,
|
|
||||||
DDCOLORKEY* colorKey, float left, float top, float rigth,
|
|
||||||
float bottom);
|
|
||||||
|
|
||||||
bool IsPrimaryOrMixingSurfaceOnSystem();
|
|
||||||
bool CanBltFourCC()
|
|
||||||
{
|
|
||||||
return _bCanBltFourcc;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected:
|
|
||||||
static bool RemoteRenderingThreadProc(void* obj);
|
|
||||||
bool RemoteRenderingProcess();
|
|
||||||
|
|
||||||
private:
|
|
||||||
int CheckCapabilities();
|
|
||||||
int CreateMixingSurface();
|
|
||||||
int CreatePrimarySurface();
|
|
||||||
|
|
||||||
int FillSurface(DirectDrawSurface *pDDSurface, RECT* rect);
|
|
||||||
int DrawOnSurface(unsigned char* buffer, int buffeSize);
|
|
||||||
int BlitFromOffscreenBuffersToMixingBuffer();
|
|
||||||
int BlitFromBitmapBuffersToMixingBuffer();
|
|
||||||
int BlitFromTextToMixingBuffer();
|
|
||||||
|
|
||||||
bool HasHWNDChanged();
|
|
||||||
void DecideBestRenderingMode(bool hwndChanged, int totalRenderTime);
|
|
||||||
|
|
||||||
// in fullscreen flip mode
|
|
||||||
int WaitAndFlip(int& waitTime);
|
|
||||||
int BlitFromMixingBufferToBackBuffer();
|
|
||||||
|
|
||||||
// in normal window mode
|
|
||||||
int BlitFromMixingBufferToFrontBuffer(bool hwndChanged, int& waitTime);
|
|
||||||
|
|
||||||
// private members
|
|
||||||
Trace* _trace;
|
|
||||||
CriticalSectionWrapper* _confCritSect; // protect members from change while using them
|
|
||||||
|
|
||||||
bool _fullscreen;
|
|
||||||
bool _demuxing;
|
|
||||||
bool _transparentBackground;
|
|
||||||
bool _supportTransparency;
|
|
||||||
bool _canStretch;
|
|
||||||
bool _canMirrorLeftRight;
|
|
||||||
bool _clearMixingSurface;
|
|
||||||
bool _deliverInScreenType;
|
|
||||||
bool _renderModeWaitForCorrectScanLine;
|
|
||||||
bool _deliverInHalfFrameRate;
|
|
||||||
bool _deliverInQuarterFrameRate;
|
|
||||||
bool _bCanBltFourcc;
|
|
||||||
bool _frameChanged; // True if a frame has changed or bitmap or text has changed.
|
|
||||||
int _processCount;
|
|
||||||
HWND _hWnd;
|
|
||||||
RECT _screenRect; // whole screen as a rect
|
|
||||||
RECT _mixingRect;
|
|
||||||
RECT _originalHwndRect;
|
|
||||||
RECT _hwndRect;
|
|
||||||
|
|
||||||
VideoType _incomingVideoType;
|
|
||||||
VideoType _blitVideoType;
|
|
||||||
VideoType _rgbVideoType;
|
|
||||||
|
|
||||||
DirectDraw* _directDraw;
|
|
||||||
DirectDrawSurface* _primarySurface; // size of screen
|
|
||||||
DirectDrawSurface* _backSurface; // size of screen
|
|
||||||
DirectDrawSurface* _mixingSurface; // size of screen
|
|
||||||
|
|
||||||
std::map<unsigned char, DirectDrawBitmapSettings*> _bitmapSettings;
|
|
||||||
std::map<unsigned char, DirectDrawTextSettings*> _textSettings;
|
|
||||||
std::map<int, DirectDrawChannel*> _directDrawChannels;
|
|
||||||
std::multimap<int, unsigned int> _directDrawZorder;
|
|
||||||
|
|
||||||
EventWrapper* _fullScreenWaitEvent;
|
|
||||||
EventWrapper* _screenEvent;
|
|
||||||
ThreadWrapper* _screenRenderThread;
|
|
||||||
WindowsThreadCpuUsage _screenRenderCpuUsage;
|
|
||||||
|
|
||||||
int _lastRenderModeCpuUsage;
|
|
||||||
|
|
||||||
// Used for emergency stop caused by OnDisplayChange
|
|
||||||
bool _blit;
|
|
||||||
|
|
||||||
//code for providing graphics settings
|
|
||||||
DWORD _totalMemory;
|
|
||||||
DWORD _availableMemory;
|
|
||||||
int _systemCPUUsage;
|
|
||||||
|
|
||||||
// Variables used for checking render time
|
|
||||||
int _maxAllowedRenderTime;
|
|
||||||
int _nrOfTooLongRenderTimes;
|
|
||||||
bool _isPrimaryOrMixingSurfaceOnSystem;
|
|
||||||
};
|
|
||||||
|
|
||||||
} //namespace webrtc
|
|
||||||
|
|
||||||
|
|
||||||
#endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_WINDOWS_VIDEO_RENDER_DIRECTDRAW_H_
|
|
||||||
@ -13,9 +13,6 @@
|
|||||||
|
|
||||||
#include "critical_section_wrapper.h"
|
#include "critical_section_wrapper.h"
|
||||||
#include "trace.h"
|
#include "trace.h"
|
||||||
#ifdef DIRECTDRAW_RENDERING
|
|
||||||
#include "video_render_directdraw.h"
|
|
||||||
#endif
|
|
||||||
#ifdef DIRECT3D9_RENDERING
|
#ifdef DIRECT3D9_RENDERING
|
||||||
#include "video_render_direct3d9.h"
|
#include "video_render_direct3d9.h"
|
||||||
#endif
|
#endif
|
||||||
@ -46,27 +43,9 @@ VideoRenderWindowsImpl::~VideoRenderWindowsImpl()
|
|||||||
|
|
||||||
WebRtc_Word32 VideoRenderWindowsImpl::Init()
|
WebRtc_Word32 VideoRenderWindowsImpl::Init()
|
||||||
{
|
{
|
||||||
//LogOSAndHardwareDetails();
|
|
||||||
CheckHWAcceleration();
|
|
||||||
|
|
||||||
// Create the win renderer
|
// Create the win renderer
|
||||||
switch (_renderMethod)
|
switch (_renderMethod)
|
||||||
{
|
{
|
||||||
case kVideoRenderWinDd:
|
|
||||||
{
|
|
||||||
#ifdef DIRECTDRAW_RENDERING
|
|
||||||
VideoRenderDirectDraw* ptrRenderer;
|
|
||||||
ptrRenderer = new VideoRenderDirectDraw(NULL, (HWND) _prtWindow, _fullscreen);
|
|
||||||
if (ptrRenderer == NULL)
|
|
||||||
{
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
_ptrRendererWin = reinterpret_cast<IVideoRenderWin*>(ptrRenderer);
|
|
||||||
#else
|
|
||||||
return NULL;
|
|
||||||
#endif //DIRECTDRAW_RENDERING
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case kVideoRenderWinD3D9:
|
case kVideoRenderWinD3D9:
|
||||||
{
|
{
|
||||||
#ifdef DIRECT3D9_RENDERING
|
#ifdef DIRECT3D9_RENDERING
|
||||||
@ -365,619 +344,5 @@ WebRtc_Word32 VideoRenderWindowsImpl::SetBitmap(const void* bitMap,
|
|||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
void VideoRenderWindowsImpl::LogOSAndHardwareDetails()
|
|
||||||
{
|
|
||||||
HRESULT hr;
|
|
||||||
IDxDiagProvider* m_pDxDiagProvider = NULL;
|
|
||||||
IDxDiagContainer* m_pDxDiagRoot = NULL;
|
|
||||||
|
|
||||||
hr = CoInitializeEx(NULL, COINIT_MULTITHREADED);
|
|
||||||
bool coUninitializeIsRequired = true;
|
|
||||||
if (FAILED(hr))
|
|
||||||
{
|
|
||||||
// Avoid calling CoUninitialize() since CoInitializeEx() failed.
|
|
||||||
coUninitializeIsRequired = false;
|
|
||||||
if (hr == RPC_E_CHANGED_MODE)
|
|
||||||
{
|
|
||||||
// Calling thread has already initialized COM to be used in a single-threaded
|
|
||||||
// apartment (STA). We are then prevented from using STA.
|
|
||||||
// Details: hr = 0x80010106 <=> "Cannot change thread mode after it is set".
|
|
||||||
//
|
|
||||||
WEBRTC_TRACE(
|
|
||||||
kTraceWarning,
|
|
||||||
kTraceVideoRenderer,
|
|
||||||
_id,
|
|
||||||
"VideoRenderWindowsImpl::LogOSAndHardwareDetails() CoInitializeEx(NULL, COINIT_APARTMENTTHREADED) => RPC_E_CHANGED_MODE, error 0x%x",
|
|
||||||
hr);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
hr = CoCreateInstance(CLSID_DxDiagProvider, NULL, CLSCTX_INPROC_SERVER,
|
|
||||||
IID_IDxDiagProvider, (LPVOID*) &m_pDxDiagProvider);
|
|
||||||
|
|
||||||
if (FAILED(hr) || m_pDxDiagProvider == NULL)
|
|
||||||
{
|
|
||||||
if (coUninitializeIsRequired)
|
|
||||||
CoUninitialize();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fill out a DXDIAG_INIT_PARAMS struct and pass it to IDxDiagContainer::Initialize
|
|
||||||
// Passing in TRUE for bAllowWHQLChecks, allows dxdiag to check if drivers are
|
|
||||||
// digital signed as logo'd by WHQL which may connect via internet to update
|
|
||||||
// WHQL certificates.
|
|
||||||
DXDIAG_INIT_PARAMS dxDiagInitParam;
|
|
||||||
ZeroMemory(&dxDiagInitParam, sizeof(DXDIAG_INIT_PARAMS));
|
|
||||||
|
|
||||||
dxDiagInitParam.dwSize = sizeof(DXDIAG_INIT_PARAMS);
|
|
||||||
dxDiagInitParam.dwDxDiagHeaderVersion = DXDIAG_DX9_SDK_VERSION;
|
|
||||||
dxDiagInitParam.bAllowWHQLChecks = TRUE;
|
|
||||||
dxDiagInitParam.pReserved = NULL;
|
|
||||||
|
|
||||||
hr = m_pDxDiagProvider->Initialize(&dxDiagInitParam);
|
|
||||||
if (FAILED(hr))
|
|
||||||
{
|
|
||||||
m_pDxDiagProvider->Release();
|
|
||||||
if (coUninitializeIsRequired)
|
|
||||||
CoUninitialize();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
hr = m_pDxDiagProvider->GetRootContainer(&m_pDxDiagRoot);
|
|
||||||
if (FAILED(hr) || m_pDxDiagRoot == NULL)
|
|
||||||
{
|
|
||||||
m_pDxDiagProvider->Release();
|
|
||||||
if (coUninitializeIsRequired)
|
|
||||||
CoUninitialize();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
IDxDiagContainer* pObject = NULL;
|
|
||||||
|
|
||||||
hr = m_pDxDiagRoot->GetChildContainer(L"DxDiag_SystemInfo", &pObject);
|
|
||||||
if (FAILED(hr) || pObject == NULL)
|
|
||||||
{
|
|
||||||
m_pDxDiagRoot->Release();
|
|
||||||
m_pDxDiagProvider->Release();
|
|
||||||
if (coUninitializeIsRequired)
|
|
||||||
CoUninitialize();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
TCHAR m_szDirectXVersionLongEnglish[100];
|
|
||||||
TCHAR m_szOSLocalized[100];
|
|
||||||
TCHAR m_szProcessorEnglish[200];
|
|
||||||
TCHAR m_szSystemManufacturerEnglish[200];
|
|
||||||
|
|
||||||
ZeroMemory(m_szDirectXVersionLongEnglish, sizeof(TCHAR) * 100);
|
|
||||||
ZeroMemory(m_szOSLocalized, sizeof(TCHAR) * 100);
|
|
||||||
ZeroMemory(m_szProcessorEnglish, sizeof(TCHAR) * 200);
|
|
||||||
ZeroMemory(m_szSystemManufacturerEnglish, sizeof(TCHAR) * 200);
|
|
||||||
|
|
||||||
GetStringValue( pObject, L"szDirectXVersionLongEnglish",
|
|
||||||
EXPAND(m_szDirectXVersionLongEnglish) );
|
|
||||||
GetStringValue(pObject, L"szOSLocalized", EXPAND(m_szOSLocalized) );
|
|
||||||
GetStringValue(pObject, L"szProcessorEnglish", EXPAND(m_szProcessorEnglish) );
|
|
||||||
GetStringValue( pObject, L"szSystemManufacturerEnglish",
|
|
||||||
EXPAND(m_szSystemManufacturerEnglish) );
|
|
||||||
|
|
||||||
WEBRTC_TRACE(kTraceStateInfo, kTraceVideo, -1,
|
|
||||||
"System Manufacturer --- %s",
|
|
||||||
m_szSystemManufacturerEnglish);
|
|
||||||
WEBRTC_TRACE(kTraceStateInfo, kTraceVideo, -1,
|
|
||||||
"Processor --- %s", m_szProcessorEnglish);
|
|
||||||
WEBRTC_TRACE(kTraceStateInfo, kTraceVideo, -1,
|
|
||||||
"Operating System --- %s", m_szOSLocalized);
|
|
||||||
WEBRTC_TRACE(kTraceStateInfo, kTraceVideo, -1,
|
|
||||||
"DirectX Version --- %s",
|
|
||||||
m_szDirectXVersionLongEnglish);
|
|
||||||
|
|
||||||
if (pObject)
|
|
||||||
pObject->Release();
|
|
||||||
|
|
||||||
struct DisplayInfo
|
|
||||||
{
|
|
||||||
TCHAR m_szDescription[200];
|
|
||||||
TCHAR m_szManufacturer[200];
|
|
||||||
TCHAR m_szChipType[100];
|
|
||||||
TCHAR m_szDisplayMemoryEnglish[100];
|
|
||||||
TCHAR m_szDisplayModeEnglish[100];
|
|
||||||
TCHAR m_szDriverName[100];
|
|
||||||
TCHAR m_szDriverVersion[100];
|
|
||||||
TCHAR m_szDDStatusEnglish[100];
|
|
||||||
TCHAR m_szD3DStatusEnglish[100];
|
|
||||||
BOOL m_bDDAccelerationEnabled;
|
|
||||||
BOOL m_bNoHardware;
|
|
||||||
BOOL m_b3DAccelerationExists;
|
|
||||||
BOOL m_b3DAccelerationEnabled;
|
|
||||||
};
|
|
||||||
|
|
||||||
WCHAR wszContainer[256];
|
|
||||||
IDxDiagContainer* pContainer = NULL;
|
|
||||||
|
|
||||||
DWORD nInstanceCount = 0;
|
|
||||||
DWORD nItem = 0;
|
|
||||||
|
|
||||||
// Get the IDxDiagContainer object called "DxDiag_DisplayDevices".
|
|
||||||
// This call may take some time while dxdiag gathers the info.
|
|
||||||
if (FAILED(hr = m_pDxDiagRoot->GetChildContainer(L"DxDiag_DisplayDevices",
|
|
||||||
&pContainer)) ||
|
|
||||||
!pContainer) {
|
|
||||||
m_pDxDiagRoot->Release();
|
|
||||||
m_pDxDiagProvider->Release();
|
|
||||||
if (coUninitializeIsRequired)
|
|
||||||
CoUninitialize();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (FAILED(hr = pContainer->GetNumberOfChildContainers(&nInstanceCount)))
|
|
||||||
{
|
|
||||||
pContainer->Release();
|
|
||||||
m_pDxDiagRoot->Release();
|
|
||||||
m_pDxDiagProvider->Release();
|
|
||||||
if (coUninitializeIsRequired)
|
|
||||||
CoUninitialize();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
DisplayInfo *pDisplayInfo = new DisplayInfo;
|
|
||||||
if (pDisplayInfo == NULL)
|
|
||||||
return;
|
|
||||||
ZeroMemory(pDisplayInfo, sizeof(DisplayInfo));
|
|
||||||
|
|
||||||
hr = pContainer->EnumChildContainerNames(nItem, wszContainer, 256);
|
|
||||||
if (FAILED(hr))
|
|
||||||
{
|
|
||||||
delete pDisplayInfo;
|
|
||||||
pContainer->Release();
|
|
||||||
m_pDxDiagRoot->Release();
|
|
||||||
m_pDxDiagProvider->Release();
|
|
||||||
if (coUninitializeIsRequired)
|
|
||||||
CoUninitialize();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
hr = pContainer->GetChildContainer(wszContainer, &pObject);
|
|
||||||
if (FAILED(hr) || pObject == NULL)
|
|
||||||
{
|
|
||||||
delete pDisplayInfo;
|
|
||||||
pContainer->Release();
|
|
||||||
m_pDxDiagRoot->Release();
|
|
||||||
m_pDxDiagProvider->Release();
|
|
||||||
if (coUninitializeIsRequired)
|
|
||||||
CoUninitialize();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
GetStringValue( pObject, L"szDescription",
|
|
||||||
EXPAND(pDisplayInfo->m_szDescription) );
|
|
||||||
GetStringValue( pObject, L"szManufacturer",
|
|
||||||
EXPAND(pDisplayInfo->m_szManufacturer) );
|
|
||||||
GetStringValue(pObject, L"szChipType", EXPAND(pDisplayInfo->m_szChipType) );
|
|
||||||
GetStringValue( pObject, L"szDisplayMemoryEnglish",
|
|
||||||
EXPAND(pDisplayInfo->m_szDisplayMemoryEnglish) );
|
|
||||||
GetStringValue( pObject, L"szDisplayModeEnglish",
|
|
||||||
EXPAND(pDisplayInfo->m_szDisplayModeEnglish) );
|
|
||||||
GetStringValue( pObject, L"szDriverName",
|
|
||||||
EXPAND(pDisplayInfo->m_szDriverName) );
|
|
||||||
GetStringValue( pObject, L"szDriverVersion",
|
|
||||||
EXPAND(pDisplayInfo->m_szDriverVersion) );
|
|
||||||
GetBoolValue(pObject, L"bDDAccelerationEnabled",
|
|
||||||
&pDisplayInfo->m_bDDAccelerationEnabled);
|
|
||||||
GetBoolValue(pObject, L"bNoHardware", &pDisplayInfo->m_bNoHardware);
|
|
||||||
GetBoolValue(pObject, L"bDDAccelerationEnabled",
|
|
||||||
&pDisplayInfo->m_bDDAccelerationEnabled);
|
|
||||||
GetBoolValue(pObject, L"b3DAccelerationExists",
|
|
||||||
&pDisplayInfo->m_b3DAccelerationExists);
|
|
||||||
GetBoolValue(pObject, L"b3DAccelerationEnabled",
|
|
||||||
&pDisplayInfo->m_b3DAccelerationEnabled);
|
|
||||||
GetStringValue( pObject, L"szDDStatusEnglish",
|
|
||||||
EXPAND(pDisplayInfo->m_szDDStatusEnglish));
|
|
||||||
GetStringValue( pObject, L"szD3DStatusEnglish",
|
|
||||||
EXPAND(pDisplayInfo->m_szD3DStatusEnglish));
|
|
||||||
|
|
||||||
WEBRTC_TRACE(kTraceStateInfo, kTraceVideo, -1,
|
|
||||||
"Device Name --- %s",
|
|
||||||
pDisplayInfo->m_szDescription);
|
|
||||||
WEBRTC_TRACE(kTraceStateInfo, kTraceVideo, -1,
|
|
||||||
"Device Manufacturer --- %s",
|
|
||||||
pDisplayInfo->m_szManufacturer);
|
|
||||||
WEBRTC_TRACE(kTraceStateInfo, kTraceVideo, -1,
|
|
||||||
"Device ChipType --- %s",
|
|
||||||
pDisplayInfo->m_szChipType);
|
|
||||||
WEBRTC_TRACE(kTraceStateInfo, kTraceVideo, -1,
|
|
||||||
"Approx. Total Device Memory --- %s",
|
|
||||||
pDisplayInfo->m_szDisplayMemoryEnglish);
|
|
||||||
WEBRTC_TRACE(kTraceStateInfo, kTraceVideo, -1,
|
|
||||||
"Current Display Mode --- %s",
|
|
||||||
pDisplayInfo->m_szDisplayModeEnglish);
|
|
||||||
WEBRTC_TRACE(kTraceStateInfo, kTraceVideo, -1,
|
|
||||||
"Device Driver Name --- %s",
|
|
||||||
pDisplayInfo->m_szDriverName);
|
|
||||||
WEBRTC_TRACE(kTraceStateInfo, kTraceVideo, -1,
|
|
||||||
"Device Driver Version --- %s",
|
|
||||||
pDisplayInfo->m_szDriverVersion);
|
|
||||||
WEBRTC_TRACE(kTraceStateInfo, kTraceVideo, -1,
|
|
||||||
"DirectDraw Acceleration Enabled --- %s",
|
|
||||||
pDisplayInfo->m_bDDAccelerationEnabled ?
|
|
||||||
"Enabled" : "Disabled");
|
|
||||||
WEBRTC_TRACE(kTraceStateInfo, kTraceVideo, -1,
|
|
||||||
"bNoHardware --- %s",
|
|
||||||
pDisplayInfo->m_bNoHardware ? "Enabled" : "Disabled");
|
|
||||||
WEBRTC_TRACE(kTraceStateInfo, kTraceVideo, -1,
|
|
||||||
"b3DAccelerationExists Enabled --- %s",
|
|
||||||
pDisplayInfo->m_b3DAccelerationExists ? "Enabled" : "Disabled");
|
|
||||||
WEBRTC_TRACE(kTraceStateInfo, kTraceVideo, -1,
|
|
||||||
"b3DAccelerationEnabled Enabled --- %s",
|
|
||||||
pDisplayInfo->m_b3DAccelerationEnabled ? "Enabled"
|
|
||||||
: "Disabled");
|
|
||||||
WEBRTC_TRACE(kTraceStateInfo, kTraceVideo, -1,
|
|
||||||
"DDraw Status --- %s",
|
|
||||||
pDisplayInfo->m_szDDStatusEnglish);
|
|
||||||
WEBRTC_TRACE(kTraceStateInfo, kTraceVideo, -1,
|
|
||||||
"D3D Status --- %s",
|
|
||||||
pDisplayInfo->m_szD3DStatusEnglish);
|
|
||||||
|
|
||||||
// Get OS version
|
|
||||||
OSVERSIONINFOEX osvie;
|
|
||||||
osvie.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
|
|
||||||
GetVersionEx((LPOSVERSIONINFO) & osvie);
|
|
||||||
/*
|
|
||||||
Operating system Version number dwMajorVersion dwMinorVersion
|
|
||||||
Windows 7 6.1 6 1
|
|
||||||
Windows Server 2008 R2 6.1 6 1
|
|
||||||
Windows Server 2008 6.0 6 0
|
|
||||||
Windows Vista 6.0 6 0
|
|
||||||
Windows Server 2003 R2 5.2 5 2
|
|
||||||
Windows Server 2003 5.2 5 2
|
|
||||||
Windows XP 5.1 5 1
|
|
||||||
Windows 2000 5.0 5 0
|
|
||||||
*/
|
|
||||||
//RDP problem exists only when XP is involved
|
|
||||||
if (osvie.dwMajorVersion < 6)
|
|
||||||
{
|
|
||||||
WEBRTC_TRACE(kTraceStateInfo, kTraceVideoRenderer, _id,
|
|
||||||
"Checking for RDP driver");
|
|
||||||
if (_tcsncmp(pDisplayInfo->m_szDriverName, _T("RDPDD.dll"), 9) == 0)
|
|
||||||
{
|
|
||||||
//
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pObject)
|
|
||||||
{
|
|
||||||
pObject->Release();
|
|
||||||
pObject = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pContainer)
|
|
||||||
pContainer->Release();
|
|
||||||
|
|
||||||
if (m_pDxDiagProvider)
|
|
||||||
m_pDxDiagProvider->Release();
|
|
||||||
|
|
||||||
if (m_pDxDiagRoot)
|
|
||||||
m_pDxDiagRoot->Release();
|
|
||||||
|
|
||||||
if (pDisplayInfo)
|
|
||||||
delete pDisplayInfo;
|
|
||||||
|
|
||||||
if (coUninitializeIsRequired)
|
|
||||||
CoUninitialize();
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
// Name: GetStringValue()
|
|
||||||
// Desc: Get a string value from a IDxDiagContainer object
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
HRESULT VideoRenderWindowsImpl::GetStringValue(IDxDiagContainer* pObject,
|
|
||||||
WCHAR* wstrName,
|
|
||||||
TCHAR* strValue, int nStrLen)
|
|
||||||
{
|
|
||||||
HRESULT hr;
|
|
||||||
VARIANT var;
|
|
||||||
VariantInit(&var);
|
|
||||||
|
|
||||||
if (FAILED(hr = pObject->GetProp(wstrName, &var)))
|
|
||||||
return hr;
|
|
||||||
|
|
||||||
if (var.vt != VT_BSTR)
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
#ifdef _UNICODE
|
|
||||||
wcsncpy( strValue, var.bstrVal, nStrLen-1 );
|
|
||||||
#else
|
|
||||||
wcstombs(strValue, var.bstrVal, nStrLen);
|
|
||||||
#endif
|
|
||||||
strValue[nStrLen - 1] = TEXT('\0');
|
|
||||||
VariantClear(&var);
|
|
||||||
|
|
||||||
return S_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
// Name: GetBoolValue()
|
|
||||||
// Desc: Get a BOOL value from a IDxDiagContainer object
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
HRESULT VideoRenderWindowsImpl::GetBoolValue(IDxDiagContainer* pObject,
|
|
||||||
WCHAR* wstrName, BOOL* pbValue)
|
|
||||||
{
|
|
||||||
HRESULT hr;
|
|
||||||
VARIANT var;
|
|
||||||
VariantInit(&var);
|
|
||||||
|
|
||||||
if (FAILED(hr = pObject->GetProp(wstrName, &var)))
|
|
||||||
return hr;
|
|
||||||
|
|
||||||
if (var.vt != VT_BOOL)
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
*pbValue = (var.boolVal != 0);
|
|
||||||
VariantClear(&var);
|
|
||||||
|
|
||||||
return S_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
int VideoRenderWindowsImpl::CheckHWAcceleration()
|
|
||||||
{
|
|
||||||
// Read the registry to check if HW acceleration is enabled or not.
|
|
||||||
HKEY regKey;
|
|
||||||
DWORD value = 0;
|
|
||||||
DWORD valueLength = 4;
|
|
||||||
|
|
||||||
bool directDraw = true;
|
|
||||||
bool direct3D = true;
|
|
||||||
bool dci = true;
|
|
||||||
|
|
||||||
// DirectDraw
|
|
||||||
if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Microsoft\\DirectDraw"),
|
|
||||||
0, KEY_QUERY_VALUE, ®Key) == ERROR_SUCCESS)
|
|
||||||
{
|
|
||||||
// We have the registry key
|
|
||||||
value = 0;
|
|
||||||
if (RegQueryValueEx(regKey, _T("EmulationOnly"), NULL, NULL,
|
|
||||||
(BYTE*) &value, &valueLength) == ERROR_SUCCESS)
|
|
||||||
{
|
|
||||||
if (value == 1)
|
|
||||||
{
|
|
||||||
WEBRTC_TRACE(kTraceWarning, kTraceVideo, -1,
|
|
||||||
"DirectDraw acceleration is disabled");
|
|
||||||
directDraw = false;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
WEBRTC_TRACE(kTraceWarning, kTraceVideo, -1,
|
|
||||||
"DirectDraw acceleration is enabled");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// Could not get the value for this one.
|
|
||||||
WEBRTC_TRACE(kTraceInfo, kTraceVideo, -1,
|
|
||||||
"Could not find EmulationOnly key, DirectDraw acceleration is probably enabled");
|
|
||||||
}
|
|
||||||
RegCloseKey(regKey);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
WEBRTC_TRACE(kTraceInfo, kTraceVideo, -1,
|
|
||||||
"Could not open DirectDraw settings");
|
|
||||||
}
|
|
||||||
|
|
||||||
// Direct3D
|
|
||||||
if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,
|
|
||||||
_T("SOFTWARE\\Microsoft\\Direct3D\\Drivers"), 0,
|
|
||||||
KEY_QUERY_VALUE, ®Key) == ERROR_SUCCESS)
|
|
||||||
{
|
|
||||||
// We have the registry key
|
|
||||||
value = 0;
|
|
||||||
if (RegQueryValueEx(regKey, _T("SoftwareOnly"), NULL, NULL,
|
|
||||||
(BYTE*) &value, &valueLength) == ERROR_SUCCESS)
|
|
||||||
{
|
|
||||||
if (value == 1)
|
|
||||||
{
|
|
||||||
WEBRTC_TRACE(kTraceWarning, kTraceVideo, -1,
|
|
||||||
"Direct3D acceleration is disabled");
|
|
||||||
direct3D = false;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
WEBRTC_TRACE(kTraceWarning, kTraceVideo, -1,
|
|
||||||
"Direct3D acceleration is enabled");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// Could not get the value for this one.
|
|
||||||
WEBRTC_TRACE(kTraceInfo, kTraceVideo, -1,
|
|
||||||
"Could not find SoftwarOnly key, Direct3D acceleration is probably enabled");
|
|
||||||
}
|
|
||||||
RegCloseKey(regKey);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
WEBRTC_TRACE(kTraceInfo, kTraceVideo, -1,
|
|
||||||
"Could not open Direct3D settings");
|
|
||||||
}
|
|
||||||
|
|
||||||
// DCI
|
|
||||||
if (RegOpenKeyEx(
|
|
||||||
HKEY_LOCAL_MACHINE,
|
|
||||||
_T(
|
|
||||||
"SYSTEM\\CurrentControlSet\\Control\\GraphicsDrivers\\DCI"),
|
|
||||||
0, KEY_QUERY_VALUE, ®Key) == ERROR_SUCCESS)
|
|
||||||
{
|
|
||||||
// We have found the registry key
|
|
||||||
value = 0;
|
|
||||||
if (RegQueryValueEx(regKey, _T("Timeout"), NULL, NULL, (BYTE*) &value,
|
|
||||||
&valueLength) == ERROR_SUCCESS)
|
|
||||||
{
|
|
||||||
if (value == 0)
|
|
||||||
{
|
|
||||||
WEBRTC_TRACE(kTraceWarning, kTraceVideo, -1,
|
|
||||||
"DCI - DirectDraw acceleration is disabled");
|
|
||||||
dci = false;
|
|
||||||
}
|
|
||||||
else if (value == 7)
|
|
||||||
{
|
|
||||||
WEBRTC_TRACE(kTraceWarning, kTraceVideo, -1,
|
|
||||||
"DCI is fully enabled");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
WEBRTC_TRACE(
|
|
||||||
kTraceWarning,
|
|
||||||
kTraceVideo,
|
|
||||||
-1,
|
|
||||||
"DCI - DirectDraw acceleration is enabled, but short timeout: %d",
|
|
||||||
value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// Could not get the value for this one.
|
|
||||||
WEBRTC_TRACE(kTraceInfo, kTraceVideo, -1,
|
|
||||||
"Could not find Timeout key");
|
|
||||||
}
|
|
||||||
RegCloseKey(regKey);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
WEBRTC_TRACE(kTraceInfo, kTraceVideo, -1,
|
|
||||||
"Could not open DCI settings");
|
|
||||||
}
|
|
||||||
|
|
||||||
// We don't care about Direct3D right now...
|
|
||||||
if (dci == false || directDraw == false)
|
|
||||||
{
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void VideoRenderWindowsImpl::CheckHWDriver(bool& badDriver,
|
|
||||||
bool& fullAccelerationEnabled)
|
|
||||||
{
|
|
||||||
// Read the registry to check if HW acceleration is enabled or not.
|
|
||||||
HKEY regKey;
|
|
||||||
DWORD value = 0;
|
|
||||||
|
|
||||||
//Assume the best
|
|
||||||
badDriver = false;
|
|
||||||
fullAccelerationEnabled = true;
|
|
||||||
|
|
||||||
// Check the path to the currently used driver
|
|
||||||
if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("HARDWARE\\DEVICEMAP\\VIDEO"), 0,
|
|
||||||
KEY_QUERY_VALUE, ®Key) == ERROR_SUCCESS)
|
|
||||||
{
|
|
||||||
// We have found the registry key containing the driver location
|
|
||||||
value = 0;
|
|
||||||
DWORD driverPathLen = 512;
|
|
||||||
TCHAR driverPath[512];
|
|
||||||
memset(driverPath, 0, driverPathLen * sizeof(TCHAR));
|
|
||||||
|
|
||||||
long retVal = RegQueryValueEx(regKey, _T("\\Device\\Video0"), NULL,
|
|
||||||
NULL, (BYTE*) driverPath, &driverPathLen);
|
|
||||||
|
|
||||||
// Close the key...
|
|
||||||
RegCloseKey(regKey);
|
|
||||||
|
|
||||||
if (retVal == ERROR_SUCCESS)
|
|
||||||
{
|
|
||||||
// We have the path to the currently used video card
|
|
||||||
|
|
||||||
// trueDriverPath = modified nameStr, from above, that works
|
|
||||||
// for RegOpenKeyEx
|
|
||||||
TCHAR trueDriverPath[512];
|
|
||||||
memset(trueDriverPath, 0, 512 * sizeof(TCHAR));
|
|
||||||
|
|
||||||
// Convert the path to correct format.
|
|
||||||
// - Remove \Registry\Machine\
|
|
||||||
// - Replace '\' with '\\'
|
|
||||||
// Should be something like this: System\\CurrentControlSet\\Control\\Video\\{F6987E15-F12C-4B15-8C84-0F635F3F09EA}\\0000"
|
|
||||||
int idx = 0;
|
|
||||||
for (DWORD i = 18; i < (driverPathLen / sizeof(TCHAR)); i++)
|
|
||||||
{
|
|
||||||
trueDriverPath[idx++] = driverPath[i];
|
|
||||||
if (driverPath[i] == _T('\\'))
|
|
||||||
{
|
|
||||||
trueDriverPath[idx++] = driverPath[i];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Open the driver key
|
|
||||||
if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, trueDriverPath, 0,
|
|
||||||
KEY_QUERY_VALUE, ®Key) == ERROR_SUCCESS)
|
|
||||||
{
|
|
||||||
TCHAR driverName[64];
|
|
||||||
memset(driverName, 0, 64 * sizeof(TCHAR));
|
|
||||||
DWORD driverNameLength = 64;
|
|
||||||
retVal = RegQueryValueEx(regKey, _T("drv"), NULL, NULL,
|
|
||||||
(BYTE*) driverName, &driverNameLength);
|
|
||||||
if (retVal == ERROR_SUCCESS)
|
|
||||||
{
|
|
||||||
WEBRTC_TRACE(kTraceInfo, kTraceVideo, -1,
|
|
||||||
"Graphics card driver name: %s", driverName);
|
|
||||||
}
|
|
||||||
DWORD accLevel = 0;
|
|
||||||
DWORD accLevelS = sizeof(accLevel);
|
|
||||||
|
|
||||||
RegQueryValueEx(regKey, _T("Acceleration.Level"), NULL, NULL,
|
|
||||||
(LPBYTE) & accLevel, &accLevelS);
|
|
||||||
//Don't care if the key is not found. It probably means that acceleration is enabled
|
|
||||||
if (accLevel != 0)
|
|
||||||
{
|
|
||||||
// Close the key...
|
|
||||||
RegCloseKey(regKey);
|
|
||||||
|
|
||||||
if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, trueDriverPath, 0,
|
|
||||||
KEY_SET_VALUE, ®Key) == ERROR_SUCCESS)
|
|
||||||
{
|
|
||||||
// try setting it to full
|
|
||||||
accLevel = 0;
|
|
||||||
LONG retVal;
|
|
||||||
retVal = RegSetValueEx(regKey,
|
|
||||||
_T("Acceleration.Level"), NULL,
|
|
||||||
REG_DWORD, (PBYTE) & accLevel,
|
|
||||||
sizeof(DWORD));
|
|
||||||
if (retVal != ERROR_SUCCESS)
|
|
||||||
{
|
|
||||||
fullAccelerationEnabled = false;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
RegQueryValueEx(regKey, _T("Acceleration.Level"),
|
|
||||||
NULL, NULL, (LPBYTE) & accLevel,
|
|
||||||
&accLevelS);
|
|
||||||
if (accLevel != 0)
|
|
||||||
{
|
|
||||||
fullAccelerationEnabled = false;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
fullAccelerationEnabled = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
fullAccelerationEnabled = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
fullAccelerationEnabled = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Close the key...
|
|
||||||
RegCloseKey(regKey);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
} //namespace webrtc
|
} //namespace webrtc
|
||||||
|
|
||||||
|
|||||||
@ -24,9 +24,8 @@ class CriticalSectionWrapper;
|
|||||||
|
|
||||||
#pragma comment(lib, "dxguid.lib")
|
#pragma comment(lib, "dxguid.lib")
|
||||||
|
|
||||||
enum VideoRenderWinMethod
|
enum VideoRenderWinMethod {
|
||||||
{
|
kVideoRenderWinD3D9 = 0,
|
||||||
kVideoRenderWinDd = 0, kVideoRenderWinD3D9 = 1
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// Class definitions
|
// Class definitions
|
||||||
@ -129,17 +128,7 @@ public:
|
|||||||
const float top, const float right,
|
const float top, const float right,
|
||||||
const float bottom);
|
const float bottom);
|
||||||
|
|
||||||
static int CheckHWAcceleration();
|
|
||||||
static void CheckHWDriver(bool& badDriver, bool& fullAccelerationEnabled);
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
void LogOSAndHardwareDetails();
|
|
||||||
HRESULT GetBoolValue(IDxDiagContainer* pObject, WCHAR* wstrName,
|
|
||||||
BOOL* pbValue);
|
|
||||||
HRESULT GetStringValue(IDxDiagContainer* pObject, WCHAR* wstrName,
|
|
||||||
TCHAR* strValue, int nStrLen);
|
|
||||||
|
|
||||||
WebRtc_Word32 _id;
|
WebRtc_Word32 _id;
|
||||||
CriticalSectionWrapper& _renderWindowsCritsect;
|
CriticalSectionWrapper& _renderWindowsCritsect;
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user