commit 4ee906d2976547d80eb22fe4ea2d26ea75ab2814
author wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Oct 13 17:56:38 2011 +0000
committer wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Oct 13 17:56:38 2011 +0000
tree 3f9f277d53b74ab9d0d64a29123ec696546f9275
parent 5a3e20f678ac73e93a739fe2509fab8a37671508

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.
Review URL: http://webrtc-codereview.appspot.com/227001

git-svn-id: http://webrtc.googlecode.com/svn/trunk@739 4adac7df-926f-26a2-2b94-8c16560cd09d

src/video_engine/main/source/video_engine_core.gypi

diff --git a/src/video_engine/main/source/video_engine_core.gypi b/src/video_engine/main/source/video_engine_core.gypi
index 901e752..dc7253e 100644
--- a/src/video_engine/main/source/video_engine_core.gypi
+++ b/src/video_engine/main/source/video_engine_core.gypi
@@ -36,6 +36,7 @@
       ],
       'include_dirs': [
         '../interface',
+        '../../../common_video/interface',
         '../../../modules/video_capture/main/interface',
         '../../../modules/video_render/main/interface',
       ],

src/video_engine/main/source/vie_file_image.cc

diff --git a/src/video_engine/main/source/vie_file_image.cc b/src/video_engine/main/source/vie_file_image.cc
index 7799f12..2500fc5 100644
--- a/src/video_engine/main/source/vie_file_image.cc
+++ b/src/video_engine/main/source/vie_file_image.cc
@@ -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 @@
     return 0;
 }
 } // namespace webrtc
+#endif  // WEBRTC_VIDEO_ENGINE_FILE_API

src/video_engine/main/source/vie_file_impl.cc

diff --git a/src/video_engine/main/source/vie_file_impl.cc b/src/video_engine/main/source/vie_file_impl.cc
index fec8d91..a3c1fa0 100644
--- a/src/video_engine/main/source/vie_file_impl.cc
+++ b/src/video_engine/main/source/vie_file_impl.cc
@@ -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 @@
 #endif
 }
 
+#ifdef WEBRTC_VIDEO_ENGINE_FILE_API
 // ----------------------------------------------------------------------------
 // Release
 //
@@ -1311,4 +1314,5 @@
     _conditionVaraible.WakeAll();
     return;
 }
+#endif
 } // namespace webrtc

src/video_engine/main/test/AutoTest/source/vie_autotest_file.cc

diff --git a/src/video_engine/main/test/AutoTest/source/vie_autotest_file.cc b/src/video_engine/main/test/AutoTest/source/vie_autotest_file.cc
index b95926d..2b9137d 100644
--- a/src/video_engine/main/test/AutoTest/source/vie_autotest_file.cc
+++ b/src/video_engine/main/test/AutoTest/source/vie_autotest_file.cc
@@ -39,6 +39,7 @@
     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 @@
         ViETest::Log(" ");
         return numberOfErrors;
     }
+#endif
 
     ViETest::Log(" ");
     ViETest::Log(" ViEFile Standard Test PASSED!");