# HG changeset patch
# User Steve Borho <st...@borho.org>
# Date 1382590791 18000
# Wed Oct 23 23:59:51 2013 -0500
# Node ID 13b37033e5a0359ea7cdb4c41573a96443920db1
# Parent cd4fa5415069a700e45c018688a6363deff096f5
TComSlice: remove unused copySliceInfo
diff -r cd4fa5415069 -r 13b37033e5a0 source/Lib/TLibCommon/TComSlice.cpp
--- a/source/Lib/TLibCommon/TComSlice.cpp Wed Oct 23 23:59:39 2013 -0500
+++ b/source/Lib/TLibCommon/TComSlice.cpp Wed Oct 23 23:59:51 2013 -0500
@@ -445,92 +445,6 @@
}
}
-void TComSlice::copySliceInfo(TComSlice *src)
-{
- assert(src != NULL);
-
- int i, j, k;
-
- m_poc = src->m_poc;
- m_nalUnitType = src->m_nalUnitType;
- m_sliceType = src->m_sliceType;
- m_sliceQp = src->m_sliceQp;
- m_sliceQpBase = src->m_sliceQpBase;
- m_deblockingFilterDisable = src->m_deblockingFilterDisable;
- m_deblockingFilterOverrideFlag = src->m_deblockingFilterOverrideFlag;
- m_deblockingFilterBetaOffsetDiv2 = src->m_deblockingFilterBetaOffsetDiv2;
- m_deblockingFilterTcOffsetDiv2 = src->m_deblockingFilterTcOffsetDiv2;
-
- for (i = 0; i < 2; i++)
- {
- m_numRefIdx[i] = src->m_numRefIdx[i];
- }
-
- m_bCheckLDC = src->m_bCheckLDC;
- m_sliceQpDelta = src->m_sliceQpDelta;
- m_sliceQpDeltaCb = src->m_sliceQpDeltaCb;
- m_sliceQpDeltaCr = src->m_sliceQpDeltaCr;
- for (i = 0; i < 2; i++)
- {
- for (j = 0; j < MAX_NUM_REF; j++)
- {
- m_refPicList[i][j] = src->m_refPicList[i][j];
- m_refPOCList[i][j] = src->m_refPOCList[i][j];
- }
- }
-
- for (i = 0; i < 2; i++)
- {
- for (j = 0; j < MAX_NUM_REF + 1; j++)
- {
- m_bIsUsedAsLongTerm[i][j] = src->m_bIsUsedAsLongTerm[i][j];
- }
- }
-
- // referenced slice
- m_bReferenced = src->m_bReferenced;
-
- // access channel
- m_sps = src->m_sps;
- m_pps = src->m_pps;
- m_rps = src->m_rps;
- m_lastIDR = src->m_lastIDR;
-
- m_pic = src->m_pic;
-
- m_colFromL0Flag = src->m_colFromL0Flag;
- m_colRefIdx = src->m_colRefIdx;
- for (i = 0; i < 2; i++)
- {
- for (j = 0; j < MAX_NUM_REF; j++)
- {
- for (k = 0; k < MAX_NUM_REF; k++)
- {
- m_bEqualRef[i][j][k] = src->m_bEqualRef[i][j][k];
- }
- }
- }
-
- m_sliceCurEndCUAddr = src->m_sliceCurEndCUAddr;
- m_nextSlice = src->m_nextSlice;
- for (int e = 0; e < 2; e++)
- {
- for (int n = 0; n < MAX_NUM_REF; n++)
- {
- memcpy(m_weightPredTable[e][n], src->m_weightPredTable[e][n],
sizeof(wpScalingParam) * 3);
- }
- }
-
- m_saoEnabledFlag = src->m_saoEnabledFlag;
- m_saoEnabledFlagChroma = src->m_saoEnabledFlagChroma;
- m_cabacInitFlag = src->m_cabacInitFlag;
- m_numEntryPointOffsets = src->m_numEntryPointOffsets;
-
- m_bLMvdL1Zero = src->m_bLMvdL1Zero;
- m_enableTMVPFlag = src->m_enableTMVPFlag;
- m_maxNumMergeCand = src->m_maxNumMergeCand;
-}
-
/** get AC and DC values for weighted pred
* \param *wp
* \returns void
diff -r cd4fa5415069 -r 13b37033e5a0 source/Lib/TLibCommon/TComSlice.h
--- a/source/Lib/TLibCommon/TComSlice.h Wed Oct 23 23:59:39 2013 -0500
+++ b/source/Lib/TLibCommon/TComSlice.h Wed Oct 23 23:59:51 2013 -0500
@@ -1515,8 +1515,6 @@
UInt getSliceCurEndCUAddr() { return m_sliceCurEndCUAddr; }
- void copySliceInfo(TComSlice *pcSliceSrc);
-
void setNextSlice(bool b) { m_nextSlice = b; }
bool isNextSlice() { return m_nextSlice; }
_______________________________________________
x265-devel mailing list
x265-devel@videolan.org
https://mailman.videolan.org/listinfo/x265-devel
