issue72: bugfix for "Variable "bestPrmId" is overrode"

source/Lib/EncoderLib/EncNNFilterHOP.cpp

@@ -133,26 +133,15 @@ void EncNNFilterHOP::chooseParameters(Picture &pic)
       getScaledBuf(scaleId, prmId).copyFrom(getScaledBuf(0, prmId));
     }
   }
-
-  double minCost = MAX_DOUBLE, minScaledCost = MAX_DOUBLE;
-  std::vector<int> bestPrmId(picprms.prmId);
-
-  // find best parameters without scaling and store them
-  parameterSearch(pic, minCost, bestPrmId, -1);
-  int mode = picprms.sprm.mode;
   
-  // find best parameters with scaling
-  for (int scaleId = 0; scaleId < 4; scaleId++) 
+  double minCost = MAX_DOUBLE;
+  std::vector<int> bestPrmId;
+
+  // find best parameters without or with scaling
+  for (int scaleId = -1; scaleId < 4; scaleId++)
   {
     scalePicture(pic, scaleId);
-    parameterSearch(pic, minScaledCost, bestPrmId, scaleId);
-  }
-  
-  // compare w/ scaling and w/o scaling
-  if (minCost <= minScaledCost)
-  {
-    picprms.sprm.mode = mode;
-    picprms.sprm.scaleFlag = -1;
+    parameterSearch(pic, minCost, bestPrmId, scaleId);
   }
   picprms.prmId = bestPrmId;
 
@@ -234,10 +223,6 @@ void EncNNFilterHOP::parameterSearch(Picture &pic, double &minCost, std::vector<
   
 
   int tempMode = picprms.sprm.mode;
-  if (scaleId == -1 || scaleId == 0) 
-  {
-    picprms.sprm.scaleFlag = scaleId;
-  }
   picprms.sprm.mode = prmNum;
   double rateAdpt = getSignalingCost(pic); // rate of adaptation
   double rateScale = MAX_NUM_COMPONENT * (log2ResidueScale + 1); //rate of signalling scales
@@ -326,6 +311,9 @@ void EncNNFilterHOP::scaleFactorDerivation(Picture &pic, FilterParameters &prms,
 
 void EncNNFilterHOP::scalePicture(Picture &pic, int scaleId)
 {
+  if (scaleId < 0 || scaleId > 3)
+    return;
+
   CodingStructure&  cs            = *pic.cs;
   const PreCalcValues& pcv        = *cs.pcv;
   FilterParameters &prms = getPicprms();