clean up parser and coder for WP

source/Lib/DecoderLib/VLCReader.h

@@ -177,12 +177,11 @@ public:
   void  parseTerminatingBit ( uint32_t& ruiBit );
   void  parseRemainingBytes ( bool noTrailingBytesExpected );
 
-#if JVET_Q0819_PH_CHANGES //Hendry
-  void parsePredWeightTable( Slice *pcSlice, PicHeader *picHeader, const SPS *sps );
-#else
   void  parsePredWeightTable( Slice* pcSlice, const SPS *sps );
+#if JVET_Q0819_PH_CHANGES
+  void parsePredWeightTable ( PicHeader *picHeader, const SPS *sps );
 #endif
-  void parseScalingList(ScalingList *scalingList);
+  void  parseScalingList    ( ScalingList* scalingList );
   void  decodeScalingList   ( ScalingList *scalingList, uint32_t scalingListId, bool isPredictor);
   void parseReshaper        ( SliceReshapeInfo& sliceReshaperInfo, const SPS* pcSPS, const bool isIntra );
   void alfFilter( AlfParam& alfParam, const bool isChroma, const int altIdx );

source/Lib/EncoderLib/VLCWriter.h

@@ -115,10 +115,9 @@ public:
 private:
   void xCodeRefPicList( const ReferencePictureList* rpl, bool isLongTermPresent, uint32_t ltLsbBitsCount, const bool isForbiddenZeroDeltaPoc );
   bool xFindMatchingLTRP        ( Slice* pcSlice, uint32_t *ltrpsIndex, int ltrpPOC, bool usedFlag );
+  void xCodePredWeightTable     ( Slice* pcSlice );
 #if JVET_Q0819_PH_CHANGES
-  void xCodePredWeightTable     ( Slice *pcSlice, PicHeader *picHeader, const SPS *sps );
-#else
-  void xCodePredWeightTable     ( Slice *pcSlice );
+  void xCodePredWeightTable     ( PicHeader *picHeader, const SPS *sps );
 #endif
   void xCodeScalingList         ( const ScalingList* scalingList, uint32_t scalinListId, bool isPredictor);
 public: