From 718927064012b73b241adf55483feb087ad42ab7 Mon Sep 17 00:00:00 2001 From: "leozwang@google.com" Date: Tue, 16 Aug 2011 16:37:45 +0000 Subject: [PATCH] Fix compliation error Review URL: http://webrtc-codereview.appspot.com/114003 git-svn-id: http://webrtc.googlecode.com/svn/trunk@379 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../video_processing/main/source/content_analysis.cc | 8 +++++--- .../video_processing/main/source/content_analysis.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/modules/video_processing/main/source/content_analysis.cc b/src/modules/video_processing/main/source/content_analysis.cc index a75899537d..f203211938 100644 --- a/src/modules/video_processing/main/source/content_analysis.cc +++ b/src/modules/video_processing/main/source/content_analysis.cc @@ -13,7 +13,9 @@ #include #include +#if defined(WEBRTC_USE_SSE2) #include +#endif namespace webrtc { VPMContentAnalysis::VPMContentAnalysis(bool RTCD): @@ -40,7 +42,7 @@ _cMetrics(NULL) { if(WebRtc_GetCPUInfo(kSSE2)) { -#if defined(__SSE2__) +#if defined(WEBRTC_USE_SSE2) ComputeSpatialMetrics = &VPMContentAnalysis::ComputeSpatialMetrics_SSE2; #endif @@ -343,7 +345,7 @@ VPMContentAnalysis::ComputeSpatialMetrics_C() return VPM_OK; } -#if defined(__SSE2__) +#if defined(WEBRTC_USE_SSE2) WebRtc_Word32 VPMContentAnalysis::ComputeSpatialMetrics_SSE2() { @@ -510,7 +512,7 @@ VPMContentAnalysis::ComputeSpatialMetrics_SSE2() return VPM_OK; } -#endif +#endif // #if defined(WEBRTC_USE_SSE2) VideoContentMetrics* VPMContentAnalysis::ContentMetrics() diff --git a/src/modules/video_processing/main/source/content_analysis.h b/src/modules/video_processing/main/source/content_analysis.h index 5a12375f01..4aa5783e64 100644 --- a/src/modules/video_processing/main/source/content_analysis.h +++ b/src/modules/video_processing/main/source/content_analysis.h @@ -60,7 +60,7 @@ private: typedef WebRtc_Word32 (VPMContentAnalysis::*ComputeSpatialMetricsFunc)(); ComputeSpatialMetricsFunc ComputeSpatialMetrics; WebRtc_Word32 ComputeSpatialMetrics_C(); -#if defined(__SSE2__) +#if defined(WEBRTC_USE_SSE2) WebRtc_Word32 ComputeSpatialMetrics_SSE2(); #endif