[x265-commits] [x265] getopt: grab an unambiguously LGPL version of getopt
Steve Borho
steve at borho.org
Thu Oct 17 03:39:45 CEST 2013
details: http://hg.videolan.org/x265/rev/60a105fed8c8
branches:
changeset: 4504:60a105fed8c8
user: Steve Borho <steve at borho.org>
date: Mon Oct 14 13:55:22 2013 -0500
description:
getopt: grab an unambiguously LGPL version of getopt
Found at: https://github.com/Tietew/mediawiki-xml2sql/tree/master/getopt
The only change made was to move getopt_long() into getopt.c from getopt1.c
# HG changeset patch
# User Steve Borho <steve at borho.org>
# Date 1381776922 18000
# Mon Oct 14 13:55:22 2013 -0500
# Node ID b6cca1b1a9b700a8ffc316f3186dbf10bc1149cc
# Parent abae6903e0af0d9940bb734ba34dff6928d72e61
getopt: grab an unambiguously LGPL version of getopt
Found at: https://github.com/Tietew/mediawiki-xml2sql/tree/master/getopt
The only change made was to move getopt_long() into getopt.c from getopt1.c
Subject: [x265] uncrustify: do not remove whitespace in an empty brace section {}
details: http://hg.videolan.org/x265/rev/6405dca03059
branches:
changeset: 4505:6405dca03059
user: Steve Borho <steve at borho.org>
date: Wed Oct 16 19:35:51 2013 -0500
description:
uncrustify: do not remove whitespace in an empty brace section {}
(just ignore it)
Subject: [x265] uncrustify: allow uncrustify to process .cpp and .h in common/x86
details: http://hg.videolan.org/x265/rev/03be69eab3db
branches:
changeset: 4506:03be69eab3db
user: Steve Borho <steve at borho.org>
date: Wed Oct 16 20:02:06 2013 -0500
description:
uncrustify: allow uncrustify to process .cpp and .h in common/x86
Subject: [x265] uncrustify entire source tree
details: http://hg.videolan.org/x265/rev/1d6b3626f1b3
branches:
changeset: 4507:1d6b3626f1b3
user: Steve Borho <steve at borho.org>
date: Wed Oct 16 20:38:44 2013 -0500
description:
uncrustify entire source tree
diffstat:
doc/uncrustify/apply-to-all-source.py | 2 +-
doc/uncrustify/codingstyle.cfg | 2 +-
source/CMakeLists.txt | 4 +-
source/Lib/TLibCommon/ContextModel.h | 1 -
source/Lib/TLibCommon/ContextModel3DBuffer.h | 1 -
source/Lib/TLibCommon/ContextTables.h | 1 -
source/Lib/TLibCommon/TComBitCounter.h | 1 +
source/Lib/TLibCommon/TComBitStream.cpp | 22 +-
source/Lib/TLibCommon/TComDataCU.cpp | 34 +-
source/Lib/TLibCommon/TComDataCU.h | 6 +-
source/Lib/TLibCommon/TComLoopFilter.cpp | 28 +-
source/Lib/TLibCommon/TComPattern.cpp | 4 +-
source/Lib/TLibCommon/TComPic.h | 1 -
source/Lib/TLibCommon/TComPicSym.h | 1 -
source/Lib/TLibCommon/TComPicYuv.cpp | 4 +-
source/Lib/TLibCommon/TComPicYuv.h | 1 +
source/Lib/TLibCommon/TComPicYuvMD5.cpp | 1 -
source/Lib/TLibCommon/TComPrediction.cpp | 1 +
source/Lib/TLibCommon/TComPrediction.h | 2 +-
source/Lib/TLibCommon/TComRom.cpp | 34 +-
source/Lib/TLibCommon/TComSampleAdaptiveOffset.cpp | 1 -
source/Lib/TLibCommon/TComSampleAdaptiveOffset.h | 1 +
source/Lib/TLibCommon/TComSlice.cpp | 3 +-
source/Lib/TLibCommon/TComSlice.h | 8 +-
source/Lib/TLibCommon/TComTrQuant.cpp | 50 +-
source/Lib/TLibCommon/TComTrQuant.h | 4 +-
source/Lib/TLibCommon/TComWeightPrediction.cpp | 11 +-
source/Lib/TLibCommon/TComYuv.cpp | 20 +-
source/Lib/TLibEncoder/NALwrite.cpp | 19 +-
source/Lib/TLibEncoder/NALwrite.h | 1 -
source/Lib/TLibEncoder/SyntaxElementWriter.cpp | 1 +
source/Lib/TLibEncoder/TEncAnalyze.h | 15 +-
source/Lib/TLibEncoder/TEncBinCoderCABAC.h | 1 +
source/Lib/TLibEncoder/TEncSampleAdaptiveOffset.cpp | 4 +-
source/Lib/TLibEncoder/TEncSampleAdaptiveOffset.h | 5 +-
source/Lib/TLibEncoder/TEncSbac.cpp | 8 +-
source/Lib/TLibEncoder/TEncSbac.h | 1 +
source/Lib/TLibEncoder/TEncSearch.cpp | 3 +-
source/common/TShortYUV.cpp | 3 +-
source/common/common.cpp | 20 +-
source/common/common.h | 24 +-
source/common/cpu.h | 2 -
source/common/ipfilter.cpp | 4 +-
source/common/lowres.cpp | 23 +-
source/common/lowres.h | 3 +-
source/common/piclist.cpp | 3 +
source/common/piclist.h | 5 +-
source/common/pixel.cpp | 23 +-
source/common/primitives.cpp | 14 +-
source/common/reference.cpp | 2 +-
source/common/threading.cpp | 2 +-
source/common/threading.h | 12 +-
source/common/vec/blockcopy-avx2.cpp | 4 +-
source/common/vec/blockcopy-sse3.cpp | 13 +-
source/common/vec/dct-sse3.cpp | 3 +-
source/common/vec/dct-sse41.cpp | 16 +-
source/common/vec/intra-sse3.cpp | 161 +-
source/common/vec/intra-sse41.cpp | 5 +-
source/common/vec/ipfilter-sse41.cpp | 27 +-
source/common/vec/ipfilter-ssse3.cpp | 25 +-
source/common/vec/pixel-avx2.cpp | 15 +-
source/common/vec/pixel-sse3.cpp | 7 +-
source/common/vec/pixel-sse41.cpp | 590 ++++---
source/common/vec/pixel-ssse3.cpp | 7 +-
source/common/vec/pixel16-sse41.cpp | 12 +-
source/common/vec/vec-primitives.cpp | 8 +-
source/common/x86/asm-primitives.cpp | 254 +-
source/common/x86/pixel.h | 385 ++--
source/compat/msvc/LGPL.txt | 504 +++++++
source/compat/msvc/getopt.c | 1323 +++++++++---------
source/compat/msvc/getopt.h | 90 +-
source/dllmain.cpp | 1 +
source/encoder/compress.cpp | 8 +-
source/encoder/cturow.h | 3 +-
source/encoder/dpb.cpp | 4 +-
source/encoder/encoder.cpp | 29 +-
source/encoder/frameencoder.cpp | 26 +-
source/encoder/framefilter.cpp | 11 +-
source/encoder/motion.cpp | 21 +-
source/encoder/motion.h | 2 +-
source/encoder/ratecontrol.cpp | 30 +-
source/encoder/slicetype.cpp | 26 +-
source/input/y4m.cpp | 19 +-
source/input/y4m.h | 4 +-
source/input/yuv.cpp | 14 +-
source/input/yuv.h | 6 +-
source/test/intrapredharness.cpp | 1 +
source/test/ipfilterharness.cpp | 7 +-
source/test/pixelharness.cpp | 11 +-
source/test/pixelharness.h | 2 +-
source/test/testbench.cpp | 4 +-
source/test/testharness.h | 2 +-
source/x265.cpp | 149 +-
source/x265.h | 23 +-
94 files changed, 2464 insertions(+), 1835 deletions(-)
diffs (truncated from 8088 to 300 lines):
diff -r 258394d8ab91 -r 1d6b3626f1b3 doc/uncrustify/apply-to-all-source.py
--- a/doc/uncrustify/apply-to-all-source.py Wed Oct 16 18:30:40 2013 -0500
+++ b/doc/uncrustify/apply-to-all-source.py Wed Oct 16 20:38:44 2013 -0500
@@ -5,7 +5,7 @@ import subprocess
import shutil
EXTENSIONS = ['.h', '.cpp', '.inc', '.c']
-EXCLUDES = ['VectorClass', 'compat', 'x86']
+EXCLUDES = ['VectorClass', 'compat']
candidates = []
for (dirpath, dirnames, filenames) in os.walk('../../source'):
diff -r 258394d8ab91 -r 1d6b3626f1b3 doc/uncrustify/codingstyle.cfg
--- a/doc/uncrustify/codingstyle.cfg Wed Oct 16 18:30:40 2013 -0500
+++ b/doc/uncrustify/codingstyle.cfg Wed Oct 16 20:38:44 2013 -0500
@@ -209,7 +209,7 @@ sp_func_proto_paren=remove
sp_incdec=remove
sp_inside_angle=remove
sp_inside_braces=add
-sp_inside_braces_empty=remove
+#sp_inside_braces_empty=remove
sp_inside_fparen=remove
sp_inside_fparens=remove
sp_inside_paren=remove
diff -r 258394d8ab91 -r 1d6b3626f1b3 source/CMakeLists.txt
--- a/source/CMakeLists.txt Wed Oct 16 18:30:40 2013 -0500
+++ b/source/CMakeLists.txt Wed Oct 16 20:38:44 2013 -0500
@@ -204,8 +204,8 @@ if(ENABLE_CLI)
file(GLOB OutputFiles output/*.cpp output/*.h)
source_group(input FILES ${InputFiles})
source_group(output FILES ${OutputFiles})
- if (MSVC)
- set_source_files_properties(compat/msvc/getopt.c PROPERTIES COMPILE_FLAGS "/wd4100")
+ if(MSVC)
+ set_source_files_properties(compat/msvc/getopt.c PROPERTIES COMPILE_FLAGS "/wd4100 /wd4131 -DHAVE_STRING_H=1")
elseif(GCC)
set_source_files_properties(compat/msvc/getopt.c PROPERTIES COMPILE_FLAGS "-Wno-unused-parameter")
endif()
diff -r 258394d8ab91 -r 1d6b3626f1b3 source/Lib/TLibCommon/ContextModel.h
--- a/source/Lib/TLibCommon/ContextModel.h Wed Oct 16 18:30:40 2013 -0500
+++ b/source/Lib/TLibCommon/ContextModel.h Wed Oct 16 20:38:44 2013 -0500
@@ -46,7 +46,6 @@
namespace x265 {
// private namespace
-
// ====================================================================================================================
// Class definition
// ====================================================================================================================
diff -r 258394d8ab91 -r 1d6b3626f1b3 source/Lib/TLibCommon/ContextModel3DBuffer.h
--- a/source/Lib/TLibCommon/ContextModel3DBuffer.h Wed Oct 16 18:30:40 2013 -0500
+++ b/source/Lib/TLibCommon/ContextModel3DBuffer.h Wed Oct 16 20:38:44 2013 -0500
@@ -55,7 +55,6 @@
namespace x265 {
// private namespace
-
/// context model 3D buffer class
class ContextModel3DBuffer
{
diff -r 258394d8ab91 -r 1d6b3626f1b3 source/Lib/TLibCommon/ContextTables.h
--- a/source/Lib/TLibCommon/ContextTables.h Wed Oct 16 18:30:40 2013 -0500
+++ b/source/Lib/TLibCommon/ContextTables.h Wed Oct 16 20:38:44 2013 -0500
@@ -101,7 +101,6 @@
namespace x265 {
// private namespace
-
// initial probability for cu_transquant_bypass flag
static const UChar
INIT_CU_TRANSQUANT_BYPASS_FLAG[3][NUM_CU_TRANSQUANT_BYPASS_FLAG_CTX] =
diff -r 258394d8ab91 -r 1d6b3626f1b3 source/Lib/TLibCommon/TComBitCounter.h
--- a/source/Lib/TLibCommon/TComBitCounter.h Wed Oct 16 18:30:40 2013 -0500
+++ b/source/Lib/TLibCommon/TComBitCounter.h Wed Oct 16 20:38:44 2013 -0500
@@ -64,6 +64,7 @@ public:
virtual ~TComBitCounter() {}
void write(UInt /*uiBits*/, UInt uiNumberOfBits) { m_uiBitCounter += uiNumberOfBits; }
+
void writeByte(UInt /*val*/) { m_uiBitCounter += 8; }
void resetBits() { m_uiBitCounter = 0; }
diff -r 258394d8ab91 -r 1d6b3626f1b3 source/Lib/TLibCommon/TComBitStream.cpp
--- a/source/Lib/TLibCommon/TComBitStream.cpp Wed Oct 16 18:30:40 2013 -0500
+++ b/source/Lib/TLibCommon/TComBitStream.cpp Wed Oct 16 20:38:44 2013 -0500
@@ -53,7 +53,7 @@ using namespace x265;
TComOutputBitstream::TComOutputBitstream()
{
- m_fifo = (uint8_t *)X265_MALLOC(uint8_t, MIN_FIFO_SIZE);
+ m_fifo = (uint8_t*)X265_MALLOC(uint8_t, MIN_FIFO_SIZE);
clear();
}
@@ -162,14 +162,14 @@ void TComOutputBitstream::writeAlignZero
void TComOutputBitstream::addSubstream(TComOutputBitstream* pcSubstream)
{
UInt uiNumBits = pcSubstream->getNumberOfWrittenBits();
-
+
const uint8_t* rbsp = pcSubstream->getFIFO();
-
+
for (UInt count = 0; count < pcSubstream->m_fsize; count++)
{
write(rbsp[count], 8);
}
-
+
if (uiNumBits & 0x7)
{
write(pcSubstream->getHeldBits() >> (8 - (uiNumBits & 0x7)), uiNumBits & 0x7);
@@ -187,7 +187,7 @@ int TComOutputBitstream::countStartCodeE
UInt cnt = 0;
uint8_t *rbsp = getFIFO();
UInt fsize = getByteStreamLength();
-
+
for (UInt count = 0; count < fsize; count++)
{
if ((rbsp[count + 2] == 0x00 || rbsp[count + 2] == 0x01 || rbsp[count + 2] == 0x02 || rbsp[count + 2] == 0x03)
@@ -197,12 +197,12 @@ int TComOutputBitstream::countStartCodeE
count = count + 1;
}
}
+
return cnt;
}
void TComOutputBitstream::push_back(uint8_t val)
{
-
/** Chenck FIFO Size if not reached MIN_FIFO_SIZE and Check Allocated m_fifo Buffer
before push the encoded bit stream to m_fifo */
if (m_fsize < buffsize && m_fifo)
@@ -213,10 +213,11 @@ void TComOutputBitstream::push_back(uint
else
{
buffsize *= 2;
+
/** FIFO size is Reached into MIN_FIFO_SIZE then Reallocate the FIFO and Copy the fifo to new memory
location and continue to push encoded bit streams */
- uint8_t *temp = (uint8_t *)X265_MALLOC(uint8_t, buffsize);
-
+ uint8_t *temp = (uint8_t*)X265_MALLOC(uint8_t, buffsize);
+
/** check Allocated buffer before copy the encoder bitstream and push into FIFO */
if (temp)
{
@@ -224,10 +225,11 @@ void TComOutputBitstream::push_back(uint
temp[m_fsize] = val;
m_fsize++;
X265_FREE(m_fifo);
-
+
/** point the reallocated buffer from temp to fifo, this can be free'd in Distructor */
- m_fifo = temp;
+ m_fifo = temp;
}
}
}
+
//! \}
diff -r 258394d8ab91 -r 1d6b3626f1b3 source/Lib/TLibCommon/TComDataCU.cpp
--- a/source/Lib/TLibCommon/TComDataCU.cpp Wed Oct 16 18:30:40 2013 -0500
+++ b/source/Lib/TLibCommon/TComDataCU.cpp Wed Oct 16 20:38:44 2013 -0500
@@ -197,14 +197,22 @@ void TComDataCU::destroy()
if (m_iPCMSampleY) { X265_FREE(m_iPCMSampleY); m_iPCMSampleY = NULL; }
if (m_iPCMSampleCb) { X265_FREE(m_iPCMSampleCb); m_iPCMSampleCb = NULL; }
if (m_iPCMSampleCr) { X265_FREE(m_iPCMSampleCr); m_iPCMSampleCr = NULL; }
- delete[] m_cuTransquantBypass; m_cuTransquantBypass = NULL;
- delete[] m_mvpIdx[0]; m_mvpIdx[0] = NULL;
- delete[] m_mvpIdx[1]; m_mvpIdx[1] = NULL;
- delete[] m_mvpNum[0]; m_mvpNum[0] = NULL;
- delete[] m_mvpNum[1]; m_mvpNum[1] = NULL;
- delete[] m_skipFlag; m_skipFlag = NULL;
- delete[] m_partSizes; m_partSizes = NULL;
- delete[] m_predModes; m_predModes = NULL;
+ delete[] m_cuTransquantBypass;
+ m_cuTransquantBypass = NULL;
+ delete[] m_mvpIdx[0];
+ m_mvpIdx[0] = NULL;
+ delete[] m_mvpIdx[1];
+ m_mvpIdx[1] = NULL;
+ delete[] m_mvpNum[0];
+ m_mvpNum[0] = NULL;
+ delete[] m_mvpNum[1];
+ m_mvpNum[1] = NULL;
+ delete[] m_skipFlag;
+ m_skipFlag = NULL;
+ delete[] m_partSizes;
+ m_partSizes = NULL;
+ delete[] m_predModes;
+ m_predModes = NULL;
m_cuMvField[0].destroy();
m_cuMvField[1].destroy();
@@ -1116,7 +1124,7 @@ TComDataCU* TComDataCU::getPUAboveRightA
UInt numPartInCUWidth = m_pic->getNumPartInWidth();
if ((m_pic->getCU(m_cuAddr)->getCUPelX() + g_rasterToPelX[absPartIdxRT] + (m_pic->getPicSym()->getMinCUHeight() * partUnitOffset)) >=
- m_slice->getSPS()->getPicWidthInLumaSamples())
+ m_slice->getSPS()->getPicWidthInLumaSamples())
{
arPartUnitIdx = MAX_UINT;
return NULL;
@@ -1174,7 +1182,7 @@ TComDataCU* TComDataCU::getQpMinCuLeft(U
{
UInt numPartInCUWidth = m_pic->getNumPartInWidth();
UInt absZorderQpMinCUIdx = (curAbsIdxInLCU >> ((g_maxCUDepth - getSlice()->getPPS()->getMaxCuDQPDepth()) << 1)) <<
- ((g_maxCUDepth - getSlice()->getPPS()->getMaxCuDQPDepth()) << 1);
+ ((g_maxCUDepth - getSlice()->getPPS()->getMaxCuDQPDepth()) << 1);
UInt absRorderQpMinCUIdx = g_zscanToRaster[absZorderQpMinCUIdx];
// check for left LCU boundary
@@ -1199,7 +1207,7 @@ TComDataCU* TComDataCU::getQpMinCuAbove(
{
UInt numPartInCUWidth = m_pic->getNumPartInWidth();
UInt absZorderQpMinCUIdx = (curAbsIdxInLCU >> ((g_maxCUDepth - getSlice()->getPPS()->getMaxCuDQPDepth()) << 1)) <<
- ((g_maxCUDepth - getSlice()->getPPS()->getMaxCuDQPDepth()) << 1);
+ ((g_maxCUDepth - getSlice()->getPPS()->getMaxCuDQPDepth()) << 1);
UInt absRorderQpMinCUIdx = g_zscanToRaster[absZorderQpMinCUIdx];
// check for top LCU boundary
@@ -1257,7 +1265,7 @@ char TComDataCU::getLastCodedQP(UInt abs
return getPic()->getCU(getAddr())->getLastCodedQP(getZorderIdxInCU());
}
else if (getAddr() > 0 && !(getSlice()->getPPS()->getEntropyCodingSyncEnabledFlag() &&
- getAddr() % getPic()->getFrameWidthInCU() == 0))
+ getAddr() % getPic()->getFrameWidthInCU() == 0))
{
return getPic()->getCU(getAddr() - 1)->getLastCodedQP(getPic()->getNumPartInCU());
}
@@ -2006,7 +2014,7 @@ void TComDataCU::deriveLeftBottomIdx(UIn
void TComDataCU::deriveRightBottomIdx(UInt partIdx, UInt& outPartIdxRB)
{
outPartIdxRB = g_rasterToZscan[g_zscanToRaster[m_absIdxInLCU] + (((m_height[0] / m_pic->getMinCUHeight()) >> 1) - 1) *
- m_pic->getNumPartInWidth() + m_width[0] / m_pic->getMinCUWidth() - 1];
+ m_pic->getNumPartInWidth() + m_width[0] / m_pic->getMinCUWidth() - 1];
switch (m_partSizes[0])
{
diff -r 258394d8ab91 -r 1d6b3626f1b3 source/Lib/TLibCommon/TComDataCU.h
--- a/source/Lib/TLibCommon/TComDataCU.h Wed Oct 16 18:30:40 2013 -0500
+++ b/source/Lib/TLibCommon/TComDataCU.h Wed Oct 16 20:38:44 2013 -0500
@@ -50,7 +50,6 @@
namespace x265 {
// private namespace
-
//! \ingroup TLibCommon
//! \{
@@ -154,6 +153,7 @@ private:
// -------------------------------------------------------------------------------------------------------------------
// misc. variables
// -------------------------------------------------------------------------------------------------------------------
+
protected:
/// add possible motion vector predictor candidates
@@ -178,7 +178,7 @@ public:
UInt64 m_totalCost; ///< sum of partition RD costs
UInt m_totalDistortion; ///< sum of partition distortion
UInt m_totalBits; ///< sum of partition signal bits
-
+
// -------------------------------------------------------------------------------------------------------------------
// create / destroy / initialize / copy
// -------------------------------------------------------------------------------------------------------------------
@@ -285,7 +285,7 @@ public:
int getLastValidPartIdx(int absPartIdx);
char getLastCodedQP(UInt absPartIdx);
void setQPSubCUs(int qp, TComDataCU* cu, UInt absPartIdx, UInt depth, bool &foundNonZeroCbf);
-
+
bool isLosslessCoded(UInt absPartIdx);
UChar* getTransformIdx() { return m_trIdx; }
diff -r 258394d8ab91 -r 1d6b3626f1b3 source/Lib/TLibCommon/TComLoopFilter.cpp
--- a/source/Lib/TLibCommon/TComLoopFilter.cpp Wed Oct 16 18:30:40 2013 -0500
+++ b/source/Lib/TLibCommon/TComLoopFilter.cpp Wed Oct 16 20:38:44 2013 -0500
@@ -137,7 +137,7 @@ void TComLoopFilter::loopFilterPic(TComP
// NOTE: delay one CU to avoid conflict between V and H
if (cuAddr > 0)
{
- cu = pic->getCU(cuAddr-1);
+ cu = pic->getCU(cuAddr - 1);
::memset(m_blockingStrength[EDGE_HOR], 0, sizeof(UChar) * m_numPartitions);
::memset(m_bEdgeFilter[EDGE_HOR], 0, sizeof(bool) * m_numPartitions);
@@ -147,7 +147,7 @@ void TComLoopFilter::loopFilterPic(TComP
// Last H-Filter
{
- TComDataCU* cu = pic->getCU(pic->getNumCUsInFrame()-1);
+ TComDataCU* cu = pic->getCU(pic->getNumCUsInFrame() - 1);
::memset(m_blockingStrength[EDGE_HOR], 0, sizeof(UChar) * m_numPartitions);
::memset(m_bEdgeFilter[EDGE_HOR], 0, sizeof(bool) * m_numPartitions);
More information about the x265-commits
mailing list