generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

VideoEngine core warnings remove.

Browse Source 
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:
mallinath@google.com 2011-08-08 17:57:54 +00:00
parent c0b63a3b66
commit 2cf5122efb
8 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/video_engine/main/source/vie_capturer.cc
View File

@ -40,7 +40,8 @@ ViECapturer::ViECapturer(int captureId,
: ViEFrameProviderBase(captureId, engineId),
_captureCritsect(*CriticalSectionWrapper::CreateCriticalSection()),
_deliverCritsect(*CriticalSectionWrapper::CreateCriticalSection()),
_captureModule(NULL), _useExternalModule(false),
_captureModule(NULL),
_useExternalModule(false),
_externalCaptureModule(NULL),
_moduleProcessThread(moduleProcessThread),
_captureId(captureId),
@ -48,17 +49,28 @@ ViECapturer::ViECapturer(int captureId,
this, kHighPriority,
"ViECaptureThread")),
_vieCaptureEvent(*EventWrapper::Create()),
_vieDeliverEvent(*EventWrapper::Create()), _capturedFrame(),
_vieDeliverEvent(*EventWrapper::Create()),
_capturedFrame(),
_deliverFrame(),
_encodedFrame(),
_effectFilter(NULL),
_imageProcModule(NULL),
_imageProcModuleRefCounter(0),
_deflickerFrameStats(NULL),
_brightnessFrameStats(NULL),
_currentBrightnessLevel(Normal),
_reportedBrightnessLevel(Normal),
_denoisingEnabled(false),
_observerCritsect(*CriticalSectionWrapper::CreateCriticalSection()),
_observer(NULL), _effectFilter(NULL), _imageProcModule(NULL),
_imageProcModuleRefCounter(0), _deflickerFrameStats(NULL),
_brightnessFrameStats(NULL), _currentBrightnessLevel(Normal),
_reportedBrightnessLevel(Normal), _denoisingEnabled(false),
_observer(NULL),
_encodingCritsect(*CriticalSectionWrapper::CreateCriticalSection()),
_captureEncoder(NULL), _encodeCompleteCallback(NULL),
_vieEncoder(NULL), _vcm(NULL), _decodeBuffer(),
_decoderInitialized(false), _requestedCapability()
_captureEncoder(NULL),
_encodeCompleteCallback(NULL),
_vieEncoder(NULL),
_vcm(NULL),
_decodeBuffer(),
_decoderInitialized(false),
_requestedCapability()
{
WEBRTC_TRACE(webrtc::kTraceMemory, webrtc::kTraceVideo, ViEId(engineId, captureId),
"ViECapturer::ViECapturer(captureId: %d, engineId: %d) - "

4
src/video_engine/main/source/vie_channel.cc
View File

@ -1304,7 +1304,7 @@ WebRtc_Word32 ViEChannel::StartRTPDump(const char fileNameUTF8[1024],
__FUNCTION__);
return -1;
}
RtpDump* rtpDump = NULL;
if (direction == kRtpIncoming)
{
return _vieReceiver.StartRTPDump(fileNameUTF8);
@ -1331,7 +1331,7 @@ WebRtc_Word32 ViEChannel::StopRTPDump(RTPDirections direction)
__FUNCTION__);
return -1;
}
RtpDump* rtpDump = NULL;
if (direction == kRtpIncoming)
{
return _vieReceiver.StopRTPDump();

1
src/video_engine/main/source/vie_channel_manager.cc
View File

@ -480,7 +480,6 @@ bool ViEChannelManager::ChannelUsingViEEncoder(int channelId) const
MapItem* mapItem = _vieEncoderMap.First();
while (mapItem)
{
ViEEncoder* vieEncoder = static_cast<ViEEncoder*> (mapItem->GetItem());
if (mapItem->GetId() != channelId)
{
if (channelEncoder == static_cast<ViEEncoder*> (mapItem->GetItem()))

3
src/video_engine/main/source/vie_file_player.cc
View File

@ -255,8 +255,6 @@ bool ViEFilePlayer::FilePlayDecodeProcess()
int ViEFilePlayer::StopPlay() //Only called from destructor.
{
bool threadStoped = false;
if (_ptrDecodeThread)
{
_ptrDecodeThread->SetNotAlive();
@ -533,7 +531,6 @@ int ViEFilePlayer::GetFileInformation(int engineId, const char* fileName,
{
return -1;
}
int result = 0;
bool videoOnly = false;

4
src/video_engine/main/source/vie_frame_provider_base.cc
View File

@ -126,8 +126,8 @@ int ViEFrameProviderBase::FrameDelay()
}
int ViEFrameProviderBase::GetBestFormat(int& bestWidth,
int& bestHeight,
int& bestFrameRate)
int& bestHeight,
int& bestFrameRate)
{
int largestWidth = 0;

4
src/video_engine/main/source/vie_frame_provider_base.h
View File

@ -78,7 +78,9 @@ protected:
const WebRtc_UWord32 CSRC[kRtpCsrcSize] = NULL);
void SetFrameDelay(int frameDelay);
int FrameDelay();
int GetBestFormat(int& bestWidth, int& bestHeight, int& bestFrameRate);
int GetBestFormat(int& bestWidth,
int& bestHeight,
int& bestFrameRate);
int _id;
int _engineId;

7
src/video_engine/main/source/vie_input_manager.cc
View File

@ -42,8 +42,11 @@ namespace webrtc {
ViEInputManager::ViEInputManager(const int engineId)
: _engineId(engineId),
_mapCritsect(*CriticalSectionWrapper::CreateCriticalSection()),
_ptrCaptureDeviceInfo(NULL), _vieFrameProviderMap(),
_freeCaptureDeviceId(), _moduleProcessThread(NULL)
_vieFrameProviderMap(),
_ptrCaptureDeviceInfo(NULL),
_freeCaptureDeviceId(),
_freeFileId(),
_moduleProcessThread(NULL)
{
WEBRTC_TRACE(webrtc::kTraceMemory, webrtc::kTraceVideo, ViEId(_engineId), "%s",
__FUNCTION__);

8
src/video_engine/main/source/vie_shared_data.cc
View File

@ -29,13 +29,15 @@ int ViESharedData::_instanceCounter = 0;
ViESharedData::ViESharedData()
: _instanceId(++_instanceCounter),
_apiCritsect(*CriticalSectionWrapper::CreateCriticalSection()),
_isInitialized(false), _numberOfCores(CpuWrapper::DetectNumberOfCores()),
_moduleProcessThreadPtr(ProcessThread::CreateProcessThread()),
_isInitialized(false),
_numberOfCores(CpuWrapper::DetectNumberOfCores()),
_viePerformanceMonitor(ViEPerformanceMonitor(_instanceId)),
_channelManager(*new ViEChannelManager(_instanceId, _numberOfCores,
_viePerformanceMonitor)),
_inputManager(*new ViEInputManager(_instanceId)),
_renderManager(*new ViERenderManager(_instanceId)), _lastError(0)
_renderManager(*new ViERenderManager(_instanceId)),
_moduleProcessThreadPtr(ProcessThread::CreateProcessThread()),
_lastError(0)
{
Trace::CreateTrace();
_channelManager.SetModuleProcessThread(*_moduleProcessThreadPtr);