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

Use the correct include file.

Browse Source 
There shouldn't be a dependency on spatial_resampler.h, defines
that were needed are in video_processing_defines.h.
Review URL: http://webrtc-codereview.appspot.com/117003

git-svn-id: http://webrtc.googlecode.com/svn/trunk@393 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
frkoenig@google.com 2011-08-17 22:23:28 +00:00
parent ca758c268e
commit 31f24de5e3
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,8 +17,7 @@
#include "typedefs.h" #include "typedefs.h"
#include "module_common_types.h" #include "module_common_types.h"
#include "video_processing_defines.h"
#include "spatial_resampler.h"
namespace webrtc { namespace webrtc {
@ -50,7 +49,9 @@ private:
VideoContentMetrics* ContentMetrics(); VideoContentMetrics* ContentMetrics();
// Normalized temporal difference metric: for motion magnitude // Normalized temporal difference metric: for motion magnitude
WebRtc_Word32 TemporalDiffMetric(); typedef WebRtc_Word32 (VPMContentAnalysis::*TemporalDiffMetricFunc)();
TemporalDiffMetricFunc TemporalDiffMetric;
WebRtc_Word32 TemporalDiffMetric_C();
// Motion metric method: call 2 metrics (magnitude and size) // Motion metric method: call 2 metrics (magnitude and size)
WebRtc_Word32 ComputeMotionMetrics(); WebRtc_Word32 ComputeMotionMetrics();
@ -60,15 +61,18 @@ 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(WEBRTC_USE_SSE2) #if defined(WEBRTC_USE_SSE2)
WebRtc_Word32 ComputeSpatialMetrics_SSE2(); WebRtc_Word32 ComputeSpatialMetrics_SSE2();
WebRtc_Word32 TemporalDiffMetric_SSE2();
#endif #endif
const WebRtc_UWord8* _origFrame; const WebRtc_UWord8* _origFrame;
WebRtc_UWord8* _prevFrame; WebRtc_UWord8* _prevFrame;
WebRtc_UWord16 _width; WebRtc_UWord16 _width;
WebRtc_UWord16 _height; WebRtc_UWord16 _height;
WebRtc_UWord32 _skipNum; WebRtc_UWord32 _skipNum;
WebRtc_Word32 _border;
// Content Metrics: // Content Metrics:
// stores the local average of the metrics // stores the local average of the metrics