# HG changeset patch # User Sumalatha Polureddy<sumala...@multicorewareinc.com> # Date 1404995390 -19800 # Node ID 5c1e6ffb351792d0664ddb3935151f5859866d99 # Parent 30e20a7b6fddd26864ddf4dc5f4e62fa5005f86b enable scalingList feature
diff -r 30e20a7b6fdd -r 5c1e6ffb3517 source/Lib/TLibCommon/TComSlice.cpp --- a/source/Lib/TLibCommon/TComSlice.cpp Wed Jul 09 20:33:52 2014 -0500 +++ b/source/Lib/TLibCommon/TComSlice.cpp Thu Jul 10 17:59:50 2014 +0530 @@ -715,18 +715,6 @@ destroy(); } -/** set default quantization matrix to array -*/ -void TComSlice::setDefaultScalingList() -{ - for (uint32_t sizeId = 0; sizeId < SCALING_LIST_SIZE_NUM; sizeId++) - { - for (uint32_t listId = 0; listId < g_scalingListNum[sizeId]; listId++) - { - getScalingList()->processDefaultMarix(sizeId, listId); - } - } -} /** check if use default quantization matrix * \returns true if use default quantization matrix in all size diff -r 30e20a7b6fdd -r 5c1e6ffb3517 source/Lib/TLibCommon/TComSlice.h --- a/source/Lib/TLibCommon/TComSlice.h Wed Jul 09 20:33:52 2014 -0500 +++ b/source/Lib/TLibCommon/TComSlice.h Thu Jul 10 17:59:50 2014 +0530 @@ -1484,7 +1484,6 @@ TComScalingList* getScalingList() { return m_scalingList; } - void setDefaultScalingList(); bool checkDefaultScalingList(); void setCabacInitFlag(bool val) { m_cabacInitFlag = val; } //!< set CABAC initial flag diff -r 30e20a7b6fdd -r 5c1e6ffb3517 source/encoder/encoder.cpp --- a/source/encoder/encoder.cpp Wed Jul 09 20:33:52 2014 -0500 +++ b/source/encoder/encoder.cpp Thu Jul 10 17:59:50 2014 +0530 @@ -106,6 +106,7 @@ } } + setDefaultScalingList(); /* Allocate thread local data shared by all frame encoders */ ThreadPool *pool = ThreadPool::getThreadPool(); const int poolThreadCount = pool ? pool->getThreadCount() : 1; @@ -247,6 +248,19 @@ } } +/** set default quantization matrix to array +*/ +void Encoder::setDefaultScalingList() +{ + for (uint32_t sizeId = 0; sizeId < SCALING_LIST_SIZE_NUM; sizeId++) + { + for (uint32_t listId = 0; listId < g_scalingListNum[sizeId]; listId++) + { + getScalingList()->processDefaultMarix(sizeId, listId); + } + } +} + /** \param pic_in input original YUV picture or NULL \param pic_out pointer to reconstructed picture struct @@ -1452,7 +1466,7 @@ m_nonPackedConstraintFlag = false; m_frameOnlyConstraintFlag = false; - m_useScalingListId = 0; + m_useScalingListId = 1; m_minSpatialSegmentationIdc = 0; m_neutralChromaIndicationFlag = false; m_pocProportionalToTimingFlag = false; diff -r 30e20a7b6fdd -r 5c1e6ffb3517 source/encoder/encoder.h --- a/source/encoder/encoder.h Wed Jul 09 20:33:52 2014 -0500 +++ b/source/encoder/encoder.h Thu Jul 10 17:59:50 2014 +0530 @@ -204,6 +204,7 @@ char* statsCSVString(EncStats& stat, char* buffer); TComScalingList* getScalingList() { return &m_scalingList; } + void setDefaultScalingList(); void setThreadPool(ThreadPool* p) { m_threadPool = p; } _______________________________________________ x265-devel mailing list x265-devel@videolan.org https://mailman.videolan.org/listinfo/x265-devel