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

When WEBRTC_VIDEO_ENGINE_FILE_API is not defined, disable the code in vie_file_impl.cc and vie_file_image.cc so that we can remove the libjpeg dependency. Also disable the auto test for the vie file api.

Browse Source 
Review URL: http://webrtc-codereview.appspot.com/227001

git-svn-id: http://webrtc.googlecode.com/svn/trunk@739 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
wu@webrtc.org 2011-10-13 17:56:38 +00:00
parent 5a3e20f678
commit 4ee906d297
4 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/video_engine/main/source/video_engine_core.gypi
View File

@ -36,6 +36,7 @@
],
'include_dirs': [
'../interface',
'../../../common_video/interface',
'../../../modules/video_capture/main/interface',
'../../../modules/video_render/main/interface',
],

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

@ -12,6 +12,9 @@
* vie_file_image.cc
*/
#include "engine_configurations.h"
#ifdef WEBRTC_VIDEO_ENGINE_FILE_API
#include <stdio.h>
#include "vie_file_image.h"
#include "video_image.h"
@ -111,3 +114,4 @@ int ViEFileImage::ConvertPictureToVideoFrame(int engineId,
return 0;
}
} // namespace webrtc
#endif // WEBRTC_VIDEO_ENGINE_FILE_API

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

@ -14,6 +14,7 @@
#include "vie_file_impl.h"
#ifdef WEBRTC_VIDEO_ENGINE_FILE_API
// Defines
#include "vie_defines.h"
@ -33,6 +34,7 @@
#include "vie_impl.h"
#include "vie_input_manager.h"
#include "vie_render_manager.h"
#endif
namespace webrtc
{
@ -58,6 +60,7 @@ ViEFile* ViEFile::GetInterface(VideoEngine* videoEngine)
#endif
}
#ifdef WEBRTC_VIDEO_ENGINE_FILE_API
// ----------------------------------------------------------------------------
// Release
//
@ -1311,4 +1314,5 @@ void ViECaptureSnapshot::DeliverFrame(int id, VideoFrame& videoFrame,
_conditionVaraible.WakeAll();
return;
}
#endif
} // namespace webrtc

2
src/video_engine/main/test/AutoTest/source/vie_autotest_file.cc
View File

@ -39,6 +39,7 @@ int ViEAutoTest::ViEFileStandardTest()
ViETest::Log("========================================");
ViETest::Log(" ViEFile Standard Test\n");
#ifdef WEBRTC_VIDEO_ENGINE_FILE_API
//***************************************************************
// Begin create/initialize WebRTC Video Engine for testing
//***************************************************************
@ -809,6 +810,7 @@ int ViEAutoTest::ViEFileStandardTest()
ViETest::Log(" ");
return numberOfErrors;
}
#endif
ViETest::Log(" ");
ViETest::Log(" ViEFile Standard Test PASSED!");