VideoEngine core warnings remove.
changes to VideoCaptureCapability is part of different CL. Review URL: http://webrtc-codereview.appspot.com/98002 git-svn-id: http://webrtc.googlecode.com/svn/trunk@329 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
parent
c0b63a3b66
commit
2cf5122efb
@ -40,7 +40,8 @@ ViECapturer::ViECapturer(int captureId,
|
|||||||
: ViEFrameProviderBase(captureId, engineId),
|
: ViEFrameProviderBase(captureId, engineId),
|
||||||
_captureCritsect(*CriticalSectionWrapper::CreateCriticalSection()),
|
_captureCritsect(*CriticalSectionWrapper::CreateCriticalSection()),
|
||||||
_deliverCritsect(*CriticalSectionWrapper::CreateCriticalSection()),
|
_deliverCritsect(*CriticalSectionWrapper::CreateCriticalSection()),
|
||||||
_captureModule(NULL), _useExternalModule(false),
|
_captureModule(NULL),
|
||||||
|
_useExternalModule(false),
|
||||||
_externalCaptureModule(NULL),
|
_externalCaptureModule(NULL),
|
||||||
_moduleProcessThread(moduleProcessThread),
|
_moduleProcessThread(moduleProcessThread),
|
||||||
_captureId(captureId),
|
_captureId(captureId),
|
||||||
@ -48,17 +49,28 @@ ViECapturer::ViECapturer(int captureId,
|
|||||||
this, kHighPriority,
|
this, kHighPriority,
|
||||||
"ViECaptureThread")),
|
"ViECaptureThread")),
|
||||||
_vieCaptureEvent(*EventWrapper::Create()),
|
_vieCaptureEvent(*EventWrapper::Create()),
|
||||||
_vieDeliverEvent(*EventWrapper::Create()), _capturedFrame(),
|
_vieDeliverEvent(*EventWrapper::Create()),
|
||||||
|
_capturedFrame(),
|
||||||
_deliverFrame(),
|
_deliverFrame(),
|
||||||
|
_encodedFrame(),
|
||||||
|
_effectFilter(NULL),
|
||||||
|
_imageProcModule(NULL),
|
||||||
|
_imageProcModuleRefCounter(0),
|
||||||
|
_deflickerFrameStats(NULL),
|
||||||
|
_brightnessFrameStats(NULL),
|
||||||
|
_currentBrightnessLevel(Normal),
|
||||||
|
_reportedBrightnessLevel(Normal),
|
||||||
|
_denoisingEnabled(false),
|
||||||
_observerCritsect(*CriticalSectionWrapper::CreateCriticalSection()),
|
_observerCritsect(*CriticalSectionWrapper::CreateCriticalSection()),
|
||||||
_observer(NULL), _effectFilter(NULL), _imageProcModule(NULL),
|
_observer(NULL),
|
||||||
_imageProcModuleRefCounter(0), _deflickerFrameStats(NULL),
|
|
||||||
_brightnessFrameStats(NULL), _currentBrightnessLevel(Normal),
|
|
||||||
_reportedBrightnessLevel(Normal), _denoisingEnabled(false),
|
|
||||||
_encodingCritsect(*CriticalSectionWrapper::CreateCriticalSection()),
|
_encodingCritsect(*CriticalSectionWrapper::CreateCriticalSection()),
|
||||||
_captureEncoder(NULL), _encodeCompleteCallback(NULL),
|
_captureEncoder(NULL),
|
||||||
_vieEncoder(NULL), _vcm(NULL), _decodeBuffer(),
|
_encodeCompleteCallback(NULL),
|
||||||
_decoderInitialized(false), _requestedCapability()
|
_vieEncoder(NULL),
|
||||||
|
_vcm(NULL),
|
||||||
|
_decodeBuffer(),
|
||||||
|
_decoderInitialized(false),
|
||||||
|
_requestedCapability()
|
||||||
{
|
{
|
||||||
WEBRTC_TRACE(webrtc::kTraceMemory, webrtc::kTraceVideo, ViEId(engineId, captureId),
|
WEBRTC_TRACE(webrtc::kTraceMemory, webrtc::kTraceVideo, ViEId(engineId, captureId),
|
||||||
"ViECapturer::ViECapturer(captureId: %d, engineId: %d) - "
|
"ViECapturer::ViECapturer(captureId: %d, engineId: %d) - "
|
||||||
|
@ -1304,7 +1304,7 @@ WebRtc_Word32 ViEChannel::StartRTPDump(const char fileNameUTF8[1024],
|
|||||||
__FUNCTION__);
|
__FUNCTION__);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
RtpDump* rtpDump = NULL;
|
|
||||||
if (direction == kRtpIncoming)
|
if (direction == kRtpIncoming)
|
||||||
{
|
{
|
||||||
return _vieReceiver.StartRTPDump(fileNameUTF8);
|
return _vieReceiver.StartRTPDump(fileNameUTF8);
|
||||||
@ -1331,7 +1331,7 @@ WebRtc_Word32 ViEChannel::StopRTPDump(RTPDirections direction)
|
|||||||
__FUNCTION__);
|
__FUNCTION__);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
RtpDump* rtpDump = NULL;
|
|
||||||
if (direction == kRtpIncoming)
|
if (direction == kRtpIncoming)
|
||||||
{
|
{
|
||||||
return _vieReceiver.StopRTPDump();
|
return _vieReceiver.StopRTPDump();
|
||||||
|
@ -480,7 +480,6 @@ bool ViEChannelManager::ChannelUsingViEEncoder(int channelId) const
|
|||||||
MapItem* mapItem = _vieEncoderMap.First();
|
MapItem* mapItem = _vieEncoderMap.First();
|
||||||
while (mapItem)
|
while (mapItem)
|
||||||
{
|
{
|
||||||
ViEEncoder* vieEncoder = static_cast<ViEEncoder*> (mapItem->GetItem());
|
|
||||||
if (mapItem->GetId() != channelId)
|
if (mapItem->GetId() != channelId)
|
||||||
{
|
{
|
||||||
if (channelEncoder == static_cast<ViEEncoder*> (mapItem->GetItem()))
|
if (channelEncoder == static_cast<ViEEncoder*> (mapItem->GetItem()))
|
||||||
|
@ -255,8 +255,6 @@ bool ViEFilePlayer::FilePlayDecodeProcess()
|
|||||||
|
|
||||||
int ViEFilePlayer::StopPlay() //Only called from destructor.
|
int ViEFilePlayer::StopPlay() //Only called from destructor.
|
||||||
{
|
{
|
||||||
|
|
||||||
bool threadStoped = false;
|
|
||||||
if (_ptrDecodeThread)
|
if (_ptrDecodeThread)
|
||||||
{
|
{
|
||||||
_ptrDecodeThread->SetNotAlive();
|
_ptrDecodeThread->SetNotAlive();
|
||||||
@ -533,7 +531,6 @@ int ViEFilePlayer::GetFileInformation(int engineId, const char* fileName,
|
|||||||
{
|
{
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
int result = 0;
|
|
||||||
|
|
||||||
bool videoOnly = false;
|
bool videoOnly = false;
|
||||||
|
|
||||||
|
@ -78,7 +78,9 @@ protected:
|
|||||||
const WebRtc_UWord32 CSRC[kRtpCsrcSize] = NULL);
|
const WebRtc_UWord32 CSRC[kRtpCsrcSize] = NULL);
|
||||||
void SetFrameDelay(int frameDelay);
|
void SetFrameDelay(int frameDelay);
|
||||||
int FrameDelay();
|
int FrameDelay();
|
||||||
int GetBestFormat(int& bestWidth, int& bestHeight, int& bestFrameRate);
|
int GetBestFormat(int& bestWidth,
|
||||||
|
int& bestHeight,
|
||||||
|
int& bestFrameRate);
|
||||||
|
|
||||||
int _id;
|
int _id;
|
||||||
int _engineId;
|
int _engineId;
|
||||||
|
@ -42,8 +42,11 @@ namespace webrtc {
|
|||||||
ViEInputManager::ViEInputManager(const int engineId)
|
ViEInputManager::ViEInputManager(const int engineId)
|
||||||
: _engineId(engineId),
|
: _engineId(engineId),
|
||||||
_mapCritsect(*CriticalSectionWrapper::CreateCriticalSection()),
|
_mapCritsect(*CriticalSectionWrapper::CreateCriticalSection()),
|
||||||
_ptrCaptureDeviceInfo(NULL), _vieFrameProviderMap(),
|
_vieFrameProviderMap(),
|
||||||
_freeCaptureDeviceId(), _moduleProcessThread(NULL)
|
_ptrCaptureDeviceInfo(NULL),
|
||||||
|
_freeCaptureDeviceId(),
|
||||||
|
_freeFileId(),
|
||||||
|
_moduleProcessThread(NULL)
|
||||||
{
|
{
|
||||||
WEBRTC_TRACE(webrtc::kTraceMemory, webrtc::kTraceVideo, ViEId(_engineId), "%s",
|
WEBRTC_TRACE(webrtc::kTraceMemory, webrtc::kTraceVideo, ViEId(_engineId), "%s",
|
||||||
__FUNCTION__);
|
__FUNCTION__);
|
||||||
|
@ -29,13 +29,15 @@ int ViESharedData::_instanceCounter = 0;
|
|||||||
ViESharedData::ViESharedData()
|
ViESharedData::ViESharedData()
|
||||||
: _instanceId(++_instanceCounter),
|
: _instanceId(++_instanceCounter),
|
||||||
_apiCritsect(*CriticalSectionWrapper::CreateCriticalSection()),
|
_apiCritsect(*CriticalSectionWrapper::CreateCriticalSection()),
|
||||||
_isInitialized(false), _numberOfCores(CpuWrapper::DetectNumberOfCores()),
|
_isInitialized(false),
|
||||||
_moduleProcessThreadPtr(ProcessThread::CreateProcessThread()),
|
_numberOfCores(CpuWrapper::DetectNumberOfCores()),
|
||||||
_viePerformanceMonitor(ViEPerformanceMonitor(_instanceId)),
|
_viePerformanceMonitor(ViEPerformanceMonitor(_instanceId)),
|
||||||
_channelManager(*new ViEChannelManager(_instanceId, _numberOfCores,
|
_channelManager(*new ViEChannelManager(_instanceId, _numberOfCores,
|
||||||
_viePerformanceMonitor)),
|
_viePerformanceMonitor)),
|
||||||
_inputManager(*new ViEInputManager(_instanceId)),
|
_inputManager(*new ViEInputManager(_instanceId)),
|
||||||
_renderManager(*new ViERenderManager(_instanceId)), _lastError(0)
|
_renderManager(*new ViERenderManager(_instanceId)),
|
||||||
|
_moduleProcessThreadPtr(ProcessThread::CreateProcessThread()),
|
||||||
|
_lastError(0)
|
||||||
{
|
{
|
||||||
Trace::CreateTrace();
|
Trace::CreateTrace();
|
||||||
_channelManager.SetModuleProcessThread(*_moduleProcessThreadPtr);
|
_channelManager.SetModuleProcessThread(*_moduleProcessThreadPtr);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user