History

Remove typedefs for float_t and double_t

The actual float and double data types are defined in C89 and are usable as such without any extra typedefs. Removing the extra typedefs simplifies the compatibility typedef headers, simplifies portability and makes the code base easier to work with for people new to the library.

Martin Storsjö committed 12 years ago

Commit d36b10f1 parent ba6bf7d4 files · +15 −20Browse files

Showing the changes to codec/processing/src (4 of 4 files). Show all

Unified · Split

4 files
  1. codec/processing/src/adaptivequantization/AdaptiveQuantization.cpp +6 −6
  2. codec/processing/src/common/typedef.h +0 −5
  3. codec/processing/src/denoise/denoise.h +1 −1
  4. codec/processing/src/downsample/downsamplefuncs.cpp +8 −8
codec/processing/src/adaptivequantization/AdaptiveQuantization.cpp+6−6
@@ -69,12 +69,12 @@ EResult CAdaptiveQuantization::Process (int32_t iType, SPixMap* pSrcPixMap, SPix · 68 unmodified lines
69 SVAACalcResult* pVaaCalcResults = NULL;69 SVAACalcResult* pVaaCalcResults = NULL;
70 int8_t iMotionTextureIndexToDeltaQp = 0;70 int8_t iMotionTextureIndexToDeltaQp = 0;
71 int32_t iAverMotionTextureIndexToDeltaQp = 0; // double to uint3271 int32_t iAverMotionTextureIndexToDeltaQp = 0; // double to uint32
72 double_t dAverageMotionIndex = 0.0; // double to float72 double dAverageMotionIndex = 0.0; // double to float
73 double_t dAverageTextureIndex = 0.0;73 double dAverageTextureIndex = 0.0;
74 74
75 double_t dQStep = 0.0;75 double dQStep = 0.0;
76 double_t dLumaMotionDeltaQp = 0;76 double dLumaMotionDeltaQp = 0;
77 double_t dLumaTextureDeltaQp = 0;77 double dLumaTextureDeltaQp = 0;
78 78
79 uint8_t* pRefFrameY = NULL, *pCurFrameY = NULL;79 uint8_t* pRefFrameY = NULL, *pCurFrameY = NULL;
80 int32_t iRefStride = 0, iCurStride = 0;80 int32_t iRefStride = 0, iCurStride = 0;
@@ -170,7 +170,7 @@ EResult CAdaptiveQuantization::Process (int32_t iType, SPixMap* pSrcPixMap, SPix · 89 unmodified lines
170 pMotionTexture = m_sAdaptiveQuantParam.pMotionTextureUnit;170 pMotionTexture = m_sAdaptiveQuantParam.pMotionTextureUnit;
171 for (j = 0; j < iMbHeight; j ++) {171 for (j = 0; j < iMbHeight; j ++) {
172 for (i = 0; i < iMbWidth; i++) {172 for (i = 0; i < iMbWidth; i++) {
173 double_t a = pMotionTexture->uiTextureIndex / dAverageTextureIndex;173 double a = pMotionTexture->uiTextureIndex / dAverageTextureIndex;
174 dQStep = (a - 1) / (a + MODEL_ALPHA);174 dQStep = (a - 1) / (a + MODEL_ALPHA);
175 dLumaTextureDeltaQp = MODEL_TIME * dQStep;// range +- 6175 dLumaTextureDeltaQp = MODEL_TIME * dQStep;// range +- 6
176 176
codec/processing/src/common/typedef.h+0−5
@@ -76,11 +76,6 @@ typedef unsigned __int64 uint64_t ; · 75 unmodified lines
76typedef char str_t ; // [comment]: specific use plain char only for character parameters76typedef char str_t ; // [comment]: specific use plain char only for character parameters
77typedef bool bool_t ;77typedef bool bool_t ;
78 78
79#if defined(_WIN32) || defined(_MACH_PLATFORM) || defined(__GNUC__)
80typedef float float_t ;
81typedef double double_t ;
82#endif
83
84enum {79enum {
85 FALSE = 0,80 FALSE = 0,
86 TRUE = !FALSE81 TRUE = !FALSE
codec/processing/src/denoise/denoise.h+1−1
@@ -96,7 +96,7 @@ class CDenoiser : public IStrategy { · 95 unmodified lines
96 void WaverageDenoiseChroma (uint8_t* pSrcUV, int32_t width, int32_t height, int32_t stride);96 void WaverageDenoiseChroma (uint8_t* pSrcUV, int32_t width, int32_t height, int32_t stride);
97 97
98 private:98 private:
99 float_t m_fSigmaGrey; //sigma for grey scale similarity, suggestion 2.5-399 float m_fSigmaGrey; //sigma for grey scale similarity, suggestion 2.5-3
100 uint32_t m_uiFilterWindow; //filter window diameter100 uint32_t m_uiFilterWindow; //filter window diameter
101 uint16_t m_uiSpaceRadius; //filter windows radius: 1-3x3, 2-5x5,3-7x7. Larger size, slower speed101 uint16_t m_uiSpaceRadius; //filter windows radius: 1-3x3, 2-5x5,3-7x7. Larger size, slower speed
102 uint16_t m_uiType; //do denoising on which component 1-Y, 2-U, 4-V; 7-YUV, 3-YU, 5-YV, 6-UV102 uint16_t m_uiType; //do denoising on which component 1-Y, 2-U, 4-V; 7-YUV, 3-YU, 5-YV, 6-UV
codec/processing/src/downsample/downsamplefuncs.cpp+8−8
@@ -73,8 +73,8 @@ void GeneralBilinearFastDownsampler_c (uint8_t* pDst, const int32_t kiDstStride, · 72 unmodified lines
73 uint8_t* pSrc, const int32_t kiSrcStride, const int32_t kiSrcWidth, const int32_t kiSrcHeight) {73 uint8_t* pSrc, const int32_t kiSrcStride, const int32_t kiSrcWidth, const int32_t kiSrcHeight) {
74 const uint32_t kuiScaleBitWidth = 16, kuiScaleBitHeight = 15;74 const uint32_t kuiScaleBitWidth = 16, kuiScaleBitHeight = 15;
75 const uint32_t kuiScaleWidth = (1 << kuiScaleBitWidth), kuiScaleHeight = (1 << kuiScaleBitHeight);75 const uint32_t kuiScaleWidth = (1 << kuiScaleBitWidth), kuiScaleHeight = (1 << kuiScaleBitHeight);
76 int32_t fScalex = (int32_t) ((float_t)kiSrcWidth / (float_t)kiDstWidth * kuiScaleWidth);76 int32_t fScalex = (int32_t) ((float)kiSrcWidth / (float)kiDstWidth * kuiScaleWidth);
77 int32_t fScaley = (int32_t) ((float_t)kiSrcHeight / (float_t)kiDstHeight * kuiScaleHeight);77 int32_t fScaley = (int32_t) ((float)kiSrcHeight / (float)kiDstHeight * kuiScaleHeight);
78 uint32_t x;78 uint32_t x;
79 int32_t iYInverse, iXInverse;79 int32_t iYInverse, iXInverse;
80 80
@@ -142,8 +142,8 @@ void GeneralBilinearAccurateDownsampler_c (uint8_t* pDst, const int32_t kiDstStr · 61 unmodified lines
142 uint8_t* pSrc, const int32_t kiSrcStride, const int32_t kiSrcWidth, const int32_t kiSrcHeight) {142 uint8_t* pSrc, const int32_t kiSrcStride, const int32_t kiSrcWidth, const int32_t kiSrcHeight) {
143 const int32_t kiScaleBit = 15;143 const int32_t kiScaleBit = 15;
144 const int32_t kiScale = (1 << kiScaleBit);144 const int32_t kiScale = (1 << kiScaleBit);
145 int32_t iScalex = (int32_t) ((float_t)kiSrcWidth / (float_t)kiDstWidth * kiScale);145 int32_t iScalex = (int32_t) ((float)kiSrcWidth / (float)kiDstWidth * kiScale);
146 int32_t iScaley = (int32_t) ((float_t)kiSrcHeight / (float_t)kiDstHeight * kiScale);146 int32_t iScaley = (int32_t) ((float)kiSrcHeight / (float)kiDstHeight * kiScale);
147 int64_t x;147 int64_t x;
148 int32_t iYInverse, iXInverse;148 int32_t iYInverse, iXInverse;
149 149
@@ -208,8 +208,8 @@ void GeneralBilinearAccurateDownsampler_c (uint8_t* pDst, const int32_t kiDstStr · 58 unmodified lines
208// const int32_t kiScaleBitWidth = 16, kiScaleBitHeight = 15;208// const int32_t kiScaleBitWidth = 16, kiScaleBitHeight = 15;
209// const uint32_t kuiScaleWidth = (1 << kiScaleBitWidth), kuiScaleHeight = (1 << kiScaleBitHeight);209// const uint32_t kuiScaleWidth = (1 << kiScaleBitWidth), kuiScaleHeight = (1 << kiScaleBitHeight);
210//210//
211// uint32_t uiScalex = (uint32_t) ((float_t)kiSrcWidth / (float_t)kiDstWidth * kuiScaleWidth);211// uint32_t uiScalex = (uint32_t) ((float)kiSrcWidth / (float)kiDstWidth * kuiScaleWidth);
212// uint32_t uiScaley = (uint32_t) ((float_t)kiSrcHeight / (float_t)kiDstHeight * kuiScaleHeight);212// uint32_t uiScaley = (uint32_t) ((float)kiSrcHeight / (float)kiDstHeight * kuiScaleHeight);
213//213//
214// GeneralBilinearFastDownsampler_sse2 (pDst, kiDstStride, kiDstWidth, kiDstHeight,214// GeneralBilinearFastDownsampler_sse2 (pDst, kiDstStride, kiDstWidth, kiDstHeight,
215// pSrc, kiSrcStride, kiSrcWidth, kiSrcHeight, uiScalex, uiScaley);215// pSrc, kiSrcStride, kiSrcWidth, kiSrcHeight, uiScalex, uiScaley);
@@ -221,8 +221,8 @@ void GeneralBilinearAccurateDownsampler_c (uint8_t* pDst, const int32_t kiDstStr · 5 unmodified lines
221// const int32_t kiScaleBit = 15;221// const int32_t kiScaleBit = 15;
222// const uint32_t kuiScale = (1 << kiScaleBit);222// const uint32_t kuiScale = (1 << kiScaleBit);
223//223//
224// uint32_t uiScalex = (uint32_t) ((float_t)kiSrcWidth / (float_t)kiDstWidth * kuiScale);224// uint32_t uiScalex = (uint32_t) ((float)kiSrcWidth / (float)kiDstWidth * kuiScale);
225// uint32_t uiScaley = (uint32_t) ((float_t)kiSrcHeight / (float_t)kiDstHeight * kuiScale);225// uint32_t uiScaley = (uint32_t) ((float)kiSrcHeight / (float)kiDstHeight * kuiScale);
226//226//
227// GeneralBilinearAccurateDownsampler_sse2 (pDst, kiDstStride, kiDstWidth, kiDstHeight,227// GeneralBilinearAccurateDownsampler_sse2 (pDst, kiDstStride, kiDstWidth, kiDstHeight,
228// pSrc, kiSrcStride, kiSrcWidth, kiSrcHeight, uiScalex, uiScaley);228// pSrc, kiSrcStride, kiSrcWidth, kiSrcHeight, uiScalex, uiScaley);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t