[x265] [PATCH] rename variable name m_Bitstream to m_bitstream
santhoshini at multicorewareinc.com
santhoshini at multicorewareinc.com
Wed Oct 30 04:49:15 CET 2013
# HG changeset patch
# User Santhoshini Sekar <santhoshini at multicorewareinc.com>
# Date 1383104829 -19800
# Wed Oct 30 09:17:09 2013 +0530
# Node ID 6e1439b991f0b0ea11284128b7f7b9e73c575855
# Parent a7e349a5e32edd1f075449c2f828e7b03cebff2c
rename variable name m_Bitstream to m_bitstream
diff -r a7e349a5e32e -r 6e1439b991f0 source/Lib/TLibEncoder/NALwrite.cpp
--- a/source/Lib/TLibEncoder/NALwrite.cpp Wed Oct 30 08:50:49 2013 +0530
+++ b/source/Lib/TLibEncoder/NALwrite.cpp Wed Oct 30 09:17:09 2013 +0530
@@ -82,8 +82,8 @@
* - 0x00000302
* - 0x00000303
*/
- uint32_t fsize = nalu.m_Bitstream.getByteStreamLength();
- uint8_t* fifo = nalu.m_Bitstream.getFIFO();
+ uint32_t fsize = nalu.m_bitstream.getByteStreamLength();
+ uint8_t* fifo = nalu.m_bitstream.getFIFO();
uint8_t* emulation = (uint8_t*)X265_MALLOC(uint8_t, fsize + EMULATION_SIZE);
uint32_t nalsize = 0;
diff -r a7e349a5e32e -r 6e1439b991f0 source/Lib/TLibEncoder/NALwrite.h
--- a/source/Lib/TLibEncoder/NALwrite.h Wed Oct 30 08:50:49 2013 +0530
+++ b/source/Lib/TLibEncoder/NALwrite.h Wed Oct 30 09:17:09 2013 +0530
@@ -61,17 +61,17 @@
uint32_t temporalID = 0,
uint32_t reserved_zero_6bits = 0)
: NALUnit(nalUnitType, temporalID, reserved_zero_6bits)
- , m_Bitstream()
+ , m_bitstream()
{}
OutputNALUnit& operator =(const NALUnit& src)
{
- m_Bitstream.clear();
+ m_bitstream.clear();
static_cast<NALUnit*>(this)->operator =(src);
return *this;
}
- TComOutputBitstream m_Bitstream;
+ TComOutputBitstream m_bitstream;
};
void write(uint8_t*& out, OutputNALUnit& nalu, uint32_t& packetSize);
diff -r a7e349a5e32e -r 6e1439b991f0 source/encoder/frameencoder.cpp
--- a/source/encoder/frameencoder.cpp Wed Oct 30 08:50:49 2013 +0530
+++ b/source/encoder/frameencoder.cpp Wed Oct 30 09:17:09 2013 +0530
@@ -188,25 +188,25 @@
/* headers for start of bitstream */
OutputNALUnit nalu(NAL_UNIT_VPS);
- entropyCoder->setBitstream(&nalu.m_Bitstream);
+ entropyCoder->setBitstream(&nalu.m_bitstream);
entropyCoder->encodeVPS(m_cfg->getVPS());
- writeRBSPTrailingBits(nalu.m_Bitstream);
+ writeRBSPTrailingBits(nalu.m_bitstream);
CHECKED_MALLOC(nalunits[count], NALUnitEBSP, 1);
nalunits[count]->init(nalu);
count++;
nalu = NALUnit(NAL_UNIT_SPS);
- entropyCoder->setBitstream(&nalu.m_Bitstream);
+ entropyCoder->setBitstream(&nalu.m_bitstream);
entropyCoder->encodeSPS(&m_sps);
- writeRBSPTrailingBits(nalu.m_Bitstream);
+ writeRBSPTrailingBits(nalu.m_bitstream);
CHECKED_MALLOC(nalunits[count], NALUnitEBSP, 1);
nalunits[count]->init(nalu);
count++;
nalu = NALUnit(NAL_UNIT_PPS);
- entropyCoder->setBitstream(&nalu.m_Bitstream);
+ entropyCoder->setBitstream(&nalu.m_bitstream);
entropyCoder->encodePPS(&m_pps);
- writeRBSPTrailingBits(nalu.m_Bitstream);
+ writeRBSPTrailingBits(nalu.m_bitstream);
CHECKED_MALLOC(nalunits[count], NALUnitEBSP, 1);
nalunits[count]->init(nalu);
count++;
@@ -220,9 +220,9 @@
sei.numSpsIdsMinus1 = 0;
sei.activeSeqParamSetId = m_sps.getSPSId();
- entropyCoder->setBitstream(&nalu.m_Bitstream);
- m_seiWriter.writeSEImessage(nalu.m_Bitstream, sei, &m_sps);
- writeRBSPTrailingBits(nalu.m_Bitstream);
+ entropyCoder->setBitstream(&nalu.m_bitstream);
+ m_seiWriter.writeSEImessage(nalu.m_bitstream, sei, &m_sps);
+ writeRBSPTrailingBits(nalu.m_bitstream);
CHECKED_MALLOC(nalunits[count], NALUnitEBSP, 1);
nalunits[count]->init(nalu);
count++;
@@ -237,9 +237,9 @@
sei.anticlockwiseRotation = m_cfg->getDisplayOrientationSEIAngle();
nalu = NALUnit(NAL_UNIT_PREFIX_SEI);
- entropyCoder->setBitstream(&nalu.m_Bitstream);
- m_seiWriter.writeSEImessage(nalu.m_Bitstream, sei, &m_sps);
- writeRBSPTrailingBits(nalu.m_Bitstream);
+ entropyCoder->setBitstream(&nalu.m_bitstream);
+ m_seiWriter.writeSEImessage(nalu.m_bitstream, sei, &m_sps);
+ writeRBSPTrailingBits(nalu.m_bitstream);
CHECKED_MALLOC(nalunits[count], NALUnitEBSP, 1);
nalunits[count]->init(nalu);
}
@@ -499,8 +499,8 @@
SEIGradualDecodingRefreshInfo seiGradualDecodingRefreshInfo;
seiGradualDecodingRefreshInfo.m_gdrForegroundFlag = true; // Indicating all "foreground"
- m_seiWriter.writeSEImessage(nalu.m_Bitstream, seiGradualDecodingRefreshInfo, slice->getSPS());
- writeRBSPTrailingBits(nalu.m_Bitstream);
+ m_seiWriter.writeSEImessage(nalu.m_bitstream, seiGradualDecodingRefreshInfo, slice->getSPS());
+ writeRBSPTrailingBits(nalu.m_bitstream);
m_nalList[m_nalCount] = (NALUnitEBSP*)X265_MALLOC(NALUnitEBSP, 1);
if (m_nalList[m_nalCount])
{
@@ -516,8 +516,8 @@
sei_recovery_point.m_exactMatchingFlag = (slice->getPOC() == 0) ? (true) : (false);
sei_recovery_point.m_brokenLinkFlag = false;
- m_seiWriter.writeSEImessage(nalu.m_Bitstream, sei_recovery_point, slice->getSPS());
- writeRBSPTrailingBits(nalu.m_Bitstream);
+ m_seiWriter.writeSEImessage(nalu.m_bitstream, sei_recovery_point, slice->getSPS());
+ writeRBSPTrailingBits(nalu.m_bitstream);
m_nalList[m_nalCount] = (NALUnitEBSP*)X265_MALLOC(NALUnitEBSP, 1);
if (m_nalList[m_nalCount])
{
@@ -565,7 +565,7 @@
/* start slice NALunit */
bool sliceSegment = !slice->isNextSlice();
OutputNALUnit nalu(slice->getNalUnitType(), 0);
- entropyCoder->setBitstream(&nalu.m_Bitstream);
+ entropyCoder->setBitstream(&nalu.m_bitstream);
entropyCoder->encodeSliceHeader(slice);
// is it needed?
@@ -601,7 +601,7 @@
}
else
{
- entropyCoder->setBitstream(&nalu.m_Bitstream);
+ entropyCoder->setBitstream(&nalu.m_bitstream);
}
// for now, override the TILES_DECODER setting in order to write substreams.
@@ -616,7 +616,7 @@
{
// Construct the final bitstream by flushing and concatenating substreams.
- // The final bitstream is either nalu.m_Bitstream or pcBitstreamRedirect;
+ // The final bitstream is either nalu.m_bitstream or pcBitstreamRedirect;
uint32_t* substreamSizes = slice->getSubstreamSizes();
for (int i = 0; i < numSubstreams; i++)
{
@@ -638,7 +638,7 @@
// Complete the slice header info.
entropyCoder->setEntropyCoder(&m_sbacCoder, slice);
- entropyCoder->setBitstream(&nalu.m_Bitstream);
+ entropyCoder->setBitstream(&nalu.m_bitstream);
entropyCoder->encodeTilesWPPEntryPoint(slice);
// Substreams...
@@ -654,14 +654,14 @@
// current NALU is the last NALU of slice and a NALU was buffered, then (a)
// Write current NALU (b) Update an write buffered NALU at appropriate
// location in NALU list.
- nalu.m_Bitstream.writeByteAlignment(); // Slice header byte-alignment
+ nalu.m_bitstream.writeByteAlignment(); // Slice header byte-alignment
// Perform bitstream concatenation
if (bitstreamRedirect->getNumberOfWrittenBits() > 0)
{
- nalu.m_Bitstream.addSubstream(bitstreamRedirect);
+ nalu.m_bitstream.addSubstream(bitstreamRedirect);
}
- entropyCoder->setBitstream(&nalu.m_Bitstream);
+ entropyCoder->setBitstream(&nalu.m_bitstream);
bitstreamRedirect->clear();
m_nalList[m_nalCount] = (NALUnitEBSP*)X265_MALLOC(NALUnitEBSP, 1);
if (m_nalList[m_nalCount])
@@ -698,8 +698,8 @@
}
}
OutputNALUnit onalu(NAL_UNIT_SUFFIX_SEI, 0);
- m_seiWriter.writeSEImessage(onalu.m_Bitstream, m_seiReconPictureDigest, slice->getSPS());
- writeRBSPTrailingBits(onalu.m_Bitstream);
+ m_seiWriter.writeSEImessage(onalu.m_bitstream, m_seiReconPictureDigest, slice->getSPS());
+ writeRBSPTrailingBits(onalu.m_bitstream);
m_nalList[m_nalCount] = (NALUnitEBSP*)X265_MALLOC(NALUnitEBSP, 1);
if (m_nalList[m_nalCount])
More information about the x265-devel
mailing list