<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Oct 29, 2013 at 12:47 AM, <span dir="ltr"><<a href="mailto:murugan@multicorewareinc.com" target="_blank">murugan@multicorewareinc.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"># HG changeset patch<br>
# User Murugan Vairavel <<a href="mailto:murugan@multicorewareinc.com">murugan@multicorewareinc.com</a>><br>
# Date 1383025592 -19800<br>
# Tue Oct 29 11:16:32 2013 +0530<br>
# Node ID d1c01c65c3d7c79041db102dd94f482987c07f47<br>
# Parent 0666d56aaa4259590dffdd5aa3bc7859c4763931<br>
Cleanups: Replacing Ushort with uint16_t<br></blockquote><div><br></div><div>Queued for default, thanks</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
diff -r 0666d56aaa42 -r d1c01c65c3d7 source/Lib/TLibCommon/TComTrQuant.cpp<br>
--- a/source/Lib/TLibCommon/TComTrQuant.cpp Mon Oct 28 16:13:05 2013 +0530<br>
+++ b/source/Lib/TLibCommon/TComTrQuant.cpp Tue Oct 29 11:16:32 2013 +0530<br>
@@ -640,7 +640,7 @@<br>
{<br>
uint32_t posY = blkPos >> log2BlkSize;<br>
uint32_t posX = blkPos - (posY << log2BlkSize);<br>
- UShort ctxSig = getSigCtxInc(patternSigCtx, scanIdx, posX, posY, log2BlkSize, ttype);<br>
+ uint16_t ctxSig = getSigCtxInc(patternSigCtx, scanIdx, posX, posY, log2BlkSize, ttype);<br>
level = xGetCodedLevel(costCoeff[scanPos], costCoeff0[scanPos], costSig[scanPos],<br>
levelDouble, maxAbsLevel, ctxSig, oneCtx, absCtx, goRiceParam,<br>
c1Idx, c2Idx, qbits, scaleFactor, 0);<br>
@@ -1149,10 +1149,10 @@<br>
double& codedCostSig,<br>
int levelDouble,<br>
uint32_t maxAbsLevel,<br>
- UShort ctxNumSig,<br>
- UShort ctxNumOne,<br>
- UShort ctxNumAbs,<br>
- UShort absGoRice,<br>
+ uint16_t ctxNumSig,<br>
+ uint16_t ctxNumOne,<br>
+ uint16_t ctxNumAbs,<br>
+ uint16_t absGoRice,<br>
uint32_t c1Idx,<br>
uint32_t c2Idx,<br>
int qbits,<br>
@@ -1207,9 +1207,9 @@<br>
* \returns cost of given absolute transform level<br>
*/<br>
inline double TComTrQuant::xGetICRateCost(uint32_t absLevel,<br>
- UShort ctxNumOne,<br>
- UShort ctxNumAbs,<br>
- UShort absGoRice,<br>
+ uint16_t ctxNumOne,<br>
+ uint16_t ctxNumAbs,<br>
+ uint16_t absGoRice,<br>
uint32_t c1Idx,<br>
uint32_t c2Idx) const<br>
{<br>
@@ -1263,9 +1263,9 @@<br>
}<br>
<br>
inline int TComTrQuant::xGetICRate(uint32_t absLevel,<br>
- UShort ctxNumOne,<br>
- UShort ctxNumAbs,<br>
- UShort absGoRice,<br>
+ uint16_t ctxNumOne,<br>
+ uint16_t ctxNumAbs,<br>
+ uint16_t absGoRice,<br>
uint32_t c1Idx,<br>
uint32_t c2Idx) const<br>
{<br>
@@ -1290,8 +1290,8 @@<br>
symbol = std::min<uint32_t>(symbol, (maxVlc + 1));<br>
}<br>
<br>
- UShort prefLen = UShort(symbol >> absGoRice) + 1;<br>
- UShort numBins = std::min<uint32_t>(prefLen, g_goRicePrefixLen[absGoRice]) + absGoRice;<br>
+ uint16_t prefLen = uint16_t(symbol >> absGoRice) + 1;<br>
+ uint16_t numBins = std::min<uint32_t>(prefLen, g_goRicePrefixLen[absGoRice]) + absGoRice;<br>
<br>
rate += numBins << 15;<br>
<br>
diff -r 0666d56aaa42 -r d1c01c65c3d7 source/Lib/TLibCommon/TComTrQuant.h<br>
--- a/source/Lib/TLibCommon/TComTrQuant.h Mon Oct 28 16:13:05 2013 +0530<br>
+++ b/source/Lib/TLibCommon/TComTrQuant.h Tue Oct 29 11:16:32 2013 +0530<br>
@@ -200,18 +200,18 @@<br>
uint32_t xRateDistOptQuant(TComDataCU* cu, int32_t* srcCoeff, TCoeff* dstCoeff, uint32_t width, uint32_t height, TextType ttype, uint32_t absPartIdx, int32_t *lastPos);<br>
<br>
inline uint32_t xGetCodedLevel(double& codedCost, double& codedCost0, double& codedCostSig, int levelDouble,<br>
- uint32_t maxAbsLevel, UShort ctxNumSig, UShort ctxNumOne, UShort ctxNumAbs, UShort absGoRice,<br>
+ uint32_t maxAbsLevel, uint16_t ctxNumSig, uint16_t ctxNumOne, uint16_t ctxNumAbs, uint16_t absGoRice,<br>
uint32_t c1Idx, uint32_t c2Idx, int qbits, double scale, bool bLast) const;<br>
<br>
- inline double xGetICRateCost(uint32_t absLevel, UShort ctxNumOne, UShort ctxNumAbs, UShort absGoRice, uint32_t c1Idx, uint32_t c2Idx) const;<br>
+ inline double xGetICRateCost(uint32_t absLevel, uint16_t ctxNumOne, uint16_t ctxNumAbs, uint16_t absGoRice, uint32_t c1Idx, uint32_t c2Idx) const;<br>
<br>
- inline int xGetICRate(uint32_t absLevel, UShort ctxNumOne, UShort ctxNumAbs, UShort absGoRice, uint32_t c1Idx, uint32_t c2Idx) const;<br>
+ inline int xGetICRate(uint32_t absLevel, uint16_t ctxNumOne, uint16_t ctxNumAbs, uint16_t absGoRice, uint32_t c1Idx, uint32_t c2Idx) const;<br>
<br>
inline double xGetRateLast(uint32_t posx, uint32_t posy) const;<br>
<br>
- inline double xGetRateSigCoeffGroup(UShort sigCoeffGroup, UShort ctxNumSig) const { return m_lambda * m_estBitsSbac->significantCoeffGroupBits[ctxNumSig][sigCoeffGroup]; }<br>
+ inline double xGetRateSigCoeffGroup(uint16_t sigCoeffGroup, uint16_t ctxNumSig) const { return m_lambda * m_estBitsSbac->significantCoeffGroupBits[ctxNumSig][sigCoeffGroup]; }<br>
<br>
- inline double xGetRateSigCoef(UShort sig, UShort ctxNumSig) const { return m_lambda * m_estBitsSbac->significantBits[ctxNumSig][sig]; }<br>
+ inline double xGetRateSigCoef(uint16_t sig, uint16_t ctxNumSig) const { return m_lambda * m_estBitsSbac->significantBits[ctxNumSig][sig]; }<br>
<br>
inline double xGetICost(double rage) const { return m_lambda * rage; } ///< Get the cost for a specific rate<br>
<br>
diff -r 0666d56aaa42 -r d1c01c65c3d7 source/Lib/TLibCommon/TypeDef.h<br>
--- a/source/Lib/TLibCommon/TypeDef.h Mon Oct 28 16:13:05 2013 +0530<br>
+++ b/source/Lib/TLibCommon/TypeDef.h Tue Oct 29 11:16:32 2013 +0530<br>
@@ -52,7 +52,6 @@<br>
// ====================================================================================================================<br>
<br>
typedef unsigned char UChar;<br>
-typedef unsigned short UShort;<br>
<br>
// ====================================================================================================================<br>
// 64-bit integer type<br>
@@ -71,7 +70,7 @@<br>
// ====================================================================================================================<br>
<br>
#if HIGH_BIT_DEPTH<br>
-typedef UShort Pel; // 16-bit pixel type<br>
+typedef uint16_t Pel; // 16-bit pixel type<br>
#define X265_DEPTH x265::g_bitDepth // runtime configurable bit depth<br>
extern int g_bitDepth;<br>
#else<br>
_______________________________________________<br>
x265-devel mailing list<br>
<a href="mailto:x265-devel@videolan.org">x265-devel@videolan.org</a><br>
<a href="https://mailman.videolan.org/listinfo/x265-devel" target="_blank">https://mailman.videolan.org/listinfo/x265-devel</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br>Steve Borho
</div></div>