[x265-commits] [x265] input: do not check for inactive read thread until read q...
Steve Borho
steve at borho.org
Mon Oct 28 19:58:20 CET 2013
details: http://hg.videolan.org/x265/rev/ccac3a7d3622
branches:
changeset: 4697:ccac3a7d3622
user: Steve Borho <steve at borho.org>
date: Fri Oct 25 22:40:09 2013 -0500
description:
input: do not check for inactive read thread until read queue is empty
Subject: [x265] fix variable name, msg to mrg
details: http://hg.videolan.org/x265/rev/e1453bc3ae1e
branches:
changeset: 4698:e1453bc3ae1e
user: Wenju He <wenju at multicorewareinc.com>
date: Sun Oct 27 17:06:37 2013 -0500
description:
fix variable name, msg to mrg
Subject: [x265] need not compute chroma in xGetInterPredictionError
details: http://hg.videolan.org/x265/rev/7c2ce4d33f62
branches:
changeset: 4699:7c2ce4d33f62
user: Wenju He <wenju at multicorewareinc.com>
date: Sun Oct 27 17:18:15 2013 -0500
description:
need not compute chroma in xGetInterPredictionError
Subject: [x265] primitives: micro optimizations of PartitionFromSizes()
details: http://hg.videolan.org/x265/rev/1a65c6df7e70
branches:
changeset: 4700:1a65c6df7e70
user: Steve Borho <steve at borho.org>
date: Sun Oct 27 23:45:12 2013 -0500
description:
primitives: micro optimizations of PartitionFromSizes()
* use int for w, h
* change lookup table to uint8_t
* make function inlined
Subject: [x265] primitives: lower case partitionFromSizes() function to follow coding style
details: http://hg.videolan.org/x265/rev/ef2428fd32fe
branches:
changeset: 4701:ef2428fd32fe
user: Steve Borho <steve at borho.org>
date: Mon Oct 28 00:08:06 2013 -0500
description:
primitives: lower case partitionFromSizes() function to follow coding style
Subject: [x265] y4m : bug fix for calculating framesize in skipFrames()
details: http://hg.videolan.org/x265/rev/7916afc6c9c4
branches:
changeset: 4702:7916afc6c9c4
user: Gopu Govindaswamy <gopu at multicorewareinc.com>
date: Mon Oct 28 11:59:47 2013 +0530
description:
y4m : bug fix for calculating framesize in skipFrames()
Subject: [x265] input: read y4m input from stdin if filename is passed as "-"
details: http://hg.videolan.org/x265/rev/f59393a695ee
branches:
changeset: 4703:f59393a695ee
user: Gopu Govindaswamy <gopu at multicorewareinc.com>
date: Mon Oct 28 12:12:10 2013 +0530
description:
input: read y4m input from stdin if filename is passed as "-"
Subject: [x265] cli: add --y4m option to force Y4M stream parser
details: http://hg.videolan.org/x265/rev/fa30212a64f8
branches:
changeset: 4704:fa30212a64f8
user: Steve Borho <steve at borho.org>
date: Mon Oct 28 11:22:10 2013 -0500
description:
cli: add --y4m option to force Y4M stream parser
Subject: [x265] row wise generation of hash in framefilter
details: http://hg.videolan.org/x265/rev/edd33e942d7b
branches:
changeset: 4705:edd33e942d7b
user: Santhoshini Sekar <santhoshini at multicorewareinc.com>
date: Mon Oct 28 10:55:54 2013 +0530
description:
row wise generation of hash in framefilter
Subject: [x265] refactor: replace ternary operator with loop variable and enum with #define
details: http://hg.videolan.org/x265/rev/4176ba91f62d
branches:
changeset: 4706:4176ba91f62d
user: Kavitha Sampath <kavitha at multicorewareinc.com>
date: Mon Oct 28 11:30:28 2013 +0530
description:
refactor: replace ternary operator with loop variable and enum with #define
Subject: [x265] refactor: replace int pointers with int32_t and UInt with uint32_t
details: http://hg.videolan.org/x265/rev/a96b8f225c4a
branches:
changeset: 4707:a96b8f225c4a
user: Kavitha Sampath <kavitha at multicorewareinc.com>
date: Mon Oct 28 15:35:05 2013 +0530
description:
refactor: replace int pointers with int32_t and UInt with uint32_t
Subject: [x265] refactor: use unsigned int16 types where applicable
details: http://hg.videolan.org/x265/rev/4de8551f1f52
branches:
changeset: 4708:4de8551f1f52
user: murugan at multicorewareinc.com Murugan Vairavel
date: Mon Oct 28 12:19:06 2013 -0500
description:
refactor: use unsigned int16 types where applicable
Subject: [x265] refactor: (Input/Output files) - Check need of signed/unsigned int
details: http://hg.videolan.org/x265/rev/5e1fb266b39f
branches:
changeset: 4709:5e1fb266b39f
user: Kavitha Sampath <kavitha at multicorewareinc.com>
date: Mon Oct 28 19:05:28 2013 +0530
description:
refactor: (Input/Output files) - Check need of signed/unsigned int
Subject: [x265] rc: implement qp with Aq for each Cu before encoding them.
details: http://hg.videolan.org/x265/rev/c3a28172894a
branches:
changeset: 4710:c3a28172894a
user: Aarthi Thirumalai
date: Mon Oct 28 15:36:11 2013 +0530
description:
rc: implement qp with Aq for each Cu before encoding them.
Subject: [x265] asm code for pixel_sad_x3_16x64 and pixel_sad_x4_16x64
details: http://hg.videolan.org/x265/rev/0666d56aaa42
branches:
changeset: 4711:0666d56aaa42
user: Yuvaraj Venkatesh <yuvaraj at multicorewareinc.com>
date: Mon Oct 28 16:13:05 2013 +0530
description:
asm code for pixel_sad_x3_16x64 and pixel_sad_x4_16x64
diffstat:
source/Lib/TLibCommon/NAL.h | 6 +-
source/Lib/TLibCommon/SEI.h | 34 +-
source/Lib/TLibCommon/TComBitCounter.h | 8 +-
source/Lib/TLibCommon/TComBitStream.cpp | 26 +-
source/Lib/TLibCommon/TComBitStream.h | 20 +-
source/Lib/TLibCommon/TComDataCU.cpp | 450 ++++----
source/Lib/TLibCommon/TComDataCU.h | 264 ++--
source/Lib/TLibCommon/TComLoopFilter.cpp | 134 +-
source/Lib/TLibCommon/TComLoopFilter.h | 24 +-
source/Lib/TLibCommon/TComMotionInfo.cpp | 14 +-
source/Lib/TLibCommon/TComMotionInfo.h | 16 +-
source/Lib/TLibCommon/TComPattern.cpp | 100 +-
source/Lib/TLibCommon/TComPattern.h | 24 +-
source/Lib/TLibCommon/TComPic.h | 26 +-
source/Lib/TLibCommon/TComPicSym.cpp | 4 +-
source/Lib/TLibCommon/TComPicSym.h | 40 +-
source/Lib/TLibCommon/TComPicYuv.cpp | 17 +-
source/Lib/TLibCommon/TComPicYuv.h | 25 +-
source/Lib/TLibCommon/TComPicYuvMD5.cpp | 126 +-
source/Lib/TLibCommon/TComPrediction.cpp | 46 +-
source/Lib/TLibCommon/TComPrediction.h | 28 +-
source/Lib/TLibCommon/TComRdCost.h | 18 +-
source/Lib/TLibCommon/TComRom.cpp | 114 +-
source/Lib/TLibCommon/TComRom.h | 46 +-
source/Lib/TLibCommon/TComSampleAdaptiveOffset.cpp | 84 +-
source/Lib/TLibCommon/TComSampleAdaptiveOffset.h | 34 +-
source/Lib/TLibCommon/TComSlice.cpp | 62 +-
source/Lib/TLibCommon/TComSlice.h | 420 ++++----
source/Lib/TLibCommon/TComTrQuant.cpp | 296 +++---
source/Lib/TLibCommon/TComTrQuant.h | 64 +-
source/Lib/TLibCommon/TComWeightPrediction.cpp | 34 +-
source/Lib/TLibCommon/TComWeightPrediction.h | 16 +-
source/Lib/TLibCommon/TComYuv.cpp | 174 +-
source/Lib/TLibCommon/TComYuv.h | 102 +-
source/Lib/TLibCommon/TypeDef.h | 15 +-
source/Lib/TLibEncoder/NALwrite.cpp | 8 +-
source/Lib/TLibEncoder/NALwrite.h | 6 +-
source/Lib/TLibEncoder/SEIwrite.cpp | 18 +-
source/Lib/TLibEncoder/SyntaxElementWriter.cpp | 18 +-
source/Lib/TLibEncoder/SyntaxElementWriter.h | 14 +-
source/Lib/TLibEncoder/TEncAnalyze.h | 4 +-
source/Lib/TLibEncoder/TEncBinCoderCABAC.cpp | 28 +-
source/Lib/TLibEncoder/TEncBinCoderCABAC.h | 20 +-
source/Lib/TLibEncoder/TEncCfg.h | 28 +-
source/Lib/TLibEncoder/TEncCu.cpp | 152 +-
source/Lib/TLibEncoder/TEncCu.h | 22 +-
source/Lib/TLibEncoder/TEncEntropy.cpp | 108 +-
source/Lib/TLibEncoder/TEncEntropy.h | 124 +-
source/Lib/TLibEncoder/TEncSampleAdaptiveOffset.cpp | 44 +-
source/Lib/TLibEncoder/TEncSampleAdaptiveOffset.h | 6 +-
source/Lib/TLibEncoder/TEncSbac.cpp | 298 +++---
source/Lib/TLibEncoder/TEncSbac.h | 80 +-
source/Lib/TLibEncoder/TEncSearch.cpp | 956 +++++++++----------
source/Lib/TLibEncoder/TEncSearch.h | 90 +-
source/Lib/TLibEncoder/WeightPredAnalysis.cpp | 52 +-
source/Lib/TLibEncoder/WeightPredAnalysis.h | 4 +-
source/common/common.cpp | 2 +-
source/common/dct.cpp | 24 +-
source/common/lowres.cpp | 16 +-
source/common/lowres.h | 9 +-
source/common/pixel.cpp | 8 +-
source/common/primitives.cpp | 46 +-
source/common/primitives.h | 32 +-
source/common/threading.h | 4 +-
source/common/vec/dct-sse3.cpp | 12 +-
source/common/vec/dct-sse41.cpp | 16 +-
source/common/vec/dct-ssse3.cpp | 8 +-
source/common/vec/intra-sse41.cpp | 2 +-
source/common/vec/pixel-avx2.cpp | 8 +-
source/common/vec/pixel-sse3.cpp | 10 +-
source/common/vec/pixel-sse41.cpp | 40 +-
source/common/vec/pixel16-sse41.cpp | 32 +-
source/common/x86/asm-primitives.cpp | 4 +
source/common/x86/sad-a.asm | 102 +-
source/compat/getopt/getopt.c | 6 +-
source/compat/getopt/getopt.h | 10 +-
source/encoder/compress.cpp | 50 +-
source/encoder/cturow.cpp | 6 +-
source/encoder/cturow.h | 2 +-
source/encoder/dpb.cpp | 5 +-
source/encoder/encoder.cpp | 39 +-
source/encoder/frameencoder.cpp | 90 +-
source/encoder/frameencoder.h | 2 +-
source/encoder/framefilter.cpp | 125 +-
source/encoder/framefilter.h | 2 -
source/encoder/motion.cpp | 2 +-
source/encoder/ratecontrol.cpp | 59 +-
source/encoder/ratecontrol.h | 2 +-
source/encoder/slicetype.cpp | 10 +-
source/input/input.cpp | 4 +-
source/input/input.h | 6 +-
source/input/y4m.cpp | 118 +-
source/input/y4m.h | 14 +-
source/input/yuv.cpp | 21 +-
source/input/yuv.h | 10 +-
source/output/output.cpp | 2 +-
source/output/output.h | 2 +-
source/output/y4m.cpp | 8 +-
source/output/yuv.cpp | 12 +-
source/output/yuv.h | 4 +-
source/test/pixelharness.cpp | 28 +-
source/x265.cpp | 29 +-
source/x265.h | 10 +-
103 files changed, 3071 insertions(+), 2973 deletions(-)
diffs (truncated from 15522 to 300 lines):
diff -r 34573a44f81d -r 0666d56aaa42 source/Lib/TLibCommon/NAL.h
--- a/source/Lib/TLibCommon/NAL.h Fri Oct 25 16:44:42 2013 -0500
+++ b/source/Lib/TLibCommon/NAL.h Mon Oct 28 16:13:05 2013 +0530
@@ -49,8 +49,8 @@ class TComOutputBitstream;
struct NALUnit
{
NalUnitType m_nalUnitType; ///< nal_unit_type
- UInt m_temporalId; ///< temporal_id
- UInt m_reservedZero6Bits; ///< reserved_zero_6bits
+ uint32_t m_temporalId; ///< temporal_id
+ uint32_t m_reservedZero6Bits; ///< reserved_zero_6bits
/** construct an NALunit structure with given header values. */
NALUnit(NalUnitType nalUnitType,
@@ -72,7 +72,7 @@ struct OutputNALUnit;
*/
struct NALUnitEBSP : public NALUnit
{
- UInt m_packetSize;
+ uint32_t m_packetSize;
uint8_t *m_nalUnitData;
/**
diff -r 34573a44f81d -r 0666d56aaa42 source/Lib/TLibCommon/SEI.h
--- a/source/Lib/TLibCommon/SEI.h Fri Oct 25 16:44:42 2013 -0500
+++ b/source/Lib/TLibCommon/SEI.h Mon Oct 28 16:13:05 2013 +0530
@@ -100,7 +100,7 @@ public:
}
UChar uuid_iso_iec_11578[16];
- UInt userDataLength;
+ uint32_t userDataLength;
UChar *userData;
};
@@ -167,16 +167,16 @@ public:
virtual ~SEIBufferingPeriod() {}
- UInt m_bpSeqParameterSetId;
+ uint32_t m_bpSeqParameterSetId;
bool m_rapCpbParamsPresentFlag;
bool m_cpbDelayOffset;
bool m_dpbDelayOffset;
- UInt m_initialCpbRemovalDelay[MAX_CPB_CNT][2];
- UInt m_initialCpbRemovalDelayOffset[MAX_CPB_CNT][2];
- UInt m_initialAltCpbRemovalDelay[MAX_CPB_CNT][2];
- UInt m_initialAltCpbRemovalDelayOffset[MAX_CPB_CNT][2];
+ uint32_t m_initialCpbRemovalDelay[MAX_CPB_CNT][2];
+ uint32_t m_initialCpbRemovalDelayOffset[MAX_CPB_CNT][2];
+ uint32_t m_initialAltCpbRemovalDelay[MAX_CPB_CNT][2];
+ uint32_t m_initialAltCpbRemovalDelayOffset[MAX_CPB_CNT][2];
bool m_concatenationFlag;
- UInt m_auCpbRemovalDelayDelta;
+ uint32_t m_auCpbRemovalDelayDelta;
};
class SEIPictureTiming : public SEI
@@ -200,18 +200,18 @@ public:
delete m_duCpbRemovalDelayMinus1;
}
- UInt m_picStruct;
- UInt m_sourceScanType;
+ uint32_t m_picStruct;
+ uint32_t m_sourceScanType;
bool m_duplicateFlag;
- UInt m_auCpbRemovalDelay;
- UInt m_picDpbOutputDelay;
- UInt m_picDpbOutputDuDelay;
- UInt m_numDecodingUnitsMinus1;
+ uint32_t m_auCpbRemovalDelay;
+ uint32_t m_picDpbOutputDelay;
+ uint32_t m_picDpbOutputDuDelay;
+ uint32_t m_numDecodingUnitsMinus1;
bool m_duCommonCpbRemovalDelayFlag;
- UInt m_duCommonCpbRemovalDelayMinus1;
- UInt* m_numNalusInDuMinus1;
- UInt* m_duCpbRemovalDelayMinus1;
+ uint32_t m_duCommonCpbRemovalDelayMinus1;
+ uint32_t* m_numNalusInDuMinus1;
+ uint32_t* m_duCpbRemovalDelayMinus1;
};
class SEIDecodingUnitInfo : public SEI
@@ -268,7 +268,7 @@ public:
bool horFlip;
bool verFlip;
- UInt anticlockwiseRotation;
+ uint32_t anticlockwiseRotation;
bool persistenceFlag;
bool extensionFlag;
};
diff -r 34573a44f81d -r 0666d56aaa42 source/Lib/TLibCommon/TComBitCounter.h
--- a/source/Lib/TLibCommon/TComBitCounter.h Fri Oct 25 16:44:42 2013 -0500
+++ b/source/Lib/TLibCommon/TComBitCounter.h Mon Oct 28 16:13:05 2013 +0530
@@ -55,7 +55,7 @@ class TComBitCounter : public TComBitIf
{
protected:
- UInt m_uiBitCounter;
+ uint32_t m_uiBitCounter;
public:
@@ -63,13 +63,13 @@ public:
virtual ~TComBitCounter() {}
- void write(UInt /*uiBits*/, UInt uiNumberOfBits) { m_uiBitCounter += uiNumberOfBits; }
+ void write(uint32_t /*uiBits*/, uint32_t uiNumberOfBits) { m_uiBitCounter += uiNumberOfBits; }
- void writeByte(UInt /*val*/) { m_uiBitCounter += 8; }
+ void writeByte(uint32_t /*val*/) { m_uiBitCounter += 8; }
void resetBits() { m_uiBitCounter = 0; }
- UInt getNumberOfWrittenBits() const { return m_uiBitCounter; }
+ uint32_t getNumberOfWrittenBits() const { return m_uiBitCounter; }
};
}
//! \}
diff -r 34573a44f81d -r 0666d56aaa42 source/Lib/TLibCommon/TComBitStream.cpp
--- a/source/Lib/TLibCommon/TComBitStream.cpp Fri Oct 25 16:44:42 2013 -0500
+++ b/source/Lib/TLibCommon/TComBitStream.cpp Mon Oct 28 16:13:05 2013 +0530
@@ -71,7 +71,7 @@ char* TComOutputBitstream::getByteStream
return (char*)m_fifo;
}
-UInt TComOutputBitstream::getByteStreamLength()
+uint32_t TComOutputBitstream::getByteStreamLength()
{
return m_fsize;
}
@@ -84,15 +84,15 @@ void TComOutputBitstream::clear()
buffsize = MIN_FIFO_SIZE;
}
-void TComOutputBitstream::write(UInt uiBits, UInt uiNumberOfBits)
+void TComOutputBitstream::write(uint32_t uiBits, uint32_t uiNumberOfBits)
{
assert(uiNumberOfBits <= 32);
assert(uiNumberOfBits == 32 || (uiBits & (~0 << uiNumberOfBits)) == 0);
/* any modulo 8 remainder of num_total_bits cannot be written this time,
* and will be held until next time. */
- UInt num_total_bits = uiNumberOfBits + m_num_held_bits;
- UInt next_num_held_bits = num_total_bits % 8;
+ uint32_t num_total_bits = uiNumberOfBits + m_num_held_bits;
+ uint32_t next_num_held_bits = num_total_bits % 8;
/* form a byte aligned word (write_bits), by concatenating any held bits
* with the new bits, discarding the bits that will form the next_held_bits.
@@ -113,8 +113,8 @@ void TComOutputBitstream::write(UInt uiB
}
/* topword serves to justify held_bits to align with the msb of uiBits */
- UInt topword = (uiNumberOfBits - next_num_held_bits) & ~((1 << 3) - 1);
- UInt write_bits = (m_held_bits << topword) | (uiBits >> next_num_held_bits);
+ uint32_t topword = (uiNumberOfBits - next_num_held_bits) & ~((1 << 3) - 1);
+ uint32_t write_bits = (m_held_bits << topword) | (uiBits >> next_num_held_bits);
switch (num_total_bits >> 3)
{
@@ -128,7 +128,7 @@ void TComOutputBitstream::write(UInt uiB
m_num_held_bits = next_num_held_bits;
}
-void TComOutputBitstream::writeByte(UInt val)
+void TComOutputBitstream::writeByte(uint32_t val)
{
// NOTE: we are here only in Cabac
assert(m_num_held_bits == 0);
@@ -138,7 +138,7 @@ void TComOutputBitstream::writeByte(UInt
void TComOutputBitstream::writeAlignOne()
{
- UInt num_bits = getNumBitsUntilByteAligned();
+ uint32_t num_bits = getNumBitsUntilByteAligned();
write((1 << num_bits) - 1, num_bits);
}
@@ -161,11 +161,11 @@ void TComOutputBitstream::writeAlignZero
*/
void TComOutputBitstream::addSubstream(TComOutputBitstream* pcSubstream)
{
- UInt uiNumBits = pcSubstream->getNumberOfWrittenBits();
+ uint32_t uiNumBits = pcSubstream->getNumberOfWrittenBits();
const uint8_t* rbsp = pcSubstream->getFIFO();
- for (UInt count = 0; count < pcSubstream->m_fsize; count++)
+ for (uint32_t count = 0; count < pcSubstream->m_fsize; count++)
{
write(rbsp[count], 8);
}
@@ -184,11 +184,11 @@ void TComOutputBitstream::writeByteAlign
int TComOutputBitstream::countStartCodeEmulations()
{
- UInt cnt = 0;
+ uint32_t cnt = 0;
uint8_t *rbsp = getFIFO();
- UInt fsize = getByteStreamLength();
+ uint32_t fsize = getByteStreamLength();
- for (UInt count = 0; count < fsize; count++)
+ for (uint32_t count = 0; count < fsize; count++)
{
if ((rbsp[count + 2] == 0x00 || rbsp[count + 2] == 0x01 || rbsp[count + 2] == 0x02 || rbsp[count + 2] == 0x03)
&& rbsp[count + 1] == 0x00 && rbsp[count] == 0x00)
diff -r 34573a44f81d -r 0666d56aaa42 source/Lib/TLibCommon/TComBitStream.h
--- a/source/Lib/TLibCommon/TComBitStream.h Fri Oct 25 16:44:42 2013 -0500
+++ b/source/Lib/TLibCommon/TComBitStream.h Mon Oct 28 16:13:05 2013 +0530
@@ -63,10 +63,10 @@ public:
virtual void writeAlignZero() {}
- virtual void write(UInt uiBits, UInt uiNumberOfBits) = 0;
- virtual void writeByte(UInt val) = 0;
+ virtual void write(uint32_t uiBits, uint32_t uiNumberOfBits) = 0;
+ virtual void writeByte(uint32_t val) = 0;
virtual void resetBits() = 0;
- virtual UInt getNumberOfWrittenBits() const = 0;
+ virtual uint32_t getNumberOfWrittenBits() const = 0;
virtual ~TComBitIf() {}
};
@@ -84,10 +84,10 @@ class TComOutputBitstream : public TComB
* NB, this pointer is only valid until the next push_back()/clear()
*/
uint8_t *m_fifo;
- UInt m_fsize;
- UInt buffsize;
+ uint32_t m_fsize;
+ uint32_t buffsize;
- UInt m_num_held_bits; /// number of bits not flushed to bytestream.
+ uint32_t m_num_held_bits; /// number of bits not flushed to bytestream.
UChar m_held_bits; /// the bits held and not flushed to bytestream.
/// this value is always msb-aligned, bigendian.
@@ -103,8 +103,8 @@ public:
* append uiNumberOfBits least significant bits of uiBits to
* the current bitstream
*/
- void write(UInt uiBits, UInt uiNumberOfBits);
- void writeByte(UInt val);
+ void write(uint32_t uiBits, uint32_t uiNumberOfBits);
+ void writeByte(uint32_t val);
/** insert one bits until the bitstream is byte-aligned */
void writeAlignOne();
@@ -128,7 +128,7 @@ public:
/**
* Return the number of valid bytes available from getByteStream()
*/
- UInt getByteStreamLength();
+ uint32_t getByteStreamLength();
/**
* Reset all internal state.
@@ -144,7 +144,7 @@ public:
/**
* Return the number of bits that have been written since the last clear()
*/
- UInt getNumberOfWrittenBits() const { return m_fsize * 8 + m_num_held_bits; }
+ uint32_t getNumberOfWrittenBits() const { return m_fsize * 8 + m_num_held_bits; }
/**
* Return a reference to the internal fifo
diff -r 34573a44f81d -r 0666d56aaa42 source/Lib/TLibCommon/TComDataCU.cpp
--- a/source/Lib/TLibCommon/TComDataCU.cpp Fri Oct 25 16:44:42 2013 -0500
+++ b/source/Lib/TLibCommon/TComDataCU.cpp Mon Oct 28 16:13:05 2013 +0530
@@ -105,14 +105,14 @@ TComDataCU::TComDataCU()
TComDataCU::~TComDataCU()
{}
-void TComDataCU::create(UInt numPartition, UInt width, UInt height, int unitSize)
+void TComDataCU::create(uint32_t numPartition, uint32_t width, uint32_t height, int unitSize)
{
m_pic = NULL;
m_slice = NULL;
m_numPartitions = numPartition;
m_unitSize = unitSize;
- UInt tmp = 4 * AMVP_DECIMATION_FACTOR / unitSize;
+ uint32_t tmp = 4 * AMVP_DECIMATION_FACTOR / unitSize;
tmp = tmp * tmp;
assert(tmp == (1 << (g_convertToBit[tmp] + 2)));
tmp = g_convertToBit[tmp] + 2;
@@ -234,7 +234,7 @@ void TComDataCU::destroy()
\param pic picture (TComPic) class pointer
\param iCUAddr CU address
*/
-void TComDataCU::initCU(TComPic* pic, UInt cuAddr)
+void TComDataCU::initCU(TComPic* pic, uint32_t cuAddr)
{
More information about the x265-commits
mailing list