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( ...@@ -193,7 +193,7 @@ AttributeDecoder::decodeReflectances(
break; break;
case TransformType::kIntegerLift: case TransformType::kIntegerLift:
decodeReflectancesIntegerLift(decoder, pointCloud); decodeReflectancesPred(decoder, pointCloud);
break; break;
case TransformType::kLift: case TransformType::kLift:
...@@ -222,7 +222,7 @@ AttributeDecoder::decodeColors( ...@@ -222,7 +222,7 @@ AttributeDecoder::decodeColors(
case TransformType::kRAHT: decodeColorsRaht(decoder, pointCloud); break; case TransformType::kRAHT: decodeColorsRaht(decoder, pointCloud); break;
case TransformType::kIntegerLift: case TransformType::kIntegerLift:
decodeColorsIntegerLift(decoder, pointCloud); decodeColorsPred(decoder, pointCloud);
break; break;
case TransformType::kLift: decodeColorsLift(decoder, pointCloud); break; case TransformType::kLift: decodeColorsLift(decoder, pointCloud); break;
...@@ -271,7 +271,7 @@ computeReflectancePredictionWeights( ...@@ -271,7 +271,7 @@ computeReflectancePredictionWeights(
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void void
AttributeDecoder::decodeReflectancesIntegerLift( AttributeDecoder::decodeReflectancesPred(
PCCResidualsDecoder& decoder, PCCPointSet3& pointCloud) PCCResidualsDecoder& decoder, PCCPointSet3& pointCloud)
{ {
std::vector<PCCPredictor> predictors; std::vector<PCCPredictor> predictors;
...@@ -347,7 +347,7 @@ AttributeDecoder::computeColorPredictionWeights( ...@@ -347,7 +347,7 @@ AttributeDecoder::computeColorPredictionWeights(
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void void
AttributeDecoder::decodeColorsIntegerLift( AttributeDecoder::decodeColorsPred(
PCCResidualsDecoder& decoder, PCCPointSet3& pointCloud) PCCResidualsDecoder& decoder, PCCPointSet3& pointCloud)
{ {
std::vector<PCCPredictor> predictors; std::vector<PCCPredictor> predictors;
......
...@@ -69,11 +69,11 @@ protected: ...@@ -69,11 +69,11 @@ protected:
void void
decodeColorsLift(PCCResidualsDecoder& decoder, PCCPointSet3& pointCloud); decodeColorsLift(PCCResidualsDecoder& decoder, PCCPointSet3& pointCloud);
void decodeReflectancesIntegerLift( void decodeReflectancesPred(
PCCResidualsDecoder& decoder, PCCPointSet3& pointCloud); PCCResidualsDecoder& decoder, PCCPointSet3& pointCloud);
void decodeColorsIntegerLift( void
PCCResidualsDecoder& decoder, PCCPointSet3& pointCloud); decodeColorsPred(PCCResidualsDecoder& decoder, PCCPointSet3& pointCloud);
void decodeReflectancesRaht( void decodeReflectancesRaht(
PCCResidualsDecoder& decoder, PCCPointSet3& pointCloud); PCCResidualsDecoder& decoder, PCCPointSet3& pointCloud);
......
...@@ -339,7 +339,7 @@ AttributeEncoder::encodeReflectances( ...@@ -339,7 +339,7 @@ AttributeEncoder::encodeReflectances(
break; break;
case TransformType::kIntegerLift: case TransformType::kIntegerLift:
encodeReflectancesIntegerLift(reflectanceParams, pointCloud, encoder); encodeReflectancesPred(reflectanceParams, pointCloud, encoder);
break; break;
case TransformType::kLift: case TransformType::kLift:
...@@ -373,7 +373,7 @@ AttributeEncoder::encodeColors( ...@@ -373,7 +373,7 @@ AttributeEncoder::encodeColors(
break; break;
case TransformType::kIntegerLift: case TransformType::kIntegerLift:
encodeColorsIntegerLift(colorParams, pointCloud, encoder); encodeColorsPred(colorParams, pointCloud, encoder);
break; break;
case TransformType::kLift: case TransformType::kLift:
...@@ -456,7 +456,7 @@ AttributeEncoder::computeReflectancePredictionWeights( ...@@ -456,7 +456,7 @@ AttributeEncoder::computeReflectancePredictionWeights(
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void void
AttributeEncoder::encodeReflectancesIntegerLift( AttributeEncoder::encodeReflectancesPred(
const PCCAttributeEncodeParamaters& reflectanceParams, const PCCAttributeEncodeParamaters& reflectanceParams,
PCCPointSet3& pointCloud, PCCPointSet3& pointCloud,
PCCResidualsEncoder& encoder) PCCResidualsEncoder& encoder)
...@@ -585,7 +585,7 @@ AttributeEncoder::computeColorPredictionWeights( ...@@ -585,7 +585,7 @@ AttributeEncoder::computeColorPredictionWeights(
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void void
AttributeEncoder::encodeColorsIntegerLift( AttributeEncoder::encodeColorsPred(
const PCCAttributeEncodeParamaters& colorParams, const PCCAttributeEncodeParamaters& colorParams,
PCCPointSet3& pointCloud, PCCPointSet3& pointCloud,
PCCResidualsEncoder& encoder) PCCResidualsEncoder& encoder)
......
...@@ -97,12 +97,12 @@ protected: ...@@ -97,12 +97,12 @@ protected:
PCCPointSet3& pointCloud, PCCPointSet3& pointCloud,
PCCResidualsEncoder& encoder); PCCResidualsEncoder& encoder);
void encodeReflectancesIntegerLift( void encodeReflectancesPred(
const PCCAttributeEncodeParamaters& reflectanceParams, const PCCAttributeEncodeParamaters& reflectanceParams,
PCCPointSet3& pointCloud, PCCPointSet3& pointCloud,
PCCResidualsEncoder& encoder); PCCResidualsEncoder& encoder);
void encodeColorsIntegerLift( void encodeColorsPred(
const PCCAttributeEncodeParamaters& colorParams, const PCCAttributeEncodeParamaters& colorParams,
PCCPointSet3& pointCloud, PCCPointSet3& pointCloud,
PCCResidualsEncoder& encoder); PCCResidualsEncoder& encoder);
......
...@@ -287,9 +287,9 @@ ParseParameters(int argc, char* argv[], Parameters& params) ...@@ -287,9 +287,9 @@ ParseParameters(int argc, char* argv[], Parameters& params)
("transformType", ("transformType",
params_attr.transformType, TransformType::kIntegerLift, params_attr.transformType, TransformType::kIntegerLift,
"Coding method to use for attribute:\n" "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" " 1: Region Adaptive Hierarchical Transform (RAHT)\n"
" 2: Nearest neighbour prediction with lifting transform") " 2: Hierarichical neighbourhood prediction as lifting transform")
("rahtLeafDecimationDepth", ("rahtLeafDecimationDepth",
params_attr.binaryLevelThresholdRaht, 3, 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