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

Fix compliation error

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@379 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
leozwang@google.com 2011-08-16 16:37:45 +00:00
parent 17a018716c
commit 7189270640
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/video_processing/main/source/content_analysis.cc
View File

@ -13,7 +13,9 @@
#include <math.h> #include <math.h>
#include <stdlib.h> #include <stdlib.h>
#if defined(WEBRTC_USE_SSE2)
#include <xmmintrin.h> #include <xmmintrin.h>
#endif
namespace webrtc { namespace webrtc {
VPMContentAnalysis::VPMContentAnalysis(bool RTCD): VPMContentAnalysis::VPMContentAnalysis(bool RTCD):
@ -40,7 +42,7 @@ _cMetrics(NULL)
{ {
if(WebRtc_GetCPUInfo(kSSE2)) if(WebRtc_GetCPUInfo(kSSE2))
{ {
#if defined(__SSE2__) #if defined(WEBRTC_USE_SSE2)
ComputeSpatialMetrics = ComputeSpatialMetrics =
&VPMContentAnalysis::ComputeSpatialMetrics_SSE2; &VPMContentAnalysis::ComputeSpatialMetrics_SSE2;
#endif #endif
@ -343,7 +345,7 @@ VPMContentAnalysis::ComputeSpatialMetrics_C()
return VPM_OK; return VPM_OK;
} }
#if defined(__SSE2__) #if defined(WEBRTC_USE_SSE2)
WebRtc_Word32 WebRtc_Word32
VPMContentAnalysis::ComputeSpatialMetrics_SSE2() VPMContentAnalysis::ComputeSpatialMetrics_SSE2()
{ {
@ -510,7 +512,7 @@ VPMContentAnalysis::ComputeSpatialMetrics_SSE2()
return VPM_OK; return VPM_OK;
} }
#endif #endif // #if defined(WEBRTC_USE_SSE2)
VideoContentMetrics* VideoContentMetrics*
VPMContentAnalysis::ContentMetrics() VPMContentAnalysis::ContentMetrics()

2
src/modules/video_processing/main/source/content_analysis.h
View File

@ -60,7 +60,7 @@ private:
typedef WebRtc_Word32 (VPMContentAnalysis::*ComputeSpatialMetricsFunc)(); typedef WebRtc_Word32 (VPMContentAnalysis::*ComputeSpatialMetricsFunc)();
ComputeSpatialMetricsFunc ComputeSpatialMetrics; ComputeSpatialMetricsFunc ComputeSpatialMetrics;
WebRtc_Word32 ComputeSpatialMetrics_C(); WebRtc_Word32 ComputeSpatialMetrics_C();
#if defined(__SSE2__) #if defined(WEBRTC_USE_SSE2)
WebRtc_Word32 ComputeSpatialMetrics_SSE2(); WebRtc_Word32 ComputeSpatialMetrics_SSE2();
#endif #endif