Commit 4d1d2ac6 authored by David Flynn's avatar David Flynn
Browse files

attr: rename "IntegerLift" coding method to "Pred"

The IntegerLift name is misleading in light of a separate coding method
that uses lifting predict and update operators.  This commit renames
the method to specify it is a prediction-only scheme.
parent 5eee0d72
......@@ -193,7 +193,7 @@ AttributeDecoder::decodeReflectances(
break;
case TransformType::kIntegerLift:
decodeReflectancesIntegerLift(decoder, pointCloud);
decodeReflectancesPred(decoder, pointCloud);
break;
case TransformType::kLift:
......@@ -222,7 +222,7 @@ AttributeDecoder::decodeColors(
case TransformType::kRAHT: decodeColorsRaht(decoder, pointCloud); break;
case TransformType::kIntegerLift:
decodeColorsIntegerLift(decoder, pointCloud);
decodeColorsPred(decoder, pointCloud);
break;
case TransformType::kLift: decodeColorsLift(decoder, pointCloud); break;
......@@ -271,7 +271,7 @@ computeReflectancePredictionWeights(
//----------------------------------------------------------------------------
void
AttributeDecoder::decodeReflectancesIntegerLift(
AttributeDecoder::decodeReflectancesPred(
PCCResidualsDecoder& decoder, PCCPointSet3& pointCloud)
{
std::vector<PCCPredictor> predictors;
......@@ -347,7 +347,7 @@ AttributeDecoder::computeColorPredictionWeights(
//----------------------------------------------------------------------------
void
AttributeDecoder::decodeColorsIntegerLift(
AttributeDecoder::decodeColorsPred(
PCCResidualsDecoder& decoder, PCCPointSet3& pointCloud)
{
std::vector<PCCPredictor> predictors;
......
......@@ -69,11 +69,11 @@ protected:
void
decodeColorsLift(PCCResidualsDecoder& decoder, PCCPointSet3& pointCloud);
void decodeReflectancesIntegerLift(
void decodeReflectancesPred(
PCCResidualsDecoder& decoder, PCCPointSet3& pointCloud);
void decodeColorsIntegerLift(
PCCResidualsDecoder& decoder, PCCPointSet3& pointCloud);
void
decodeColorsPred(PCCResidualsDecoder& decoder, PCCPointSet3& pointCloud);
void decodeReflectancesRaht(
PCCResidualsDecoder& decoder, PCCPointSet3& pointCloud);
......
......@@ -339,7 +339,7 @@ AttributeEncoder::encodeReflectances(
break;
case TransformType::kIntegerLift:
encodeReflectancesIntegerLift(reflectanceParams, pointCloud, encoder);
encodeReflectancesPred(reflectanceParams, pointCloud, encoder);
break;
case TransformType::kLift:
......@@ -373,7 +373,7 @@ AttributeEncoder::encodeColors(
break;
case TransformType::kIntegerLift:
encodeColorsIntegerLift(colorParams, pointCloud, encoder);
encodeColorsPred(colorParams, pointCloud, encoder);
break;
case TransformType::kLift:
......@@ -456,7 +456,7 @@ AttributeEncoder::computeReflectancePredictionWeights(
//----------------------------------------------------------------------------
void
AttributeEncoder::encodeReflectancesIntegerLift(
AttributeEncoder::encodeReflectancesPred(
const PCCAttributeEncodeParamaters& reflectanceParams,
PCCPointSet3& pointCloud,
PCCResidualsEncoder& encoder)
......@@ -585,7 +585,7 @@ AttributeEncoder::computeColorPredictionWeights(
//----------------------------------------------------------------------------
void
AttributeEncoder::encodeColorsIntegerLift(
AttributeEncoder::encodeColorsPred(
const PCCAttributeEncodeParamaters& colorParams,
PCCPointSet3& pointCloud,
PCCResidualsEncoder& encoder)
......
......@@ -97,12 +97,12 @@ protected:
PCCPointSet3& pointCloud,
PCCResidualsEncoder& encoder);
void encodeReflectancesIntegerLift(
void encodeReflectancesPred(
const PCCAttributeEncodeParamaters& reflectanceParams,
PCCPointSet3& pointCloud,
PCCResidualsEncoder& encoder);
void encodeColorsIntegerLift(
void encodeColorsPred(
const PCCAttributeEncodeParamaters& colorParams,
PCCPointSet3& pointCloud,
PCCResidualsEncoder& encoder);
......
......@@ -287,9 +287,9 @@ ParseParameters(int argc, char* argv[], Parameters& params)
("transformType",
params_attr.transformType, TransformType::kIntegerLift,
"Coding method to use for attribute:\n"
" 0: Nearest neighbour prediction with integer lifting transform\n"
" 0: Hierarchical neighbourhood prediction\n"
" 1: Region Adaptive Hierarchical Transform (RAHT)\n"
" 2: Nearest neighbour prediction with lifting transform")
" 2: Hierarichical neighbourhood prediction as lifting transform")
("rahtLeafDecimationDepth",
params_attr.binaryLevelThresholdRaht, 3,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment