Changeset 1235 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder

Timestamp:

13 Jul 2015, 20:38:11 (10 years ago)

Author:

seregin

Message:

port rev 4219 and rev 4246

Location:

branches/SHM-dev/source/Lib/TLibEncoder

Files:

• SEIwrite.cpp (modified) (17 diffs)
• SEIwrite.h (modified) (4 diffs)
• TEnc3DAsymLUT.cpp (modified) (1 diff)
• TEncCavlc.cpp (modified) (39 diffs)
• TEncCavlc.h (modified) (5 diffs)
• TEncCfg.h (modified) (1 diff)
• TEncCu.cpp (modified) (8 diffs)
• TEncEntropy.cpp (modified) (5 diffs)
• TEncEntropy.h (modified) (6 diffs)
• TEncGOP.cpp (modified) (26 diffs)
• TEncGOP.h (modified) (3 diffs)
• TEncPic.cpp (modified) (1 diff)
• TEncPic.h (modified) (1 diff)
• TEncSbac.cpp (modified) (7 diffs)
• TEncSbac.h (modified) (3 diffs)
• TEncSearch.cpp (modified) (4 diffs)
• TEncSlice.cpp (modified) (9 diffs)
• TEncSlice.h (modified) (3 diffs)
• TEncTop.cpp (modified) (28 diffs)
• TEncTop.h (modified) (7 diffs)
• WeightPredAnalysis.cpp (modified) (5 diffs)
• WeightPredAnalysis.h (modified) (2 diffs)

branches/SHM-dev/source/Lib/TLibEncoder/SEIwrite.cpp

@@ -55 +55 @@
 
 #if O0164_MULTI_LAYER_HRD
-Void SEIWriter::xWriteSEIpayloadData(TComBitIf& bs, const SEI& sei, TComVPS *vps, TComSPS *sps, const SEIScalableNesting* nestingSeiPtr, const SEIBspNesting* bspNestingSeiPtr)
+Void SEIWriter::xWriteSEIpayloadData(TComBitIf& bs, const SEI& sei, const TComVPS *vps, const TComSPS *sps, const SEIScalableNesting* nestingSeiPtr, const SEIBspNesting* bspNestingSeiPtr)
 #else
-Void SEIWriter::xWriteSEIpayloadData(TComBitIf& bs, const SEI& sei, TComSPS *sps)
+Void SEIWriter::xWriteSEIpayloadData(TComBitIf& bs, const SEI& sei, const TComSPS *sps)
 #endif
 {
@@ -215 +215 @@
  */
 #if O0164_MULTI_LAYER_HRD
-Void SEIWriter::writeSEImessage(TComBitIf& bs, const SEI& sei, TComVPS *vps, TComSPS *sps, const SEIScalableNesting* nestingSei, const SEIBspNesting* bspNestingSei)
+Void SEIWriter::writeSEImessage(TComBitIf& bs, const SEI& sei, const TComVPS *vps, const TComSPS *sps, const SEIScalableNesting* nestingSei, const SEIBspNesting* bspNestingSei)
 #else
-Void SEIWriter::writeSEImessage(TComBitIf& bs, const SEI& sei, TComSPS *sps)
+Void SEIWriter::writeSEImessage(TComBitIf& bs, const SEI& sei, const TComSPS *sps)
 #endif
 {
@@ -341 +341 @@
 
 #if SVC_EXTENSION
-Void SEIWriter::xWriteSEIDecodingUnitInfo(const SEIDecodingUnitInfo& sei, TComSPS *sps, const SEIScalableNesting* nestingSei, const SEIBspNesting* bspNestingSei, TComVPS *vps)
-{
-  TComHRD *hrd;
+Void SEIWriter::xWriteSEIDecodingUnitInfo(const SEIDecodingUnitInfo& sei, const TComSPS *sps, const SEIScalableNesting* nestingSei, const SEIBspNesting* bspNestingSei, const TComVPS *vps)
+{
+  const TComHRD *hrd;
   if( bspNestingSei )   // If DU info SEI contained inside a BSP nesting SEI message
   {
@@ -352 +352 @@
     Int maxValues = vps->getNumBspSchedulesMinus1(seiOlsIdx, psIdx, maxTemporalId) + 1;
     std::vector<Int> hrdIdx(maxValues, 0);
-    std::vector<TComHRD *> hrdVec;
+    std::vector<const TComHRD*> hrdVec;
     std::vector<Int> syntaxElemLen(maxValues, 0);
     for(Int i = 0; i < maxValues; i++)
@@ -376 +376 @@
   else
   {
-    TComVUI *vui = sps->getVuiParameters();
+    const TComVUI *vui = sps->getVuiParameters();
     hrd = vui->getHrdParameters();
   }
@@ -392 +392 @@
 }
 #else
-Void SEIWriter::xWriteSEIDecodingUnitInfo(const SEIDecodingUnitInfo& sei, TComSPS *sps)
-{
-  TComVUI *vui = sps->getVuiParameters();
+Void SEIWriter::xWriteSEIDecodingUnitInfo(const SEIDecodingUnitInfo& sei, const TComSPS *sps)
+{
+  const TComVUI *vui = sps->getVuiParameters();
   WRITE_UVLC(sei.m_decodingUnitIdx, "decoding_unit_idx");
   if(vui->getHrdParameters()->getSubPicCpbParamsInPicTimingSEIFlag())
@@ -409 +409 @@
 
 #if SVC_EXTENSION
-Void SEIWriter::xWriteSEIBufferingPeriod(const SEIBufferingPeriod& sei, TComSPS *sps, const SEIScalableNesting* nestingSei, const SEIBspNesting* bspNestingSei, TComVPS *vps)
+Void SEIWriter::xWriteSEIBufferingPeriod(const SEIBufferingPeriod& sei, const TComSPS *sps, const SEIScalableNesting* nestingSei, const SEIBspNesting* bspNestingSei, const TComVPS *vps)
 #else
-Void SEIWriter::xWriteSEIBufferingPeriod(const SEIBufferingPeriod& sei, TComSPS *sps)
+Void SEIWriter::xWriteSEIBufferingPeriod(const SEIBufferingPeriod& sei, const TComSPS *sps)
 #endif
 {
   Int i, nalOrVcl;
 #if SVC_EXTENSION
-  TComHRD *hrd;
+  const TComHRD *hrd;
   if( bspNestingSei )   // If BP SEI contained inside a BSP nesting SEI message
   {
@@ -425 +425 @@
     Int maxValues = vps->getNumBspSchedulesMinus1(seiOlsIdx, psIdx, maxTemporalId) + 1;
     std::vector<Int> hrdIdx(maxValues, 0);
-    std::vector<TComHRD *> hrdVec;
+    std::vector<const TComHRD*> hrdVec;
     std::vector<Int> syntaxElemLen(maxValues, 0);
     for(i = 0; i < maxValues; i++)
@@ -448 +448 @@
   else
   {
-    TComVUI *vui = sps->getVuiParameters();
+    const TComVUI *vui = sps->getVuiParameters();
     hrd = vui->getHrdParameters();
   }
   // To be done: When contained in an BSP HRD SEI message, the hrd structure is to be chosen differently.
 #else
-  TComVUI *vui = sps->getVuiParameters();
-  TComHRD *hrd = vui->getHrdParameters();
+  const TComVUI *vui = sps->getVuiParameters();
+  const TComHRD *hrd = vui->getHrdParameters();
 #endif
 
@@ -495 +495 @@
 
 #if SVC_EXTENSION
-Void SEIWriter::xWriteSEIPictureTiming(const SEIPictureTiming& sei,  TComSPS *sps, const SEIScalableNesting* nestingSei, const SEIBspNesting* bspNestingSei, TComVPS *vps)
+Void SEIWriter::xWriteSEIPictureTiming(const SEIPictureTiming& sei, const TComSPS *sps, const SEIScalableNesting* nestingSei, const SEIBspNesting* bspNestingSei, const TComVPS *vps)
 #else
-Void SEIWriter::xWriteSEIPictureTiming(const SEIPictureTiming& sei,  TComSPS *sps)
+Void SEIWriter::xWriteSEIPictureTiming(const SEIPictureTiming& sei, const TComSPS *sps)
 #endif
 {
   Int i;
 #if SVC_EXTENSION
-  TComHRD *hrd;    
-  TComVUI *vui = sps->getVuiParameters(); 
+  const TComHRD *hrd;    
+  const TComVUI *vui = sps->getVuiParameters(); 
   if( bspNestingSei )   // If BP SEI contained inside a BSP nesting SEI message
   {
@@ -512 +512 @@
     Int maxValues = vps->getNumBspSchedulesMinus1(seiOlsIdx, psIdx, maxTemporalId) + 1;
     std::vector<Int> hrdIdx(maxValues, 0);
-    std::vector<TComHRD *> hrdVec;
+    std::vector<const TComHRD*> hrdVec;
     std::vector<Int> syntaxElemLen(maxValues, 0);
     for(i = 0; i < maxValues; i++)
@@ -543 +543 @@
   // To be done: When contained in an BSP HRD SEI message, the hrd structure is to be chosen differently.
 #else
-  TComVUI *vui = sps->getVuiParameters();
-  TComHRD *hrd = vui->getHrdParameters();
+  const TComVUI *vui = sps->getVuiParameters();
+  const TComHRD *hrd = vui->getHrdParameters();
 #endif
 
@@ -752 +752 @@
 
 #if O0164_MULTI_LAYER_HRD
-Void SEIWriter::xWriteSEIScalableNesting(TComBitIf& bs, const SEIScalableNesting& sei, TComVPS *vps, TComSPS *sps)
+Void SEIWriter::xWriteSEIScalableNesting(TComBitIf& bs, const SEIScalableNesting& sei, const TComVPS *vps, const TComSPS *sps)
 #else
-Void SEIWriter::xWriteSEIScalableNesting(TComBitIf& bs, const SEIScalableNesting& sei, TComSPS *sps)
+Void SEIWriter::xWriteSEIScalableNesting(TComBitIf& bs, const SEIScalableNesting& sei, const TComSPS *sps)
 #endif
 {
@@ -1130 +1130 @@
 
 #if O0164_MULTI_LAYER_HRD
-Void SEIWriter::xWriteSEIBspNesting(TComBitIf& bs, const SEIBspNesting &sei, TComVPS *vps, TComSPS *sps, const SEIScalableNesting &nestingSei)
+Void SEIWriter::xWriteSEIBspNesting(TComBitIf& bs, const SEIBspNesting &sei, const TComVPS *vps, const TComSPS *sps, const SEIScalableNesting &nestingSei)
 {
   WRITE_UVLC( sei.m_bspIdx, "bsp_idx" );
@@ -1149 +1149 @@
 }
 
-Void SEIWriter::xWriteSEIBspInitialArrivalTime(const SEIBspInitialArrivalTime &sei, TComVPS *vps, TComSPS *sps, const SEIScalableNesting &nestingSei, const SEIBspNesting &bspNestingSei)
+Void SEIWriter::xWriteSEIBspInitialArrivalTime(const SEIBspInitialArrivalTime &sei, const TComVPS *vps, const TComSPS *sps, const SEIScalableNesting &nestingSei, const SEIBspNesting &bspNestingSei)
 {
   assert(vps->getVpsVuiPresentFlag());
 
-#if SVC_EXTENSION
   Int psIdx = bspNestingSei.m_seiPartitioningSchemeIdx;
   Int seiOlsIdx = bspNestingSei.m_seiOlsIdx;
@@ -1159 +1158 @@
   Int maxValues = vps->getNumBspSchedulesMinus1(seiOlsIdx, psIdx, maxTemporalId) + 1;
   std::vector<Int> hrdIdx(maxValues, 0);
-  std::vector<TComHRD *> hrdVec;
+  std::vector<const TComHRD*> hrdVec;
   std::vector<Int> syntaxElemLen(maxValues, 0);
   for(Int i = 0; i < maxValues; i++)
@@ -1191 +1190 @@
     }
   }
-#else
-  UInt schedCombCnt = vps->getNumBspSchedCombinations(nestingSei.m_nestingOpIdx[0]);
-  UInt len;
-  UInt hrdIdx;
-
-  if (schedCombCnt > 0)
-  {
-    hrdIdx = vps->getBspCombHrdIdx(nestingSei.m_nestingOpIdx[0], 0, bspNestingSei.m_bspIdx);
-  }
-  else
-  {
-    hrdIdx = 0;
-  }
-
-  TComHRD *hrd = vps->getBspHrd(hrdIdx);
-
-  if (hrd->getNalHrdParametersPresentFlag() || hrd->getVclHrdParametersPresentFlag())
-  {
-    len = hrd->getInitialCpbRemovalDelayLengthMinus1() + 1;
-  }
-  else
-  {
-    len = 23 + 1;
-  }
-
-  if (hrd->getNalHrdParametersPresentFlag())
-  {
-    for(UInt i = 0; i < schedCombCnt; i++)
-    {
-      WRITE_CODE( sei.m_nalInitialArrivalDelay[i], len, "nal_initial_arrival_delay" );
-    }
-  }
-#if BSP_INIT_ARRIVAL_SEI
-  if( hrd->getVclHrdParametersPresentFlag() )
-#else
-  else
-#endif
-  {
-    for(UInt i = 0; i < schedCombCnt; i++)
-    {
-      WRITE_CODE( sei.m_vclInitialArrivalDelay[i], len, "vcl_initial_arrival_delay" );
-    }
-  }
-#endif
 }
 

branches/SHM-dev/source/Lib/TLibEncoder/SEIwrite.h

@@ -51 +51 @@
 
 #if O0164_MULTI_LAYER_HRD
-  Void writeSEImessage(TComBitIf& bs, const SEI& sei, TComVPS *vps, TComSPS *sps, const SEIScalableNesting* nestingSei=NULL, const SEIBspNesting* bspNestingSei=NULL);
+  Void writeSEImessage(TComBitIf& bs, const SEI& sei, const TComVPS *vps, const TComSPS *sps, const SEIScalableNesting* nestingSei=NULL, const SEIBspNesting* bspNestingSei=NULL);
 #else
-  Void writeSEImessage(TComBitIf& bs, const SEI& sei, TComSPS *sps);
+  Void writeSEImessage(TComBitIf& bs, const SEI& sei, const TComSPS *sps);
 #endif
 
 protected:
 #if O0164_MULTI_LAYER_HRD
-  Void xWriteSEIpayloadData(TComBitIf& bs, const SEI& sei, TComVPS *vps, TComSPS *sps, const SEIScalableNesting* nestingSei, const SEIBspNesting* bspNestingSei);
+  Void xWriteSEIpayloadData(TComBitIf& bs, const SEI& sei, const TComVPS *vps, const TComSPS *sps, const SEIScalableNesting* nestingSei, const SEIBspNesting* bspNestingSei);
 #else
-  Void xWriteSEIpayloadData(TComBitIf& bs, const SEI& sei, TComSPS *sps);
+  Void xWriteSEIpayloadData(TComBitIf& bs, const SEI& sei, const TComSPS *sps);
 #endif
   Void xWriteSEIuserDataUnregistered(const SEIuserDataUnregistered &sei);
@@ -66 +66 @@
   Void xWriteSEIDecodedPictureHash(const SEIDecodedPictureHash& sei);
 #if SVC_EXTENSION
-  Void xWriteSEIDecodingUnitInfo(const SEIDecodingUnitInfo& sei, TComSPS *sps, const SEIScalableNesting* nestingSei, const SEIBspNesting* bspNestingSei, TComVPS *vps);
-  Void xWriteSEIBufferingPeriod(const SEIBufferingPeriod& sei, TComSPS *sps, const SEIScalableNesting* nestingSei, const SEIBspNesting* bspNestingSei, TComVPS *vps);
-  Void xWriteSEIPictureTiming(const SEIPictureTiming& sei, TComSPS *sps, const SEIScalableNesting* nestingSei, const SEIBspNesting* bspNestingSei, TComVPS *vps);
+  Void xWriteSEIDecodingUnitInfo(const SEIDecodingUnitInfo& sei, const TComSPS *sps, const SEIScalableNesting* nestingSei, const SEIBspNesting* bspNestingSei, const TComVPS *vps);
+  Void xWriteSEIBufferingPeriod(const SEIBufferingPeriod& sei, const TComSPS *sps, const SEIScalableNesting* nestingSei, const SEIBspNesting* bspNestingSei, const TComVPS *vps);
+  Void xWriteSEIPictureTiming(const SEIPictureTiming& sei, const TComSPS *sps, const SEIScalableNesting* nestingSei, const SEIBspNesting* bspNestingSei, const TComVPS *vps);
 #else
-  Void xWriteSEIDecodingUnitInfo(const SEIDecodingUnitInfo& sei, TComSPS *sps);
-  Void xWriteSEIBufferingPeriod(const SEIBufferingPeriod& sei, TComSPS *sps);
-  Void xWriteSEIPictureTiming(const SEIPictureTiming& sei, TComSPS *sps);
+  Void xWriteSEIDecodingUnitInfo(const SEIDecodingUnitInfo& sei, const TComSPS *sps);
+  Void xWriteSEIBufferingPeriod(const SEIBufferingPeriod& sei, const TComSPS *sps);
+  Void xWriteSEIPictureTiming(const SEIPictureTiming& sei, const TComSPS *sps);
 #endif
   TComSPS *m_pSPS;
@@ -85 +85 @@
   Void xWriteSEISOPDescription(const SEISOPDescription& sei);
 #if O0164_MULTI_LAYER_HRD
-  Void xWriteSEIScalableNesting(TComBitIf& bs, const SEIScalableNesting& sei, TComVPS *vps, TComSPS *sps);
+  Void xWriteSEIScalableNesting(TComBitIf& bs, const SEIScalableNesting& sei, const TComVPS *vps, const TComSPS *sps);
 #else
-  Void xWriteSEIScalableNesting(TComBitIf& bs, const SEIScalableNesting& sei, TComSPS *sps);
+  Void xWriteSEIScalableNesting(TComBitIf& bs, const SEIScalableNesting& sei, const TComSPS *sps);
 #endif
   Void xWriteSEITempMotionConstrainedTileSets(TComBitIf& bs, const SEITempMotionConstrainedTileSets& sei);
@@ -110 +110 @@
 #endif
 #if Q0189_TMVP_CONSTRAINTS 
-Void xWriteSEITMVPConstraints (const SEITMVPConstrains &sei);
+Void xWriteSEITMVPConstraints(const SEITMVPConstrains &sei);
 #endif
 #if Q0247_FRAME_FIELD_INFO
-  Void xWriteSEIFrameFieldInfo  (const SEIFrameFieldInfo &sei);
+  Void xWriteSEIFrameFieldInfo(const SEIFrameFieldInfo &sei);
 #endif
 #if O0164_MULTI_LAYER_HRD
-  Void xWriteSEIBspNesting(TComBitIf& bs, const SEIBspNesting &sei, TComVPS *vps, TComSPS *sps, const SEIScalableNesting &nestingSei);
-  Void xWriteSEIBspInitialArrivalTime(const SEIBspInitialArrivalTime &sei, TComVPS *vps, TComSPS *sps, const SEIScalableNesting &nestingSei, const SEIBspNesting &bspNestingSei);
+  Void xWriteSEIBspNesting(TComBitIf& bs, const SEIBspNesting &sei, const TComVPS *vps, const TComSPS *sps, const SEIScalableNesting &nestingSei);
+  Void xWriteSEIBspInitialArrivalTime(const SEIBspInitialArrivalTime &sei, const TComVPS *vps, const TComSPS *sps, const SEIScalableNesting &nestingSei, const SEIBspNesting &bspNestingSei);
   Void xCodeHrdParameters( TComHRD *hrd, Bool commonInfPresentFlag, UInt maxNumSubLayersMinus1 );
 #endif

branches/SHM-dev/source/Lib/TLibEncoder/TEnc3DAsymLUT.cpp

@@ -509 +509 @@
   TComSlice * pSlice = pCurPic->getSlice(pCurPic->getCurrSliceIdx());
   UInt refLayerId = pSlice->getVPS()->getRefLayerId(pSlice->getLayerId(), refLayerIdc);
-  const Window &scalEL = pSlice->getPPS()->getScaledRefLayerWindowForLayer(refLayerId); 
+  Window scalEL = pSlice->getPPS()->getScaledRefLayerWindowForLayer(refLayerId); 
   TComPicYuv *pcRecPicBL = pSlice->getBaseColPic(refLayerIdc)->getPicYuvRec();
   // borders of down-sampled picture

branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -96 +96 @@
 }
 
-Void TEncCavlc::codeShortTermRefPicSet( TComSPS* pcSPS, TComReferencePictureSet* rps, Bool calledFromSliceHeader, Int idx)
+Void TEncCavlc::codeShortTermRefPicSet( const TComReferencePictureSet* rps, Bool calledFromSliceHeader, Int idx)
 {
 #if PRINT_RPS_INFO
@@ -153 +153 @@
 
 
-Void TEncCavlc::codePPS( TComPPS* pcPPS 
 #if CGS_3D_ASYMLUT
-  , TEnc3DAsymLUT * pc3DAsymLUT
-#endif
-  )
+Void TEncCavlc::codePPS( const TComPPS* pcPPS, TEnc3DAsymLUT * pc3DAsymLUT )
+#else
+Void TEncCavlc::codePPS( const TComPPS* pcPPS )
+#endif
 {
 #if ENC_DEC_TRACE
   xTracePPSHeader (pcPPS);
 #endif
-
-  const UInt numberValidComponents = getNumberValidComponents(pcPPS->getSPS()->getChromaFormatIdc());
 
   WRITE_UVLC( pcPPS->getPPSId(),                             "pps_pic_parameter_set_id" );
@@ -184 +182 @@
   }
 
-  WRITE_SVLC( COMPONENT_Cb<numberValidComponents ?  (pcPPS->getQpOffset(COMPONENT_Cb)) : 0, "pps_cb_qp_offset" );
-  WRITE_SVLC( COMPONENT_Cr<numberValidComponents ?  (pcPPS->getQpOffset(COMPONENT_Cr)) : 0, "pps_cr_qp_offset" );
-
-  assert(numberValidComponents <= 3); // if more than 3 components (eg 4:4:4:4), then additional offsets will have to go in extension area...
+  WRITE_SVLC( pcPPS->getQpOffset(COMPONENT_Cb), "pps_cb_qp_offset" );
+  WRITE_SVLC( pcPPS->getQpOffset(COMPONENT_Cr), "pps_cr_qp_offset" );
 
   WRITE_FLAG( pcPPS->getSliceChromaQpFlag() ? 1 : 0,          "pps_slice_chroma_qp_offsets_present_flag" );
@@ -232 +228 @@
   if( pcPPS->getScalingListPresentFlag() )
   {
-    codeScalingList( m_pcSlice->getScalingList() );
+    codeScalingList( pcPPS->getScalingList() );
   }
   WRITE_FLAG( pcPPS->getListsModificationPresentFlag(), "lists_modification_present_flag");
@@ -320 +316 @@
               WRITE_CODE( pcPPS->getRefLocationOffsetLayerId(k), 6, "ref_loc_offset_layer_id" );
               WRITE_FLAG( pcPPS->getScaledRefLayerOffsetPresentFlag(k) ? 1 : 0, "scaled_ref_layer_offset_prsent_flag" );
-              if (pcPPS->getScaledRefLayerOffsetPresentFlag(k))
+              if( pcPPS->getScaledRefLayerOffsetPresentFlag(k) )
               {
                 Window scaledWindow = pcPPS->getScaledRefLayerWindow(k);
@@ -328 +324 @@
                 WRITE_SVLC( scaledWindow.getWindowBottomOffset() >> 1, "scaled_ref_layer_bottom_offset" );
               }
+
               WRITE_FLAG( pcPPS->getRefRegionOffsetPresentFlag(k) ? 1 : 0, "ref_region_offset_prsent_flag" );
-              if (pcPPS->getRefRegionOffsetPresentFlag(k))
+
+              if( pcPPS->getRefRegionOffsetPresentFlag(k) )
               {
-                Window refWindow = pcPPS->getRefLayerWindow(k);
+                const Window refWindow = pcPPS->getRefLayerWindow(k);
                 WRITE_SVLC( refWindow.getWindowLeftOffset()   >> 1, "ref_region_left_offset" );
                 WRITE_SVLC( refWindow.getWindowTopOffset()    >> 1, "ref_region_top_offset" );
@@ -337 +335 @@
                 WRITE_SVLC( refWindow.getWindowBottomOffset() >> 1, "ref_region_bottom_offset" );
               }
+
               WRITE_FLAG( pcPPS->getResamplePhaseSetPresentFlag(k) ? 1 : 0, "resample_phase_set_present_flag" );
-              if (pcPPS->getResamplePhaseSetPresentFlag(k))
+
+              if( pcPPS->getResamplePhaseSetPresentFlag(k) )
               {
                 WRITE_UVLC( pcPPS->getPhaseHorLuma(k), "phase_hor_luma" );
@@ -367 +367 @@
 }
 
-Void TEncCavlc::codeVUI( TComVUI *pcVUI, TComSPS* pcSPS )
+Void TEncCavlc::codeVUI( const TComVUI *pcVUI, const TComSPS* pcSPS )
 {
 #if ENC_DEC_TRACE
@@ -421 +421 @@
     WRITE_UVLC(defaultDisplayWindow.getWindowBottomOffset()/ TComSPS::getWinUnitY(pcSPS->getChromaFormatIdc()), "def_disp_win_bottom_offset");
   }
-  TimingInfo *timingInfo = pcVUI->getTimingInfo();
+  const TimingInfo *timingInfo = pcVUI->getTimingInfo();
   WRITE_FLAG(timingInfo->getTimingInfoPresentFlag(),          "vui_timing_info_present_flag");
   if(timingInfo->getTimingInfoPresentFlag())
@@ -453 +453 @@
 }
 
-Void TEncCavlc::codeHrdParameters( TComHRD *hrd, Bool commonInfPresentFlag, UInt maxNumSubLayersMinus1 )
+Void TEncCavlc::codeHrdParameters( const TComHRD *hrd, Bool commonInfPresentFlag, UInt maxNumSubLayersMinus1 )
 {
   if( commonInfPresentFlag )
@@ -484 +484 @@
   {
     WRITE_FLAG( hrd->getFixedPicRateFlag( i ) ? 1 : 0,          "fixed_pic_rate_general_flag");
+    Bool fixedPixRateWithinCvsFlag = true;
     if( !hrd->getFixedPicRateFlag( i ) )
     {
+      fixedPixRateWithinCvsFlag = hrd->getFixedPicRateWithinCvsFlag( i );
       WRITE_FLAG( hrd->getFixedPicRateWithinCvsFlag( i ) ? 1 : 0, "fixed_pic_rate_within_cvs_flag");
     }
-    else
-    {
-      hrd->setFixedPicRateWithinCvsFlag( i, true );
-    }
-    if( hrd->getFixedPicRateWithinCvsFlag( i ) )
+    if( fixedPixRateWithinCvsFlag )
     {
       WRITE_UVLC( hrd->getPicDurationInTcMinus1( i ),           "elemental_duration_in_tc_minus1");
@@ -526 +524 @@
 }
 
-Void TEncCavlc::codeSPS( TComSPS* pcSPS )
+Void TEncCavlc::codeSPS( const TComSPS* pcSPS )
 {
 #if SVC_EXTENSION
@@ -662 +660 @@
     if(pcSPS->getScalingListPresentFlag())
     {
-      codeScalingList( m_pcSlice->getScalingList() );
+      codeScalingList( pcSPS->getScalingList() );
     }
 #if SVC_EXTENSION
@@ -683 +681 @@
   assert( pcSPS->getMaxTLayers() > 0 );
 
-  TComRPSList* rpsList = pcSPS->getRPSList();
-  TComReferencePictureSet*      rps;
+  const TComRPSList* rpsList = pcSPS->getRPSList();
 
   WRITE_UVLC(rpsList->getNumberOfReferencePictureSets(), "num_short_term_ref_pic_sets" );
   for(Int i=0; i < rpsList->getNumberOfReferencePictureSets(); i++)
   {
-    rps = rpsList->getReferencePictureSet(i);
-    codeShortTermRefPicSet(pcSPS,rps,false, i);
+    const TComReferencePictureSet*rps = rpsList->getReferencePictureSet(i);
+    codeShortTermRefPicSet( rps,false, i);
   }
   WRITE_FLAG( pcSPS->getLongTermRefsPresent() ? 1 : 0,         "long_term_ref_pics_present_flag" );
@@ -778 +775 @@
 }
 
-Void TEncCavlc::codeVPS( TComVPS* pcVPS )
+Void TEncCavlc::codeVPS( const TComVPS* pcVPS )
 {
   WRITE_CODE( pcVPS->getVPSId(),                    4,        "vps_video_parameter_set_id" );
@@ -824 +821 @@
   assert( pcVPS->getMaxNuhReservedZeroLayerId() < MAX_VPS_NUH_RESERVED_ZERO_LAYER_ID_PLUS1 );
   WRITE_CODE( pcVPS->getMaxNuhReservedZeroLayerId(), 6,     "vps_max_nuh_reserved_zero_layer_id" );
-  pcVPS->setMaxOpSets(1);
   WRITE_UVLC( pcVPS->getMaxOpSets() - 1,                    "vps_max_op_sets_minus1" );
   for( UInt opsIdx = 1; opsIdx <= ( pcVPS->getMaxOpSets() - 1 ); opsIdx ++ )
@@ -832 +828 @@
     {
       // Only applicable for version 1
-      pcVPS->setLayerIdIncludedFlag( true, opsIdx, i );
+      // pcVPS->setLayerIdIncludedFlag( true, opsIdx, i );
 #endif
       WRITE_FLAG( pcVPS->getLayerIdIncludedFlag( opsIdx, i ) ? 1 : 0, "layer_id_included_flag[opsIdx][i]" );
@@ -838 +834 @@
   }
 
-  TimingInfo *timingInfo = pcVPS->getTimingInfo();
+  const TimingInfo *timingInfo = pcVPS->getTimingInfo();
   WRITE_FLAG(timingInfo->getTimingInfoPresentFlag(),          "vps_timing_info_present_flag");
   if(timingInfo->getTimingInfoPresentFlag())
@@ -849 +845 @@
       WRITE_UVLC(timingInfo->getNumTicksPocDiffOneMinus1(),   "vps_num_ticks_poc_diff_one_minus1");
     }
-    pcVPS->setNumHrdParameters( 0 );
     WRITE_UVLC( pcVPS->getNumHrdParameters(),                 "vps_num_hrd_parameters" );
 
     if( pcVPS->getNumHrdParameters() > 0 )
     {
-      pcVPS->createHrdParamBuffer();
-    }
-    for( UInt i = 0; i < pcVPS->getNumHrdParameters(); i ++ )
-    {
-      // Only applicable for version 1
-      pcVPS->setHrdOpSetIdx( 0, i );
-      WRITE_UVLC( pcVPS->getHrdOpSetIdx( i ),                "hrd_op_set_idx" );
-      if( i > 0 )
-      {
-        WRITE_FLAG( pcVPS->getCprmsPresentFlag( i ) ? 1 : 0, "cprms_present_flag[i]" );
-      }
-      codeHrdParameters(pcVPS->getHrdParameters(i), pcVPS->getCprmsPresentFlag( i ), pcVPS->getMaxTLayers() - 1);
+      for( UInt i = 0; i < pcVPS->getNumHrdParameters(); i ++ )
+      {
+        // Only applicable for version 1
+        WRITE_UVLC( pcVPS->getHrdOpSetIdx( i ),                "hrd_op_set_idx" );
+        if( i > 0 )
+        {
+          WRITE_FLAG( pcVPS->getCprmsPresentFlag( i ) ? 1 : 0, "cprms_present_flag[i]" );
+        }
+        codeHrdParameters(pcVPS->getHrdParameters(i), pcVPS->getCprmsPresentFlag( i ), pcVPS->getMaxTLayers() - 1);
+      }
     }
   }
@@ -1004 +997 @@
     {
 #endif
-      TComReferencePictureSet* rps = pcSlice->getRPS();
+      const TComReferencePictureSet* rps = pcSlice->getRPS();
 
       // check for bitstream restriction stating that:
@@ -1023 +1016 @@
       {
         WRITE_FLAG( 0, "short_term_ref_pic_set_sps_flag");
-        codeShortTermRefPicSet(pcSlice->getSPS(), rps, true, pcSlice->getSPS()->getRPSList()->getNumberOfReferencePictureSets());
+        codeShortTermRefPicSet( rps, true, pcSlice->getSPS()->getRPSList()->getNumberOfReferencePictureSets());
       }
       else
@@ -1247 +1240 @@
       {
         SliceType sliceType   = pcSlice->getSliceType();
-        Int  encCABACTableIdx = pcSlice->getPPS()->getEncCABACTableIdx();
+        SliceType  encCABACTableIdx = pcSlice->getEncCABACTableIdx();
         Bool encCabacInitFlag = (sliceType!=encCABACTableIdx && encCABACTableIdx!=I_SLICE) ? true : false;
         pcSlice->setCabacInitFlag( encCabacInitFlag );
@@ -1318 +1311 @@
 }
 
-Void TEncCavlc::codePTL( TComPTL* pcPTL, Bool profilePresentFlag, Int maxNumSubLayersMinus1)
+Void TEncCavlc::codePTL( const TComPTL* pcPTL, Bool profilePresentFlag, Int maxNumSubLayersMinus1)
 {
   if(profilePresentFlag)
@@ -1364 +1357 @@
   }
 }
-Void TEncCavlc::codeProfileTier( ProfileTierLevel* ptl )
+Void TEncCavlc::codeProfileTier( const ProfileTierLevel* ptl )
 {
   WRITE_CODE( ptl->getProfileSpace(), 2 ,     "XXX_profile_space[]");
@@ -1734 +1727 @@
  *  \param scalingList quantization matrix information
  */
-Void TEncCavlc::codeScalingList( TComScalingList* scalingList )
-{
-  UInt listId,sizeId;
-  Bool scalingListPredModeFlag;
-
+Void TEncCavlc::codeScalingList( const TComScalingList &scalingList )
+{
   //for each size
-  for(sizeId = 0; sizeId < SCALING_LIST_SIZE_NUM; sizeId++)
-  {
-    Int predListStep = (sizeId == SCALING_LIST_32x32? (SCALING_LIST_NUM/NUMBER_OF_PREDICTION_MODES) : 1); // if 32x32, skip over chroma entries.
-
-    for(listId = 0; listId < SCALING_LIST_NUM; listId+=predListStep)
-    {
-      scalingListPredModeFlag = scalingList->checkPredMode( sizeId, listId );
+  for(UInt sizeId = 0; sizeId < SCALING_LIST_SIZE_NUM; sizeId++)
+  {
+    const Int predListStep = (sizeId == SCALING_LIST_32x32? (SCALING_LIST_NUM/NUMBER_OF_PREDICTION_MODES) : 1); // if 32x32, skip over chroma entries.
+
+    for(UInt listId = 0; listId < SCALING_LIST_NUM; listId+=predListStep)
+    {
+      Bool scalingListPredModeFlag = scalingList.getScalingListPredModeFlag(sizeId, listId);
       WRITE_FLAG( scalingListPredModeFlag, "scaling_list_pred_mode_flag" );
       if(!scalingListPredModeFlag)// Copy Mode
@@ -1753 +1743 @@
         {
           // adjust the code, to cope with the missing chroma entries
-          WRITE_UVLC( ((Int)listId - (Int)scalingList->getRefMatrixId (sizeId,listId)) / (SCALING_LIST_NUM/NUMBER_OF_PREDICTION_MODES), "scaling_list_pred_matrix_id_delta");
+          WRITE_UVLC( ((Int)listId - (Int)scalingList.getRefMatrixId (sizeId,listId)) / (SCALING_LIST_NUM/NUMBER_OF_PREDICTION_MODES), "scaling_list_pred_matrix_id_delta");
         }
         else
         {
-          WRITE_UVLC( (Int)listId - (Int)scalingList->getRefMatrixId (sizeId,listId), "scaling_list_pred_matrix_id_delta");
+          WRITE_UVLC( (Int)listId - (Int)scalingList.getRefMatrixId (sizeId,listId), "scaling_list_pred_matrix_id_delta");
         }
       }
       else// DPCM Mode
       {
-        xCodeScalingList(scalingList, sizeId, listId);
+        xCodeScalingList(&scalingList, sizeId, listId);
       }
     }
@@ -1773 +1763 @@
  * \param listIdc list index
  */
-Void TEncCavlc::xCodeScalingList(TComScalingList* scalingList, UInt sizeId, UInt listId)
+Void TEncCavlc::xCodeScalingList(const TComScalingList* scalingList, UInt sizeId, UInt listId)
 {
   Int coefNum = min(MAX_MATRIX_COEF_NUM,(Int)g_scalingListSize[sizeId]);
@@ -1779 +1769 @@
   Int nextCoef = SCALING_LIST_START_VALUE;
   Int data;
-  Int *src = scalingList->getScalingListAddress(sizeId, listId);
+  const Int *src = scalingList->getScalingListAddress(sizeId, listId);
     if( sizeId > SCALING_LIST_8x8 )
     {
@@ -1814 +1804 @@
   }
   return false;
-}
-Bool TComScalingList::checkPredMode(UInt sizeId, UInt listId)
-{
-  Int predListStep = (sizeId == SCALING_LIST_32x32? (SCALING_LIST_NUM/NUMBER_OF_PREDICTION_MODES) : 1); // if 32x32, skip over chroma entries.
-
-  for(Int predListIdx = (Int)listId ; predListIdx >= 0; predListIdx-=predListStep)
-  {
-    if( !memcmp(getScalingListAddress(sizeId,listId),((listId == predListIdx) ?
-      getScalingListDefaultAddress(sizeId, predListIdx): getScalingListAddress(sizeId, predListIdx)),sizeof(Int)*min(MAX_MATRIX_COEF_NUM,(Int)g_scalingListSize[sizeId])) // check value of matrix
-     && ((sizeId < SCALING_LIST_16x16) || (getScalingListDC(sizeId,listId) == getScalingListDC(sizeId,predListIdx)))) // check DC value
-    {
-      setRefMatrixId(sizeId, listId, predListIdx);
-      return false;
-    }
-  }
-  return true;
 }
 
@@ -1947 +1921 @@
 }
 
-Void TEncCavlc::codeVPSExtension (TComVPS *vps)
+Void TEncCavlc::codeVPSExtension( const TComVPS *vps )
 {
   Int NumOutputLayersInOutputLayerSet[MAX_VPS_LAYER_SETS_PLUS1];
@@ -2071 +2045 @@
   for( Int idx = vps->getBaseLayerInternalFlag() ? 2 : 1; idx < vps->getNumProfileTierLevel(); idx++ )
   {
-    vps->setProfilePresentFlag(idx, true);
-
     WRITE_FLAG( vps->getProfilePresentFlag(idx),       "vps_profile_present_flag[i]" );
 
@@ -2216 +2188 @@
     WRITE_CODE(1, 8, "vps_non_vui_extension_data_byte");
   }
-
-  vps->setVpsVuiPresentFlag(true);
+    
   WRITE_FLAG( vps->getVpsVuiPresentFlag() ? 1 : 0,                     "vps_vui_present_flag" );
 
@@ -2231 +2202 @@
 }
 
-Void  TEncCavlc::codeRepFormat( RepFormat *repFormat )
+Void  TEncCavlc::codeRepFormat( const RepFormat *repFormat )
 {
   WRITE_CODE( repFormat->getPicWidthVpsInLumaSamples (), 16, "pic_width_vps_in_luma_samples" );    
@@ -2264 +2235 @@
 }
 
-Void TEncCavlc::codeVpsDpbSizeTable(TComVPS *vps)
+Void TEncCavlc::codeVpsDpbSizeTable( const TComVPS *vps )
 {
   for( Int i = 1; i < vps->getNumOutputLayerSets(); i++ )
@@ -2297 +2268 @@
 }
 
-Void TEncCavlc::codeVPSVUI (TComVPS *vps)
+Void TEncCavlc::codeVPSVUI( const TComVPS *vps )
 {
   Int i,j;
   WRITE_FLAG(vps->getCrossLayerPictureTypeAlignFlag(), "cross_layer_pic_type_aligned_flag");
-  if (!vps->getCrossLayerPictureTypeAlignFlag())
+
+  if( !vps->getCrossLayerPictureTypeAlignFlag() )
   {
     WRITE_FLAG(vps->getCrossLayerIrapAlignFlag(), "cross_layer_irap_aligned_flag");
@@ -2308 +2280 @@
   {
     // When not present, the value of cross_layer_irap_aligned_flag is inferred to be equal to vps_vui_present_flag,
-    // i.e. it is true in this function
-    vps->setCrossLayerIrapAlignFlag( true ); 
+    assert( vps->getCrossLayerIrapAlignFlag() == true );
   }
 
@@ -2465 +2436 @@
 }
 
-Void TEncCavlc::codeSPSExtension( TComSPS* pcSPS )
+Void TEncCavlc::codeSPSExtension( const TComSPS* pcSPS )
 {
   // more syntax elements to be written here
@@ -2473 +2444 @@
 }
 
-Void TEncCavlc::codeVpsVuiBspHrdParams(TComVPS * const vps)
+Void TEncCavlc::codeVpsVuiBspHrdParams( const TComVPS* vps )
 {
   WRITE_UVLC( vps->getVpsNumAddHrdParams(), "vps_num_add_hrd_params" );
@@ -2528 +2499 @@
                 }
 
-                WRITE_CODE(vps->getBspHrdIdx(h, i, t, j, k), numBits, "bsp_comb_hrd_idx[h][i][t][j][k]");
+                WRITE_CODE(vps->getBspHrdIdx(h, i, t, j, k), numBits, "bsp_hrd_idx[h][i][t][j][k]");
               }
 
-              WRITE_UVLC( vps->getBspSchedIdx(h, i, t, j, k), "bsp_comb_sched_idx[h][i][t][j][k]");
+              WRITE_UVLC( vps->getBspSchedIdx(h, i, t, j, k), "bsp_sched_idx[h][i][t][j][k]");
             }
           }

branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.h

@@ -75 +75 @@
   TComSlice*    m_pcSlice;
 
-  Void codeShortTermRefPicSet              ( TComSPS* pcSPS, TComReferencePictureSet* pcRPS, Bool calledFromSliceHeader, Int idx );
+  Void codeShortTermRefPicSet              ( const TComReferencePictureSet* pcRPS, Bool calledFromSliceHeader, Int idx );
   Bool findMatchingLTRP ( TComSlice* pcSlice, UInt *ltrpsIndex, Int ltrpPOC, Bool usedFlag );
 
@@ -81 +81 @@
 
   Void  resetEntropy          ();
-  Void  determineCabacInitIdx  () {};
+  SliceType determineCabacInitIdx  () { assert(0); return I_SLICE; };
 
   Void  setBitstream          ( TComBitIf* p )  { m_pcBitIf = p;  }
@@ -87 +87 @@
   Void  resetBits             ()                { m_pcBitIf->resetBits(); }
   UInt  getNumberOfWrittenBits()                { return  m_pcBitIf->getNumberOfWrittenBits();  }
-  Void  codeVPS                 ( TComVPS* pcVPS );
-  Void  codeVUI                 ( TComVUI *pcVUI, TComSPS* pcSPS );
-  Void  codeSPS                 ( TComSPS* pcSPS );
-  Void  codePPS                 ( TComPPS* pcPPS 
+  Void  codeVPS                 ( const TComVPS* pcVPS );
+  Void  codeVUI                 ( const TComVUI *pcVUI, const TComSPS* pcSPS );
+  Void  codeSPS                 ( const TComSPS* pcSPS );
 #if CGS_3D_ASYMLUT
-    , TEnc3DAsymLUT * pc3DAsymLUT
+  Void  codePPS                 ( const TComPPS* pcPPS, TEnc3DAsymLUT * pc3DAsymLUT );
+#else
+  Void  codePPS                 ( const TComPPS* pcPPS );
 #endif
-    );
   Void  codeSliceHeader         ( TComSlice* pcSlice );
-  Void  codePTL                 ( TComPTL* pcPTL, Bool profilePresentFlag, Int maxNumSubLayersMinus1);
-  Void  codeProfileTier         ( ProfileTierLevel* ptl );
-  Void  codeHrdParameters       ( TComHRD *hrd, Bool commonInfPresentFlag, UInt maxNumSubLayersMinus1 );
+  Void  codePTL                 ( const TComPTL* pcPTL, Bool profilePresentFlag, Int maxNumSubLayersMinus1);
+  Void  codeProfileTier         ( const ProfileTierLevel* ptl );
+  Void  codeHrdParameters       ( const TComHRD *hrd, Bool commonInfPresentFlag, UInt maxNumSubLayersMinus1 );
   Void  codeTilesWPPEntryPoint( TComSlice* pSlice );
   Void  codeTerminatingBit      ( UInt uilsLast );
@@ -146 +146 @@
   Void xCodePredWeightTable          ( TComSlice* pcSlice );
 
-  Void codeScalingList  ( TComScalingList* scalingList );
-  Void xCodeScalingList ( TComScalingList* scalingList, UInt sizeId, UInt listId);
+  Void codeScalingList  ( const TComScalingList &scalingList );
+  Void xCodeScalingList ( const TComScalingList* scalingList, UInt sizeId, UInt listId);
   Void codeDFFlag       ( UInt uiCode, const Char *pSymbolName );
   Void codeDFSvlc       ( Int   iCode, const Char *pSymbolName );
@@ -154 +154 @@
 
 #if SVC_EXTENSION
-  Void  codeSliceHeaderExtn  ( TComSlice* slice, Int shBitsWrittenTillNow );
-  Void codeSPSExtension      ( TComSPS* pcSPS );
-  Void codeVPSExtension      ( TComVPS* pcVPS );
-  Void codeVPSVUI            ( TComVPS *vps   );
-  Void codeRepFormat         ( RepFormat *repFormat );
-  Void codeVpsDpbSizeTable   ( TComVPS *vps );
-  Void codeVpsVuiBspHrdParams( TComVPS * const );
+  Void codeSliceHeaderExtn   ( TComSlice* slice, Int shBitsWrittenTillNow );
+  Void codeSPSExtension      ( const TComSPS* sps );
+  Void codeVPSExtension      ( const TComVPS* vps );
+  Void codeVPSVUI            ( const TComVPS* vps );
+  Void codeRepFormat         ( const RepFormat *repFormat );
+  Void codeVpsDpbSizeTable   ( const TComVPS *vps );
+  Void codeVpsVuiBspHrdParams( const TComVPS * const );
 
 #if CGS_3D_ASYMLUT

branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h

@@ -702 +702 @@
   Void  setWaveFrontSynchro(Int iWaveFrontSynchro)                   { m_iWaveFrontSynchro = iWaveFrontSynchro; }
   Int   getWaveFrontsynchro()                                        { return m_iWaveFrontSynchro; }
-  Void  setWaveFrontSubstreams(Int iWaveFrontSubstreams)             { m_iWaveFrontSubstreams = iWaveFrontSubstreams; }
-  Int   getWaveFrontSubstreams()                                     { return m_iWaveFrontSubstreams; }
   Void  setDecodedPictureHashSEIEnabled(Int b)                       { m_decodedPictureHashSEIEnabled = b; }
   Int   getDecodedPictureHashSEIEnabled()                            { return m_decodedPictureHashSEIEnabled; }

branches/SHM-dev/source/Lib/TLibEncoder/TEncCu.cpp

@@ -407 +407 @@
   const UInt numberValidComponents = rpcBestCU->getPic()->getNumberValidComponents();
 
-  if( (g_uiMaxCUWidth>>uiDepth) >= rpcTempCU->getSlice()->getPPS()->getMinCuDQPSize() )
+  if( (g_uiMaxCUWidth>>uiDepth) >= (g_uiMaxCUWidth >> ( rpcTempCU->getSlice()->getPPS()->getMaxCuDQPDepth())) )
   {
     Int idQP = m_pcEncCfg->getMaxDeltaQP();
@@ -601 +601 @@
 
           //! Try AMP (SIZE_2NxnU, SIZE_2NxnD, SIZE_nLx2N, SIZE_nRx2N)
-          if( pcPic->getSlice(0)->getSPS()->getAMPAcc(uiDepth) )
+          if(pcSlice->getSPS()->getUseAMP() && uiDepth < g_uiMaxCUDepth-g_uiAddCUDepth )
           {
 #if AMP_ENC_SPEEDUP
@@ -805 +805 @@
   }
 
-  if( (g_uiMaxCUWidth>>uiDepth) == rpcTempCU->getSlice()->getPPS()->getMinCuDQPSize() )
+  if( (g_uiMaxCUWidth>>uiDepth) == (g_uiMaxCUWidth >> ( rpcTempCU->getSlice()->getPPS()->getMaxCuDQPDepth())) )
   {
     Int idQP = m_pcEncCfg->getMaxDeltaQP();
@@ -816 +816 @@
 #endif    
   }
-  else if( (g_uiMaxCUWidth>>uiDepth) > rpcTempCU->getSlice()->getPPS()->getMinCuDQPSize() )
+  else if( (g_uiMaxCUWidth>>uiDepth) > (g_uiMaxCUWidth >> ( rpcTempCU->getSlice()->getPPS()->getMaxCuDQPDepth())) )
   {
     iMinQP = iBaseQP;
@@ -909 +909 @@
       rpcTempCU->getTotalCost()  = m_pcRdCost->calcRdCost( rpcTempCU->getTotalBits(), rpcTempCU->getTotalDistortion() );
 
-      if( (g_uiMaxCUWidth>>uiDepth) == rpcTempCU->getSlice()->getPPS()->getMinCuDQPSize() && rpcTempCU->getSlice()->getPPS()->getUseDQP())
+      if( (g_uiMaxCUWidth>>uiDepth) == (g_uiMaxCUWidth >> ( rpcTempCU->getSlice()->getPPS()->getMaxCuDQPDepth())) && rpcTempCU->getSlice()->getPPS()->getUseDQP())
       {
         Bool hasResidual = false;
@@ -1079 +1079 @@
   {
     UInt uiQNumParts = ( pcPic->getNumPartitionsInCtu() >> (uiDepth<<1) )>>2;
-    if( (g_uiMaxCUWidth>>uiDepth) == pcCU->getSlice()->getPPS()->getMinCuDQPSize() && pcCU->getSlice()->getPPS()->getUseDQP())
+    if( (g_uiMaxCUWidth>>uiDepth) == (g_uiMaxCUWidth >> ( pcCU->getSlice()->getPPS()->getMaxCuDQPDepth())) && pcCU->getSlice()->getPPS()->getUseDQP())
     {
       setdQPFlag(true);
     }
 
-    if( (g_uiMaxCUWidth>>uiDepth) == pcCU->getSlice()->getPPS()->getMinCuChromaQpAdjSize() && pcCU->getSlice()->getUseChromaQpAdj())
+    if( (g_uiMaxCUWidth>>uiDepth) == (g_uiMaxCUWidth >> ( pcCU->getSlice()->getPPS()->getMaxCuChromaQpAdjDepth())) && pcCU->getSlice()->getUseChromaQpAdj())
     {
       setCodeChromaQpAdjFlag(true);
@@ -1106 +1106 @@
   }
 
-  if( (g_uiMaxCUWidth>>uiDepth) >= pcCU->getSlice()->getPPS()->getMinCuDQPSize() && pcCU->getSlice()->getPPS()->getUseDQP())
+  if( (g_uiMaxCUWidth>>uiDepth) >= (g_uiMaxCUWidth >> ( pcCU->getSlice()->getPPS()->getMaxCuDQPDepth())) && pcCU->getSlice()->getPPS()->getUseDQP())
   {
     setdQPFlag(true);
   }
 
-  if( (g_uiMaxCUWidth>>uiDepth) >= pcCU->getSlice()->getPPS()->getMinCuChromaQpAdjSize() && pcCU->getSlice()->getUseChromaQpAdj())
+  if( (g_uiMaxCUWidth>>uiDepth) >= (g_uiMaxCUWidth >> ( pcCU->getSlice()->getPPS()->getMaxCuChromaQpAdjDepth())) && pcCU->getSlice()->getUseChromaQpAdj())
   {
     setCodeChromaQpAdjFlag(true);
@@ -1659 +1659 @@
   UInt uiDepth = pcCU->getDepth( 0 );
 
-  if( pcCU->getSlice()->getPPS()->getUseDQP() && (g_uiMaxCUWidth>>uiDepth) >= pcCU->getSlice()->getPPS()->getMinCuDQPSize() )
+  if( pcCU->getSlice()->getPPS()->getUseDQP() && (g_uiMaxCUWidth>>uiDepth) >= (g_uiMaxCUWidth >> ( pcCU->getSlice()->getPPS()->getMaxCuDQPDepth())) )
   {
     if ( pcCU->getQtRootCbf( 0) )

branches/SHM-dev/source/Lib/TLibEncoder/TEncEntropy.cpp

@@ -79 +79 @@
 
 #if CGS_3D_ASYMLUT
-Void TEncEntropy::encodePPS( TComPPS* pcPPS, TEnc3DAsymLUT * pc3DAsymLUT  )
+Void TEncEntropy::encodePPS( const TComPPS* pcPPS, TEnc3DAsymLUT * pc3DAsymLUT  )
 {
   m_pcEntropyCoderIf->codePPS( pcPPS, pc3DAsymLUT );
@@ -85 +85 @@
 }
 #else
-Void TEncEntropy::encodePPS( TComPPS* pcPPS )
+Void TEncEntropy::encodePPS( const TComPPS* pcPPS )
 {
   m_pcEntropyCoderIf->codePPS( pcPPS );
@@ -92 +92 @@
 #endif
 
-Void TEncEntropy::encodeSPS( TComSPS* pcSPS )
+Void TEncEntropy::encodeSPS( const TComSPS* pcSPS )
 {
   m_pcEntropyCoderIf->codeSPS( pcSPS );
@@ -107 +107 @@
 }
 
-Void TEncEntropy::encodeVPS( TComVPS* pcVPS )
+Void TEncEntropy::encodeVPS( const TComVPS* pcVPS )
 {
   m_pcEntropyCoderIf->codeVPS( pcVPS );
@@ -739 +739 @@
 }
 
-/** encode quantization matrix
- * \param scalingList quantization matrix information
- */
-Void TEncEntropy::encodeScalingList( TComScalingList* scalingList )
-{
-  m_pcEntropyCoderIf->codeScalingList( scalingList );
-}
-
 #if SVC_EXTENSION
 Void TEncEntropy::encodeSliceHeaderExtn( TComSlice* pSlice, Int shBitsWrittenTillNow )

branches/SHM-dev/source/Lib/TLibEncoder/TEncEntropy.h

@@ -64 +64 @@
 public:
   virtual Void  resetEntropy          ()                = 0;
-  virtual Void  determineCabacInitIdx ()                = 0;
+  virtual SliceType determineCabacInitIdx ()                = 0;
   virtual Void  setBitstream          ( TComBitIf* p )  = 0;
   virtual Void  setSlice              ( TComSlice* p )  = 0;
@@ -70 +70 @@
   virtual UInt  getNumberOfWrittenBits()                = 0;
 
-  virtual Void  codeVPS                 ( TComVPS* pcVPS )                                      = 0;
-  virtual Void  codeSPS                 ( TComSPS* pcSPS )                                      = 0;
-  virtual Void  codePPS                 ( TComPPS* pcPPS 
+  virtual Void  codeVPS                 ( const TComVPS* pcVPS )                                      = 0;
+  virtual Void  codeSPS                 ( const TComSPS* pcSPS )                                      = 0;
 #if CGS_3D_ASYMLUT
-    , TEnc3DAsymLUT * pc3DAsymLUT
-#endif
-    )                                      = 0;
+  virtual Void  codePPS                 ( const TComPPS* pcPPS, TEnc3DAsymLUT * pc3DAsymLUT )         = 0;
+#else
+  virtual Void  codePPS                 ( const TComPPS* pcPPS )                                      = 0;
+#endif
   virtual Void  codeSliceHeader         ( TComSlice* pcSlice )                                  = 0;
 
@@ -82 +82 @@
   virtual Void  codeTerminatingBit      ( UInt uilsLast )                                       = 0;
   virtual Void  codeSliceFinish         ()                                                      = 0;
-  virtual Void codeMVPIdx ( TComDataCU* pcCU, UInt uiAbsPartIdx, RefPicList eRefList ) = 0;
-  virtual Void codeScalingList   ( TComScalingList* scalingList )      = 0;
+  virtual Void  codeMVPIdx ( TComDataCU* pcCU, UInt uiAbsPartIdx, RefPicList eRefList ) = 0;
 
 public:
@@ -140 +139 @@
   UInt    getNumberOfWrittenBits    ()                        { return m_pcEntropyCoderIf->getNumberOfWrittenBits(); }
   Void    resetEntropy              ()                        { m_pcEntropyCoderIf->resetEntropy();  }
-  Void    determineCabacInitIdx     ()                        { m_pcEntropyCoderIf->determineCabacInitIdx(); }
+  SliceType determineCabacInitIdx   ()                        { return m_pcEntropyCoderIf->determineCabacInitIdx(); }
 
   Void    encodeSliceHeader         ( TComSlice* pcSlice );
@@ -149 +148 @@
 
 public:
-  Void encodeVPS               ( TComVPS* pcVPS);
+  Void encodeVPS               ( const TComVPS* pcVPS);
   // SPS
-  Void encodeSPS               ( TComSPS* pcSPS );
-  Void encodePPS               ( TComPPS* pcPPS 
+  Void encodeSPS               ( const TComSPS* pcSPS );
 #if CGS_3D_ASYMLUT
-    , TEnc3DAsymLUT * pc3DAsymLUT
-#endif
-    );
+  Void encodePPS               ( const TComPPS* pcPPS, TEnc3DAsymLUT * pc3DAsymLUT );
+#else
+  Void encodePPS               ( const TComPPS* pcPPS );
+#endif
   Void encodeSplitFlag         ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, Bool bRD = false );
   Void encodeCUTransquantBypassFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD = false );
@@ -184 +183 @@
   Void encodeChromaQpAdjustment ( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD = false );
 
-  Void encodeScalingList       ( TComScalingList* scalingList );
-
   Void encodeCrossComponentPrediction( TComTU &rTu, ComponentID compID );
 

branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -216 +216 @@
 }
 
-SEIActiveParameterSets* TEncGOP::xCreateSEIActiveParameterSets (TComSPS *sps)
+SEIActiveParameterSets* TEncGOP::xCreateSEIActiveParameterSets (const TComSPS *sps)
 {
   SEIActiveParameterSets *seiActiveParameterSets = new SEIActiveParameterSets();
@@ -374 +374 @@
 }
 
-SEITempMotionConstrainedTileSets* TEncGOP::xCreateSEITempMotionConstrainedTileSets ()
+SEITempMotionConstrainedTileSets* TEncGOP::xCreateSEITempMotionConstrainedTileSets (const TComPPS *pps)
 {
-  TComPPS *pps = m_pcEncTop->getPPS();
   SEITempMotionConstrainedTileSets *sei = new SEITempMotionConstrainedTileSets();
   if(pps->getTilesEnabledFlag())
@@ -490 +489 @@
 }
 
-Void TEncGOP::xCreateLeadingSEIMessages (/*SEIMessages seiMessages,*/ AccessUnit &accessUnit, TComSPS *sps)
+Void TEncGOP::xCreateLeadingSEIMessages (/*SEIMessages seiMessages,*/ AccessUnit &accessUnit, const TComSPS *sps, const TComPPS *pps)
 {
   OutputNALUnit nalu(NAL_UNIT_PREFIX_SEI);
@@ -579 +578 @@
   if(m_pcCfg->getTMCTSSEIEnabled())
   {
-    SEITempMotionConstrainedTileSets *sei_tmcts = xCreateSEITempMotionConstrainedTileSets ();
+    SEITempMotionConstrainedTileSets *sei_tmcts = xCreateSEITempMotionConstrainedTileSets (pps);
 
     nalu = NALUnit(NAL_UNIT_PREFIX_SEI);
@@ -1123 +1122 @@
     //  Slice data initialization
     pcPic->clearSliceBuffer();
-    assert(pcPic->getNumAllocatedSlice() == 1);
+    pcPic->allocateNewSlice();
     m_pcSliceEncoder->setSliceIdx(0);
     pcPic->setCurrSliceIdx(0);
 #if SVC_EXTENSION
     pcPic->setLayerId( m_layerId );
-    m_pcSliceEncoder->initEncSlice ( pcPic, iPOCLast, pocCurr, iNumPicRcvd, iGOPid, pcSlice, m_pcEncTop->getSPS(), m_pcEncTop->getPPS(), m_pcEncTop->getVPS(), isField );
-#else
-    m_pcSliceEncoder->initEncSlice ( pcPic, iPOCLast, pocCurr, iNumPicRcvd, iGOPid, pcSlice, m_pcEncTop->getSPS(), m_pcEncTop->getPPS(), isField );
+    m_pcSliceEncoder->initEncSlice ( pcPic, iPOCLast, pocCurr, iNumPicRcvd, iGOPid, pcSlice, isField );
+#else
+    m_pcSliceEncoder->initEncSlice ( pcPic, iPOCLast, pocCurr, iNumPicRcvd, iGOPid, pcSlice, &(pcPic->getPicSym()->getSPS()), &(pcPic->getPicSym()->getPPS()), isField );
 #endif
 
@@ -1252 +1251 @@
     //set default slice level flag to the same as SPS level flag
     pcSlice->setLFCrossSliceBoundaryFlag(  pcSlice->getPPS()->getLoopFilterAcrossSlicesEnabledFlag()  );
-    pcSlice->setScalingList ( m_pcEncTop->getScalingList()  );
-    if(m_pcEncTop->getUseScalingListId() == SCALING_LIST_OFF)
-    {
-      m_pcEncTop->getTrQuant()->setFlatScalingList(pcSlice->getSPS()->getChromaFormatIdc());
-      m_pcEncTop->getTrQuant()->setUseScalingList(false);
-      m_pcEncTop->getSPS()->setScalingListPresentFlag(false);
-      m_pcEncTop->getPPS()->setScalingListPresentFlag(false);
-    }
-    else if(m_pcEncTop->getUseScalingListId() == SCALING_LIST_DEFAULT)
-    {
-#if SVC_EXTENSION
-      // inferring of the scaling list can be moved to the config file
-      UInt refLayerId = 0;
-      if( m_layerId > 0 && !m_pcEncTop->getVPS()->getNonHEVCBaseLayerFlag() && m_pcEncTop->getVPS()->getRecursiveRefLayerFlag( m_layerId, refLayerId ) )
-      {
-        m_pcEncTop->getSPS()->setInferScalingListFlag( true );
-        m_pcEncTop->getSPS()->setScalingListRefLayerId( refLayerId );
-        m_pcEncTop->getSPS()->setScalingListPresentFlag( false );
-        m_pcEncTop->getPPS()->setInferScalingListFlag( false );
-        m_pcEncTop->getPPS()->setScalingListPresentFlag( false );
-
-        // infer the scaling list from the reference layer
-        pcSlice->setScalingList ( m_ppcTEncTop[pcSlice->getVPS()->getLayerIdxInVps(refLayerId)]->getScalingList() );
-      }
-      else
-      {
-#endif
-      pcSlice->setDefaultScalingList ();
-      m_pcEncTop->getSPS()->setScalingListPresentFlag(false);
-      m_pcEncTop->getPPS()->setScalingListPresentFlag(false);
-
-#if SVC_EXTENSION
-      }
-#endif
-
-      m_pcEncTop->getTrQuant()->setScalingList(pcSlice->getScalingList(), pcSlice->getSPS()->getChromaFormatIdc());
-      m_pcEncTop->getTrQuant()->setUseScalingList(true);
-    }
-    else if(m_pcEncTop->getUseScalingListId() == SCALING_LIST_FILE_READ)
-    {
-#if SVC_EXTENSION
-      // inferring of the scaling list can be moved to the config file
-      UInt refLayerId = 0;
-      if( m_layerId > 0 && !m_pcEncTop->getVPS()->getNonHEVCBaseLayerFlag() && m_pcEncTop->getVPS()->getRecursiveRefLayerFlag( m_layerId, refLayerId ) )
-      {
-        m_pcEncTop->getSPS()->setInferScalingListFlag( true );
-        m_pcEncTop->getSPS()->setScalingListRefLayerId( refLayerId );
-        m_pcEncTop->getSPS()->setScalingListPresentFlag( false );
-        m_pcEncTop->getPPS()->setInferScalingListFlag( false );
-        m_pcEncTop->getPPS()->setScalingListPresentFlag( false );
-
-        // infer the scaling list from the reference layer
-        pcSlice->setScalingList ( m_ppcTEncTop[pcSlice->getVPS()->getLayerIdxInVps(refLayerId)]->getScalingList() );
-      }
-      else
-      {
-#endif
-      pcSlice->setDefaultScalingList ();
-      if(pcSlice->getScalingList()->xParseScalingList(m_pcCfg->getScalingListFile()))
-      {
-        Bool bParsedScalingList=false; // Use of boolean so that assertion outputs useful string
-        assert(bParsedScalingList);
-        exit(1);
-      }
-      pcSlice->getScalingList()->checkDcOfMatrix();
-      m_pcEncTop->getSPS()->setScalingListPresentFlag(pcSlice->checkDefaultScalingList());
-      m_pcEncTop->getPPS()->setScalingListPresentFlag(false);
-
-#if SVC_EXTENSION
-    }
-#endif
-
-      m_pcEncTop->getTrQuant()->setScalingList(pcSlice->getScalingList(), pcSlice->getSPS()->getChromaFormatIdc());
-      m_pcEncTop->getTrQuant()->setUseScalingList(true);
-    }
-    else
-    {
-      printf("error : ScalingList == %d no support\n",m_pcEncTop->getUseScalingListId());
-      assert(0);
-    }
 
     if(pcSlice->getSliceType()==B_SLICE&&m_pcCfg->getGOPEntry(iGOPid).m_sliceType=='P')
@@ -1381 +1300 @@
 
         // conformance check: when ScaledRefRegionWidthInSamplesY is equal to RefLayerRegionWidthInSamplesY, PhaseHorY shall be equal to 0, when ScaledRefRegionWidthInSamplesC is equal to RefLayerRegionWidthInSamplesC, PhaseHorC shall be equal to 0, when ScaledRefRegionHeightInSamplesY is equal to RefLayerRegionHeightInSamplesY, PhaseVerY shall be equal to 0, and when ScaledRefRegionHeightInSamplesC is equal to RefLayerRegionHeightInSamplesC, PhaseVerC shall be equal to 0.
-        Bool phaseSetPresentFlag;
-        Int phaseHorLuma, phaseVerLuma, phaseHorChroma, phaseVerChroma;
-        pcSlice->getPPS()->getResamplingPhase( refLayerId, phaseSetPresentFlag, phaseHorLuma, phaseVerLuma, phaseHorChroma, phaseVerChroma );
-
-        assert( ( (widthEL  != widthBL)  || (phaseHorLuma == 0 && phaseHorChroma == 0) )
-             && ( (heightEL != heightBL) || (phaseVerLuma == 0 && phaseVerChroma == 0) ) );
+        const ResamplingPhase &resamplingPhase = pcSlice->getPPS()->getResamplingPhase( refLayerId );
+
+        assert( ( (widthEL  != widthBL)  || (resamplingPhase.phaseHorLuma == 0 && resamplingPhase.phaseHorChroma == 0) )
+             && ( (heightEL != heightBL) || (resamplingPhase.phaseVerLuma == 0 && resamplingPhase.phaseVerChroma == 0) ) );
 
         g_mvScalingFactor[refLayerIdc][0] = widthEL  == widthBL  ? 4096 : Clip3(-4096, 4095, ((widthEL  << 8) + (widthBL  >> 1)) / widthBL);
@@ -1418 +1335 @@
           Bool bSignalPPS = m_bSeqFirst;
           bSignalPPS |= m_pcCfg->getGOPSize() > 1 ? pocCurr % m_pcCfg->getIntraPeriod() == 0 : pocCurr % m_pcCfg->getFrameRate() == 0;
-          xDetermin3DAsymLUT( pcSlice , pcPic , refLayerIdc , m_pcCfg , bSignalPPS );
+          xDetermin3DAsymLUT( pcSlice, pcPic, refLayerIdc, m_pcCfg, bSignalPPS );
+
+          // update PPS in TEncTop and TComPicSym classes
+          m_pcEncTop->getPPS()->setCGSOutputBitDepthY( m_Enc3DAsymLUTPPS.getOutputBitDepthY() );
+          m_pcEncTop->getPPS()->setCGSOutputBitDepthC( m_Enc3DAsymLUTPPS.getOutputBitDepthC() );
+          pcPic->getPicSym()->getPPSToUpdate()->setCGSOutputBitDepthY( m_Enc3DAsymLUTPPS.getOutputBitDepthY() );
+          pcPic->getPicSym()->getPPSToUpdate()->setCGSOutputBitDepthC( m_Enc3DAsymLUTPPS.getOutputBitDepthC() );
+
           m_Enc3DAsymLUTPPS.colorMapping( pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(),  m_pColorMappedPic );
           pBaseColRec = m_pColorMappedPic;
@@ -1608 +1532 @@
           if(lTid==pcSlice->getTLayer())
           {
-            TComReferencePictureSet* nRPS = pcSlice->getSPS()->getRPSList()->getReferencePictureSet(ii);
+            const TComReferencePictureSet* nRPS = pcSlice->getSPS()->getRPSList()->getReferencePictureSet(ii);
             for(Int jj=0;jj<nRPS->getNumberOfPictures();jj++)
             {
@@ -1725 +1649 @@
           if(lTid==pcSlice->getTLayer()) 
           {
-            TComReferencePictureSet* nRPS = pcSlice->getSPS()->getRPSList()->getReferencePictureSet(ii);
+            const TComReferencePictureSet* nRPS = pcSlice->getSPS()->getRPSList()->getReferencePictureSet(ii);
             for(Int jj=0; jj<nRPS->getNumberOfPictures(); jj++)
             {
@@ -1844 +1768 @@
       pcSlice->setSliceType ( P_SLICE );
     }
+    pcSlice->setEncCABACTableIdx(m_pcSliceEncoder->getEncCABACTableIdx());
 
     if (pcSlice->getSliceType() == B_SLICE)
@@ -1894 +1819 @@
         pcSlice->setEnableTMVPFlag(1);
       }
-      pcSlice->getSPS()->setTMVPFlagsPresent(1);
     }
     else if (m_pcEncTop->getTMVPModeId() == 1)
     {
-      pcSlice->getSPS()->setTMVPFlagsPresent(1);
 #if SVC_EXTENSION
       if( pcSlice->getIdrPicFlag() )
@@ -1910 +1833 @@
     else
     {
-      pcSlice->getSPS()->setTMVPFlagsPresent(0);
       pcSlice->setEnableTMVPFlag(0);
     }
@@ -2026 +1948 @@
     pcPic->getSlice(pcSlice->getSliceIdx())->setMvdL1ZeroFlag(pcSlice->getMvdL1ZeroFlag());
 
-    pcPic->getPicSym()->initTiles(pcSlice->getPPS());
-    pcPic->getPicSym()->initCtuTsRsAddrMaps();
-
     Double lambda            = 0.0;
     Int actualHeadBits       = 0;
@@ -2114 +2033 @@
 
     // Allocate some coders, now the number of tiles are known.
-    const Int numSubstreams = pcSlice->getPPS()->getNumSubstreams();
+    const Int numSubstreamsColumns = (pcSlice->getPPS()->getNumTileColumnsMinus1() + 1);
+    const Int numSubstreamRows     = pcSlice->getPPS()->getEntropyCodingSyncEnabledFlag() ? pcPic->getFrameHeightInCtus() : (pcSlice->getPPS()->getNumTileRowsMinus1() + 1);
+    const Int numSubstreams        = numSubstreamRows * numSubstreamsColumns;
     std::vector<TComOutputBitstream> substreamsOut(numSubstreams);
 
@@ -2138 +2059 @@
           m_pcSliceEncoder->setSliceIdx             ( uiNumSliceSegments   );
           pcSlice = pcPic->getSlice                 ( uiNumSliceSegments   );
+          assert(pcSlice->getPPS()!=0);
           pcSlice->copySliceInfo                    ( pcPic->getSlice(uiNumSliceSegments-1)  );
           pcSlice->setSliceIdx                      ( uiNumSliceSegments   );
@@ -2151 +2073 @@
           pcSlice->setDependentSliceSegmentFlag(bNextSegmentIsDependentSlice);
           pcSlice->setSliceSegmentCurStartCtuTsAddr ( curSliceSegmentEnd );
+          // TODO: optimise cabac_init during compress slice to improve multi-slice operation
+          // pcSlice->setEncCABACTableIdx(m_pcSliceEncoder->getEncCABACTableIdx());
           uiNumSliceSegments ++;
         }
@@ -2177 +2101 @@
     if ( m_pcCfg->getDeblockingFilterMetric() )
     {
-      dblMetric(pcPic, uiNumSliceSegments);
+      applyDeblockingFilterMetric(pcPic, uiNumSliceSegments);
     }
     m_pcLoopFilter->loopFilterPic( pcPic );
@@ -2185 +2109 @@
     m_pcEntropyCoder->setEntropyCoder   ( m_pcCavlcCoder, pcSlice );
 
-    /* write various header sets. */
+    // write various header sets.
     if ( m_bSeqFirst )
     {
@@ -2222 +2146 @@
 
       m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream);
-      if (m_bSeqFirst)
-      {
-        pcSlice->getSPS()->setNumLongTermRefPicSPS(m_numLongTermRefPicSPS);
-        assert (m_numLongTermRefPicSPS <= MAX_NUM_LONG_TERM_REF_PICS);
-        for (Int k = 0; k < m_numLongTermRefPicSPS; k++)
-        {
-          pcSlice->getSPS()->setLtRefPicPocLsbSps(k, m_ltRefPicPocLsbSps[k]);
-          pcSlice->getSPS()->setUsedByCurrPicLtSPSFlag(k, m_ltRefPicUsedByCurrPicFlag[k]);
-        }
-      }
-      if( m_pcCfg->getPictureTimingSEIEnabled() || m_pcCfg->getDecodingUnitInfoSEIEnabled() )
-      {
-        UInt maxCU = m_pcCfg->getSliceArgument();
-        UInt numDU = ( m_pcCfg->getSliceMode() == FIXED_NUMBER_OF_CTU ) ? ( pcPic->getNumberOfCtusInFrame() / maxCU ) : ( 0 );
-        if( pcPic->getNumberOfCtusInFrame() % maxCU != 0 || numDU == 0 )
-        {
-          numDU ++;
-        }
-        pcSlice->getSPS()->getVuiParameters()->getHrdParameters()->setNumDU( numDU );
-        pcSlice->getSPS()->setHrdParameters( m_pcCfg->getFrameRate(), numDU, m_pcCfg->getTargetBitrate(), ( m_pcCfg->getIntraPeriod() > 0 ) );
-      }
-      if( m_pcCfg->getBufferingPeriodSEIEnabled() || m_pcCfg->getPictureTimingSEIEnabled() || m_pcCfg->getDecodingUnitInfoSEIEnabled() )
-      {
-        pcSlice->getSPS()->getVuiParameters()->setHrdParametersPresentFlag( true );
-      }
-
+      
 #if SVC_EXTENSION
       // dependency constraint
@@ -2285 +2184 @@
       actualTotalBits += UInt(accessUnit.back()->m_nalUnitData.str().size()) * 8;
 
-      xCreateLeadingSEIMessages(accessUnit, pcSlice->getSPS());
+      xCreateLeadingSEIMessages(accessUnit, pcSlice->getSPS(), pcSlice->getPPS());
 
 #if O0164_MULTI_LAYER_HRD
@@ -2776 +2675 @@
       }
 #endif
+
+      pcSlice->setEncCABACTableIdx(m_pcSliceEncoder->getEncCABACTableIdx());
 
       tmpBitsBeforeWriting = m_pcEntropyCoder->getNumberOfWrittenBits();
@@ -3089 +2990 @@
         || ( pcSlice->getSPS()->getVuiParameters()->getHrdParameters()->getVclHrdParametersPresentFlag() ) ) )
     {
-      TComVUI *vui = pcSlice->getSPS()->getVuiParameters();
-      TComHRD *hrd = vui->getHrdParameters();
+      const TComVUI *vui = pcSlice->getSPS()->getVuiParameters();
+      const TComHRD *hrd = vui->getHrdParameters();
 
       if( hrd->getSubPicCpbParamsPresentFlag() )
@@ -4094 +3995 @@
 }
 
-Void TEncGOP::dblMetric( TComPic* pcPic, UInt uiNumSlices )
+Void TEncGOP::applyDeblockingFilterMetric( TComPic* pcPic, UInt uiNumSlices )
 {
   TComPicYuv* pcPicYuvRec = pcPic->getPicYuvRec();
@@ -4819 +4720 @@
 
 #if CGS_3D_ASYMLUT
-Void TEncGOP::xDetermin3DAsymLUT( TComSlice * pSlice , TComPic * pCurPic , UInt refLayerIdc , TEncCfg * pCfg , Bool bSignalPPS )
+Void TEncGOP::xDetermin3DAsymLUT( TComSlice * pSlice, TComPic * pCurPic, UInt refLayerIdc, TEncCfg * pCfg, Bool bSignalPPS )
 {
   Int nCGSFlag = pSlice->getPPS()->getCGSFlag();
@@ -4884 +4785 @@
     }
   }
-  pSlice->getPPS()->setCGSOutputBitDepthY( m_Enc3DAsymLUTPPS.getOutputBitDepthY() );
-  pSlice->getPPS()->setCGSOutputBitDepthC( m_Enc3DAsymLUTPPS.getOutputBitDepthC() );
 }
 

branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.h

@@ -236 +236 @@
   Double xCalculateRVM();
 
-  SEIActiveParameterSets*           xCreateSEIActiveParameterSets (TComSPS *sps);
+  SEIActiveParameterSets*           xCreateSEIActiveParameterSets (const TComSPS *sps);
   SEIFramePacking*                  xCreateSEIFramePacking();
   SEISegmentedRectFramePacking*     xCreateSEISegmentedRectFramePacking();
   SEIDisplayOrientation*            xCreateSEIDisplayOrientation();
   SEIToneMappingInfo*               xCreateSEIToneMappingInfo();
-  SEITempMotionConstrainedTileSets* xCreateSEITempMotionConstrainedTileSets ();
+  SEITempMotionConstrainedTileSets* xCreateSEITempMotionConstrainedTileSets (const TComPPS *pps);
   SEIKneeFunctionInfo*              xCreateSEIKneeFunctionInfo();
   SEIChromaSamplingFilterHint*      xCreateSEIChromaSamplingFilterHint(Bool bChromaLocInfoPresent, Int iHorFilterIndex, Int iVerFilterIdc);
 
-  Void xCreateLeadingSEIMessages (/*SEIMessages seiMessages,*/ AccessUnit &accessUnit, TComSPS *sps);
+  Void xCreateLeadingSEIMessages (/*SEIMessages seiMessages,*/ AccessUnit &accessUnit, const TComSPS *sps, const TComPPS *pps);
   Int xGetFirstSeiLocation (AccessUnit &accessUnit);
   Void xResetNonNestedSEIPresentFlags()
@@ -258 +258 @@
     m_nestedPictureTimingSEIPresentInAU      = false;
   }
-  Void dblMetric( TComPic* pcPic, UInt uiNumSlices );
+  Void applyDeblockingFilterMetric( TComPic* pcPic, UInt uiNumSlices );
 
 #if Q0074_COLOUR_REMAPPING_SEI
@@ -290 +290 @@
   Void downScalePic( TComPicYuv* pcYuvSrc, TComPicYuv* pcYuvDest);
   Void downScaleComponent2x2( const Pel* pSrc, Pel* pDest, const Int iSrcStride, const Int iDestStride, const Int iSrcWidth, const Int iSrcHeight, const Int inputBitDepth, const Int outputBitDepth );
-  inline Short  xClip( Short x , Int bitdepth );
+  inline Short xClip( Short x , Int bitdepth );
   Void initDs(Int iWidth, Int iHeight, Int iType);
-  Void filterImg(
-    Pel           *src,
-    Int           iSrcStride,
-    Pel           *dst,
-    Int           iDstStride,
-    Int           height1,  
-    Int           width1,  
-    Int           shift,
-    Int           plane);
+  Void filterImg( Pel *src, Int iSrcStride, Pel *dst, Int iDstStride, Int height1, Int width1, Int shift, Int plane);
 
   Int get_mem2DintWithPad(Int ***array2D, Int dim0, Int dim1, Int iPadY, Int iPadX);

branches/SHM-dev/source/Lib/TLibEncoder/TEncPic.cpp

@@ -128 +128 @@
 
 #if SVC_EXTENSION
-Void TEncPic::create( Int iWidth, Int iHeight, ChromaFormat chromaFormat, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, UInt uiMaxAQDepth,  
-                      Window &conformanceWindow, Window &defaultDisplayWindow, Int *numReorderPics, TComSPS* pcSps, Bool bIsVirtual )
+Void TEncPic::create( const TComVPS& vps, const TComSPS &sps, const TComPPS &pps, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, UInt uiMaxAQDepth, Bool bIsVirtual, const UInt layerId )
 {
-  TComPic::create( iWidth, iHeight, chromaFormat, uiMaxWidth, uiMaxHeight, uiMaxDepth,  
-                   conformanceWindow, defaultDisplayWindow, numReorderPics, pcSps, bIsVirtual );
+  TComPic::create( vps, sps, pps, uiMaxWidth, uiMaxHeight, uiMaxDepth, bIsVirtual, layerId );
+
+  const Int iWidth  = vps.getPicWidthInLumaSamples(&sps, layerId);
+  const Int iHeight = vps.getPicHeightInLumaSamples(&sps, layerId);
 #else
-Void TEncPic::create( Int iWidth, Int iHeight, ChromaFormat chromaFormat, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, UInt uiMaxAQDepth,
-                      Window &conformanceWindow, Window &defaultDisplayWindow, Int *numReorderPics, Bool bIsVirtual )
+Void TEncPic::create( const TComSPS &sps, const TComPPS &pps, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, UInt uiMaxAQDepth, Bool bIsVirtual )
 {
-  TComPic::create( iWidth, iHeight, chromaFormat, uiMaxWidth, uiMaxHeight, uiMaxDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, bIsVirtual );
+  TComPic::create( sps, pps, uiMaxWidth, uiMaxHeight, uiMaxDepth, bIsVirtual );
+
+  const Int iWidth  = sps.getPicWidthInLumaSamples();
+  const Int iHeight = sps.getPicHeightInLumaSamples();
 #endif
   m_uiMaxAQDepth = uiMaxAQDepth;

branches/SHM-dev/source/Lib/TLibEncoder/TEncPic.h

@@ -106 +106 @@
 
 #if SVC_EXTENSION
-  Void          create( Int iWidth, Int iHeight, ChromaFormat chromaFormat, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, UInt uiMaxAQDepth,  
-                      Window &conformanceWindow, Window &defaultDisplayWindow, Int *numReorderPics, TComSPS* pcSps, Bool bIsVirtual=false );
+  Void          create( const TComVPS &vps, const TComSPS &sps, const TComPPS &pps, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, UInt uiMaxAQDepth, Bool bIsVirtual /* = false*/, const UInt layerId );
 #else  //SVC_EXTENSION
-  Void          create( Int iWidth, Int iHeight, ChromaFormat chromaFormat, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, UInt uiMaxAQDepth,
-                          Window &conformanceWindow, Window &defaultDisplayWindow, Int *numReorderPics, Bool bIsVirtual = false );
+  Void          create( const TComSPS &sps, const TComPPS &pps, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, UInt uiMaxAQDepth, Bool bIsVirtual /* = false*/ );
 #endif //SVC_EXTENSION
 

branches/SHM-dev/source/Lib/TLibEncoder/TEncSbac.cpp

@@ -109 +109 @@
   SliceType eSliceType  = m_pcSlice->getSliceType();
 
-  Int  encCABACTableIdx = m_pcSlice->getPPS()->getEncCABACTableIdx();
+  SliceType encCABACTableIdx = m_pcSlice->getEncCABACTableIdx();;
   if (!m_pcSlice->isIntra() && (encCABACTableIdx==B_SLICE || encCABACTableIdx==P_SLICE) && m_pcSlice->getPPS()->getCabacInitPresentFlag())
   {
-    eSliceType = (SliceType) encCABACTableIdx;
+    eSliceType = encCABACTableIdx;
   }
 
@@ -161 +161 @@
  * stores the index of the closest table.  This index is used for the next P/B slice when cabac_init_present_flag is true.
  */
-Void TEncSbac::determineCabacInitIdx()
+SliceType TEncSbac::determineCabacInitIdx()
 {
   Int  qp              = m_pcSlice->getSliceQp();
@@ -214 +214 @@
       }
     }
-    m_pcSlice->getPPS()->setEncCABACTableIdx( bestSliceType );
+    return bestSliceType;
   }
   else
   {
-    m_pcSlice->getPPS()->setEncCABACTableIdx( I_SLICE );
-  }
-}
-
-Void TEncSbac::codeVPS( TComVPS* pcVPS )
+    return I_SLICE;
+  }
+}
+
+Void TEncSbac::codeVPS( const TComVPS* pcVPS )
 {
   assert (0);
@@ -228 +228 @@
 }
 
-Void TEncSbac::codeSPS( TComSPS* pcSPS )
+Void TEncSbac::codeSPS( const TComSPS* pcSPS )
 {
   assert (0);
@@ -234 +234 @@
 }
 
-Void TEncSbac::codePPS( TComPPS* pcPPS 
 #if CGS_3D_ASYMLUT
-  , TEnc3DAsymLUT * pc3DAsymLUT
+Void TEncSbac::codePPS( const TComPPS* pcPPS, TEnc3DAsymLUT * pc3DAsymLUT )
+#else
+Void TEncSbac::codePPS( const TComPPS* pcPPS )
 #endif
-  )
 {
   assert (0);
@@ -459 +459 @@
       m_pcBinIf->encodeBin( 0, m_cCUPartSizeSCModel.get( 0, 0, 0) );
       m_pcBinIf->encodeBin( 1, m_cCUPartSizeSCModel.get( 0, 0, 1) );
-      if ( pcCU->getSlice()->getSPS()->getAMPAcc( uiDepth ) )
+      if ( pcCU->getSlice()->getSPS()->getUseAMP() && uiDepth < g_uiMaxCUDepth-g_uiAddCUDepth )
       {
         if (eSize == SIZE_2NxN)
@@ -485 +485 @@
       }
 
-      if ( pcCU->getSlice()->getSPS()->getAMPAcc( uiDepth ) )
+      if ( pcCU->getSlice()->getSPS()->getUseAMP() && uiDepth < g_uiMaxCUDepth-g_uiAddCUDepth )
       {
         if (eSize == SIZE_Nx2N)

branches/SHM-dev/source/Lib/TLibEncoder/TEncSbac.h

@@ -75 +75 @@
   //  Virtual list
   Void  resetEntropy           ();
-  Void  determineCabacInitIdx  ();
+  SliceType determineCabacInitIdx  ();
   Void  setBitstream           ( TComBitIf* p )  { m_pcBitIf = p; m_pcBinIf->init( p ); }
   Void  setSlice               ( TComSlice* p )  { m_pcSlice = p;                       }
@@ -87 +87 @@
   //--SBAC RD
 
-  Void  codeVPS                ( TComVPS* pcVPS );
-  Void  codeSPS                ( TComSPS* pcSPS     );
-  Void  codePPS                ( TComPPS* pcPPS     
+  Void  codeVPS                ( const TComVPS* pcVPS );
+  Void  codeSPS                ( const TComSPS* pcSPS     );
 #if CGS_3D_ASYMLUT
-    , TEnc3DAsymLUT * pc3DAsymLUT
+  Void  codePPS                ( const TComPPS* pcPPS, TEnc3DAsymLUT * pc3DAsymLUT     );
+#else
+  Void  codePPS                ( const TComPPS* pcPPS     );
 #endif
-    );
   Void  codeSliceHeader        ( TComSlice* pcSlice );
   Void  codeTilesWPPEntryPoint ( TComSlice* pSlice );
@@ -103 +103 @@
   Void  codeSaoUflc          ( UInt uiLength, UInt  uiCode );
   Void  codeSAOSign          ( UInt  uiCode);  //<! code SAO offset sign
-  Void  codeScalingList      ( TComScalingList* /*scalingList*/     ){ assert (0);  return;};
 
 #if SVC_EXTENSION

branches/SHM-dev/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -3945 +3945 @@
 #if SVC_EXTENSION
   // Check WP for B-slices
-  if ( pcCU->getSlice()->getPPS()->getUseWP())
+  if( pcCU->getSlice()->testWeightPred() )
 #else
-  if ( pcCU->getSlice()->getPPS()->getUseWP() && pcCU->getSlice()->getSliceType()==P_SLICE )
+  if ( pcCU->getSlice()->testWeightPred() && pcCU->getSlice()->getSliceType()==P_SLICE )
 #endif
   {
@@ -3959 +3959 @@
 #if SVC_EXTENSION
   // Check WP for B-slices
-  if( pcCU->getSlice()->getPPS()->getUseWP())
+  if ( pcCU->getSlice()->testWeightPred() )
 #else
-  if ( pcCU->getSlice()->getPPS()->getUseWP() && pcCU->getSlice()->getSliceType()==P_SLICE )
+  if ( pcCU->getSlice()->testWeightPred() && pcCU->getSlice()->getSliceType()==P_SLICE )
 #endif
   {
@@ -5584 +5584 @@
   assert( pcCU->getDepth( 0 ) == pcCU->getDepth( uiAbsPartIdx ) );
   const UInt uiTrMode = pcCU->getTransformIdx( uiAbsPartIdx );
-  TComSPS *sps=pcCU->getSlice()->getSPS();
+  const TComSPS *sps=pcCU->getSlice()->getSPS();
 
   if( uiCurrTrMode == uiTrMode )
@@ -5973 +5973 @@
 
   TComSlice       *pcSlice  = pcCU->getSlice();
-  TComPPS         *pps      = pcCU->getSlice()->getPPS();
   WPScalingParam  *wp0 , *wp1;
 
-  m_cDistParam.bApplyWeight = ( pcSlice->getSliceType()==P_SLICE && pps->getUseWP() ) || ( pcSlice->getSliceType()==B_SLICE && pps->getWPBiPred() ) ;
+  m_cDistParam.bApplyWeight = ( pcSlice->getSliceType()==P_SLICE && pcSlice->testWeightPred() ) || ( pcSlice->getSliceType()==B_SLICE && pcSlice->testWeightBiPred() ) ;
 
   if ( !m_cDistParam.bApplyWeight ) return;

branches/SHM-dev/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -48 +48 @@
 
 TEncSlice::TEncSlice()
+: m_encCABACTableIdx(I_SLICE)
 {
   m_apcPicYuvPred = NULL;
@@ -220 +221 @@
 #if SVC_EXTENSION
 //\param vps          VPS associated with the slice
-Void TEncSlice::initEncSlice( TComPic* pcPic, Int pocLast, Int pocCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, TComSPS* pSPS, TComPPS *pPPS, TComVPS *vps, Bool isField )
-#else
-Void TEncSlice::initEncSlice( TComPic* pcPic, Int pocLast, Int pocCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, TComSPS* pSPS, TComPPS *pPPS, Bool isField )
+Void TEncSlice::initEncSlice( TComPic* pcPic, Int pocLast, Int pocCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, Bool isField )
+#else
+Void TEncSlice::initEncSlice( TComPic* pcPic, Int pocLast, Int pocCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, const TComSPS* pSPS, const TComPPS *pPPS, Bool isField )
 #endif
 {
@@ -229 +230 @@
 
   rpcSlice = pcPic->getSlice(0);
-  rpcSlice->setSPS( pSPS );
-  rpcSlice->setPPS( pPPS );
   rpcSlice->setSliceBits(0);
   rpcSlice->setPic( pcPic );
 #if SVC_EXTENSION
+  const TComPPS* pPPS = &pcPic->getPicSym()->getPPS();
+
   UInt layerId = pcPic->getLayerId();
-  rpcSlice->setVPS( vps );
   rpcSlice->initSlice( layerId );
 #else
@@ -501 +501 @@
   else if (rpcSlice->getPPS()->getDeblockingFilterControlPresentFlag())
   {
-    rpcSlice->getPPS()->setDeblockingFilterOverrideEnabledFlag( !m_pcCfg->getLoopFilterOffsetInPPS() );
-    rpcSlice->setDeblockingFilterOverrideFlag( !m_pcCfg->getLoopFilterOffsetInPPS() );
-    rpcSlice->getPPS()->setPicDisableDeblockingFilterFlag( m_pcCfg->getLoopFilterDisable() );
-    rpcSlice->setDeblockingFilterDisable( m_pcCfg->getLoopFilterDisable() );
+    rpcSlice->setDeblockingFilterOverrideFlag( rpcSlice->getPPS()->getDeblockingFilterOverrideEnabledFlag() );
+    rpcSlice->setDeblockingFilterDisable( rpcSlice->getPPS()->getPicDisableDeblockingFilterFlag() );
     if ( !rpcSlice->getDeblockingFilterDisable())
     {
-      if ( !m_pcCfg->getLoopFilterOffsetInPPS() && eSliceType!=I_SLICE)
-      {
-        rpcSlice->getPPS()->setDeblockingFilterBetaOffsetDiv2( m_pcCfg->getGOPEntry(iGOPid).m_betaOffsetDiv2 + m_pcCfg->getLoopFilterBetaOffset() );
-        rpcSlice->getPPS()->setDeblockingFilterTcOffsetDiv2( m_pcCfg->getGOPEntry(iGOPid).m_tcOffsetDiv2 + m_pcCfg->getLoopFilterTcOffset() );
+      if ( rpcSlice->getDeblockingFilterOverrideFlag() && eSliceType!=I_SLICE)
+      {
         rpcSlice->setDeblockingFilterBetaOffsetDiv2( m_pcCfg->getGOPEntry(iGOPid).m_betaOffsetDiv2 + m_pcCfg->getLoopFilterBetaOffset()  );
         rpcSlice->setDeblockingFilterTcOffsetDiv2( m_pcCfg->getGOPEntry(iGOPid).m_tcOffsetDiv2 + m_pcCfg->getLoopFilterTcOffset() );
@@ -516 +512 @@
       else
       {
-        rpcSlice->getPPS()->setDeblockingFilterBetaOffsetDiv2( m_pcCfg->getLoopFilterBetaOffset() );
-        rpcSlice->getPPS()->setDeblockingFilterTcOffsetDiv2( m_pcCfg->getLoopFilterTcOffset() );
         rpcSlice->setDeblockingFilterBetaOffsetDiv2( m_pcCfg->getLoopFilterBetaOffset() );
         rpcSlice->setDeblockingFilterTcOffsetDiv2( m_pcCfg->getLoopFilterTcOffset() );
@@ -558 +552 @@
 #endif
 
-  xStoreWPparam( pPPS->getUseWP(), pPPS->getWPBiPred() );
-
 #if SVC_EXTENSION
   if( layerId > 0 )
@@ -792 +784 @@
 
     xEstimateWPParamSlice( pcSlice );
-    pcSlice->initWpScaling();
+    pcSlice->initWpScaling(pcSlice->getSPS());
 
     // check WP on/off
@@ -1010 +1002 @@
     m_lastSliceSegmentEndContextState.loadContexts( m_pppcRDSbacCoder[0][CI_CURR_BEST] );//ctx end of dep.slice
   }
-  xRestoreWPparam( pcSlice );
 
   // stop use of temporary bit counter object.
   m_pppcRDSbacCoder[0][CI_CURR_BEST]->setBitstream(NULL);
   m_pcRDGoOnSbacCoder->setBitstream(NULL); // stop use of tempBitCounter.
+
+  // TODO: optimise cabac_init during compress slice to improve multi-slice operation
+  //if (pcSlice->getPPS()->getCabacInitPresentFlag() && !pcSlice->getPPS()->getDependentSliceSegmentsEnabledFlag())
+  //{
+  //  m_encCABACTableIdx = m_pcEntropyCoder->determineCabacInitIdx();
+  //}
+  //else
+  //{
+  //  m_encCABACTableIdx = pcSlice->getSliceType();
+  //}
 }
 
@@ -1198 +1199 @@
 #endif
 
-  if (pcSlice->getPPS()->getCabacInitPresentFlag())
-  {
-    if (pcSlice->getPPS()->getDependentSliceSegmentsEnabledFlag())
-    {
-      pcSlice->getPPS()->setEncCABACTableIdx( pcSlice->getSliceType() );
-    }
-    else
-    {
-      m_pcEntropyCoder->determineCabacInitIdx();
-    }
-  }
+  if (pcSlice->getPPS()->getCabacInitPresentFlag() && !pcSlice->getPPS()->getDependentSliceSegmentsEnabledFlag())
+  {
+    m_encCABACTableIdx = m_pcEntropyCoder->determineCabacInitIdx();
+  }
+  else
+  {
+    m_encCABACTableIdx = pcSlice->getSliceType();
+  }
+  
   numBinsCoded = m_pcBinCABAC->getBinsCoded();
 }

branches/SHM-dev/source/Lib/TLibEncoder/TEncSlice.h

@@ -98 +98 @@
   TEncSbac                m_lastSliceSegmentEndContextState;    ///< context storage for state at the end of the previous slice-segment (used for dependent slices only).
   TEncSbac                m_entropyCodingSyncContextState;      ///< context storate for state of contexts at the wavefront/WPP/entropy-coding-sync second CTU of tile-row
+  SliceType               m_encCABACTableIdx;
 
 #if SVC_EXTENSION && JCTVC_M0259_LAMBDAREFINEMENT
@@ -120 +121 @@
   /// preparation of slice encoding (reference marking, QP and lambda)
 #if SVC_EXTENSION
-  Void    initEncSlice        ( TComPic*  pcPic, Int pocLast, Int pocCurr, Int iNumPicRcvd,
-                                Int iGOPid,   TComSlice*& rpcSlice, TComSPS* pSPS, TComPPS *pPPS, TComVPS *vps, Bool isField );
+  Void    initEncSlice        ( TComPic*  pcPic, Int pocLast, Int pocCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, Bool isField );
   Void    estimateILWpParam   ( TComSlice* pcSlice );
 #else
   Void    initEncSlice        ( TComPic*  pcPic, Int pocLast, Int pocCurr, Int iNumPicRcvd,
-                                Int iGOPid,   TComSlice*& rpcSlice, TComSPS* pSPS, TComPPS *pPPS, Bool isField );
+                                Int iGOPid,   TComSlice*& rpcSlice, const TComSPS* pSPS, const TComPPS *pPPS, Bool isField );
 #endif
 
@@ -143 +143 @@
   Void    setSliceIdx(UInt i)   { m_uiSliceIdx = i;                       }
 
+  SliceType getEncCABACTableIdx() const           { return m_encCABACTableIdx;        }
+
 private:
   Double  xGetQPValueAccordingToLambda ( Double lambda );

branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp

@@ -185 +185 @@
   m_cSliceEncoder.      destroy();
   m_cCuEncoder.         destroy();
-  if (m_cSPS.getUseSAO())
-  {
-    m_cEncSAO.destroyEncData();
-    m_cEncSAO.destroy();
-  }
+  m_cEncSAO.            destroyEncData();
+  m_cEncSAO.            destroy();
   m_cLoopFilter.        destroy();
   m_cRateCtrl.          destroy();
@@ -232 +229 @@
   // initialize SPS
   xInitSPS();
-
-  // set the VPS profile information
-#if SVC_EXTENSION
-  m_cVPS.getTimingInfo()->setTimingInfoPresentFlag       ( true );
-#else
-  *m_cVPS.getPTL() = *m_cSPS.getPTL();
-  m_cVPS.getTimingInfo()->setTimingInfoPresentFlag       ( false );
-#endif
+  xInitVPS();
+
   m_cRdCost.setCostMode(m_costMode);
 
   // initialize PPS
-  m_cPPS.setSPS(&m_cSPS);
   xInitPPS();
   xInitRPS(isFieldCoding);
@@ -271 +261 @@
 
   m_iMaxRefPicNum = 0;
+
+  xInitScalingLists();
+
 #if SVC_EXTENSION
   m_iSPSIdCnt ++;
@@ -276 +269 @@
   xInitILRP();
 #endif
+}
+
+Void TEncTop::xInitScalingLists()
+{
+  // Initialise scaling lists
+  // The encoder will only use the SPS scaling lists. The PPS will never be marked present.
+
+  if(getUseScalingListId() == SCALING_LIST_OFF)
+  {
+#if SVC_EXTENSION
+    getTrQuant()->setFlatScalingList(m_cVPS.getChromaFormatIdc(&m_cSPS, m_layerId));
+#else
+    getTrQuant()->setFlatScalingList(m_cSPS.getChromaFormatIdc());
+#endif
+    getTrQuant()->setUseScalingList(false);
+    m_cSPS.setScalingListPresentFlag(false);
+    m_cPPS.setScalingListPresentFlag(false);
+  }
+  else if(getUseScalingListId() == SCALING_LIST_DEFAULT)
+  {
+#if SVC_EXTENSION
+    // inferring of the scaling list can be moved to the config file
+    UInt refLayerId = 0;
+    if( m_layerId > 0 && !m_cVPS.getNonHEVCBaseLayerFlag() && m_cVPS.getRecursiveRefLayerFlag( m_layerId, refLayerId ) )
+    {
+      m_cSPS.setInferScalingListFlag( true );
+      m_cSPS.setScalingListRefLayerId( refLayerId );
+      m_cSPS.setScalingListPresentFlag( false );
+      m_cPPS.setInferScalingListFlag( false );
+      m_cPPS.setScalingListPresentFlag( false );
+
+      // infer the scaling list from the reference layer
+      getTrQuant()->setScalingList( &m_ppcTEncTop[m_cVPS.getLayerIdxInVps(refLayerId)]->getSPS()->getScalingList(), m_cSPS.getChromaFormatIdc() );
+    }
+    else
+    {
+#endif
+    m_cSPS.getScalingList().setDefaultScalingList ();
+    m_cSPS.setScalingListPresentFlag(false);
+    m_cPPS.setScalingListPresentFlag(false);
+    getTrQuant()->setScalingList(&(m_cSPS.getScalingList()), m_cSPS.getChromaFormatIdc());
+#if SVC_EXTENSION
+    }
+#endif
+    getTrQuant()->setUseScalingList(true);
+  }
+  else if(getUseScalingListId() == SCALING_LIST_FILE_READ)
+  {
+#if SVC_EXTENSION
+    // inferring of the scaling list can be moved to the config file
+    UInt refLayerId = 0;
+    if( m_layerId > 0 && !m_cVPS.getNonHEVCBaseLayerFlag() && m_cVPS.getRecursiveRefLayerFlag( m_layerId, refLayerId ) )
+    {
+      m_cSPS.setInferScalingListFlag( true );
+      m_cSPS.setScalingListRefLayerId( refLayerId );
+      m_cSPS.setScalingListPresentFlag( false );
+      m_cPPS.setInferScalingListFlag( false );
+      m_cPPS.setScalingListPresentFlag( false );
+
+      // infer the scaling list from the reference layer
+      getTrQuant()->setScalingList( &m_ppcTEncTop[m_cVPS.getLayerIdxInVps(refLayerId)]->getSPS()->getScalingList(), m_cSPS.getChromaFormatIdc() );
+    }
+    else
+    {
+#endif
+    m_cSPS.getScalingList().setDefaultScalingList ();
+    if(m_cSPS.getScalingList().xParseScalingList(getScalingListFile()))
+    {
+      Bool bParsedScalingList=false; // Use of boolean so that assertion outputs useful string
+      assert(bParsedScalingList);
+      exit(1);
+    }
+    m_cSPS.getScalingList().checkDcOfMatrix();
+    m_cSPS.setScalingListPresentFlag(m_cSPS.getScalingList().checkDefaultScalingList());
+    m_cPPS.setScalingListPresentFlag(false);
+    getTrQuant()->setScalingList(&(m_cSPS.getScalingList()), m_cSPS.getChromaFormatIdc());
+#if SVC_EXTENSION
+    }
+#endif
+    getTrQuant()->setUseScalingList(true);
+  }
+  else
+  {
+    printf("error : ScalingList == %d not supported\n",getUseScalingListId());
+    assert(0);
+  }
+
+  // Prepare delta's:
+  for(UInt sizeId = 0; sizeId < SCALING_LIST_SIZE_NUM; sizeId++)
+  {
+    const Int predListStep = (sizeId == SCALING_LIST_32x32? (SCALING_LIST_NUM/NUMBER_OF_PREDICTION_MODES) : 1); // if 32x32, skip over chroma entries.
+
+    for(UInt listId = 0; listId < SCALING_LIST_NUM; listId+=predListStep)
+    {
+      m_cSPS.getScalingList().checkPredMode( sizeId, listId );
+    }
+  }
+
 }
 
@@ -585 +676 @@
 Void TEncTop::xGetNewPicBuffer ( TComPic*& rpcPic )
 {
+  // At this point, the SPS and PPS can be considered activated - they are copied to the new TComPic.
+
   TComSlice::sortPicList(m_cListPic);
 
@@ -611 +704 @@
         for( UInt i = 0; i < m_cVPS.getNumDirectRefLayers( m_layerId ); i++ )
         {
-          const Window scalEL = getPPS()->getScaledRefLayerWindowForLayer(m_cVPS.getRefLayerId(m_layerId, i));
-          const Window altRL = getPPS()->getRefLayerWindowForLayer(m_cVPS.getRefLayerId(m_layerId, i));
+          const Window scalEL = m_cPPS.getScaledRefLayerWindowForLayer(m_cVPS.getRefLayerId(m_layerId, i));
+          const Window altRL = m_cPPS.getRefLayerWindowForLayer(m_cVPS.getRefLayerId(m_layerId, i));
           Bool equalOffsets = scalEL.hasEqualOffset(altRL);
-          Bool zeroPhase = getPPS()->hasZeroResamplingPhase(m_cVPS.getRefLayerId(m_layerId, i));
+          Bool zeroPhase = m_cPPS.hasZeroResamplingPhase(m_cVPS.getRefLayerId(m_layerId, i));
 
           TEncTop *pcEncTopBase = (TEncTop *)getRefLayerEnc( i );
@@ -643 +736 @@
       }
 
-      pcEPic->create( m_iSourceWidth, m_iSourceHeight, m_chromaFormatIDC, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, m_cPPS.getMaxCuDQPDepth()+1 ,
-                      m_conformanceWindow, m_defaultDisplayWindow, m_numReorderPics, &m_cSPS);
+      pcEPic->create( m_cVPS, m_cSPS, m_cPPS, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, m_cPPS.getMaxCuDQPDepth()+1, false, m_layerId);
 #else  //SVC_EXTENSION
-      pcEPic->create( m_iSourceWidth, m_iSourceHeight, m_chromaFormatIDC, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, m_cPPS.getMaxCuDQPDepth()+1, m_conformanceWindow, m_defaultDisplayWindow, m_numReorderPics);
+      pcEPic->create( m_cSPS, m_cPPS, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, m_cPPS.getMaxCuDQPDepth()+1, false);
 #endif //SVC_EXTENSION
       rpcPic = pcEPic;
@@ -659 +751 @@
         for( UInt i = 0; i < m_cVPS.getNumDirectRefLayers( m_layerId ); i++ )
         {
-          const Window scalEL = getPPS()->getScaledRefLayerWindowForLayer(m_cVPS.getRefLayerId(m_layerId, i));
-          const Window altRL = getPPS()->getRefLayerWindowForLayer(m_cVPS.getRefLayerId(m_layerId, i));
+          const Window scalEL = m_cPPS.getScaledRefLayerWindowForLayer(m_cVPS.getRefLayerId(m_layerId, i));
+          const Window altRL = m_cPPS.getRefLayerWindowForLayer(m_cVPS.getRefLayerId(m_layerId, i));
           Bool equalOffsets = scalEL.hasEqualOffset(altRL);
-          Bool zeroPhase = getPPS()->hasZeroResamplingPhase(m_cVPS.getRefLayerId(m_layerId, i));
+          Bool zeroPhase = m_cPPS.hasZeroResamplingPhase(m_cVPS.getRefLayerId(m_layerId, i));
 
           TEncTop *pcEncTopBase = (TEncTop *)getRefLayerEnc( i );
@@ -688 +780 @@
       }
 
-      rpcPic->create( m_iSourceWidth, m_iSourceHeight, m_chromaFormatIDC, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, m_conformanceWindow, m_defaultDisplayWindow, m_numReorderPics, &m_cSPS);
+      rpcPic->create( m_cVPS, m_cSPS, m_cPPS, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, false, m_layerId );
 #else  //SVC_EXTENSION
-      rpcPic->create( m_iSourceWidth, m_iSourceHeight, m_chromaFormatIDC, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, m_conformanceWindow, m_defaultDisplayWindow, m_numReorderPics, false );
+      rpcPic->create( m_cSPS, m_cPPS, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, false );
 #endif //SVC_EXTENSION
     }
@@ -705 +797 @@
   rpcPic->getPicYuvRec()->setBorderExtension(false);
 }
+
+Void TEncTop::xInitVPS()
+{
+  // The SPS must have already been set up.
+  // set the VPS profile information.
+#if SVC_EXTENSION
+  m_cVPS.setVpsVuiPresentFlag( true );
+#else
+  *m_cVPS.getPTL() = *m_cSPS.getPTL();
+  m_cVPS.setMaxOpSets(1);
+#endif
+  m_cVPS.getTimingInfo()->setTimingInfoPresentFlag       ( false );
+  m_cVPS.setNumHrdParameters( 0 );
+
+  m_cVPS.createHrdParamBuffer();
+  for( UInt i = 0; i < m_cVPS.getNumHrdParameters(); i ++ )
+  {
+    m_cVPS.setHrdOpSetIdx( 0, i );
+    m_cVPS.setCprmsPresentFlag( false, i );
+    // Set up HrdParameters here.
+  }
+}
+
 
 Void TEncTop::xInitSPS()
@@ -781 +896 @@
   m_cSPS.setQuadtreeTUMaxDepthIntra( m_uiQuadtreeTUMaxDepthIntra    );
 
+  m_cSPS.setTMVPFlagsPresent((getTMVPModeId() == 2 || getTMVPModeId() == 1));
+
   m_cSPS.setTMVPFlagsPresent(false);
 
   m_cSPS.setMaxTrSize   ( 1 << m_uiQuadtreeTULog2MaxSize );
-
-  Int i;
-
-  for (i = 0; i < g_uiMaxCUDepth-g_uiAddCUDepth; i++ )
-  {
-    m_cSPS.setAMPAcc( i, m_useAMP );
-    //m_cSPS.setAMPAcc( i, 1 );
-  }
-
+  
   m_cSPS.setUseAMP ( m_useAMP );
-
-  for (i = g_uiMaxCUDepth-g_uiAddCUDepth; i < g_uiMaxCUDepth; i++ )
-  {
-    m_cSPS.setAMPAcc(i, 0);
-  }
-
 
   for (UInt channelType = 0; channelType < MAX_NUM_CHANNEL_TYPE; channelType++)
@@ -830 +933 @@
   m_cSPS.setTemporalIdNestingFlag( ( m_maxTempLayer == 1 ) ? true : false );
 
-  for ( i = 0; i < min(m_cSPS.getMaxTLayers(),(UInt) MAX_TLAYER); i++ )
+  for ( Int i = 0; i < min(m_cSPS.getMaxTLayers(),(UInt) MAX_TLAYER); i++ )
   {
 #if SVC_EXTENSION
@@ -841 +944 @@
   m_cSPS.setPCMFilterDisableFlag  ( m_bPCMFilterDisableFlag );
   m_cSPS.setDisableIntraReferenceSmoothing( m_disableIntraReferenceSmoothing );
-  m_cSPS.setScalingListFlag ( (m_useScalingListId == 0) ? 0 : 1 );
+  m_cSPS.setScalingListFlag ( (m_useScalingListId == SCALING_LIST_OFF) ? 0 : 1 );
   m_cSPS.setUseStrongIntraSmoothing( m_useStrongIntraSmoothing );
   m_cSPS.setVuiParametersPresentFlag(getVuiParametersPresentFlag());
@@ -880 +983 @@
     pcVUI->setLog2MaxMvLengthVertical(getLog2MaxMvLengthVertical());
   }
+  m_cSPS.setNumLongTermRefPicSPS(NUM_LONG_TERM_REF_PIC_SPS);
+  assert (NUM_LONG_TERM_REF_PIC_SPS <= MAX_NUM_LONG_TERM_REF_PICS);
+  for (Int k = 0; k < NUM_LONG_TERM_REF_PIC_SPS; k++)
+  {
+    m_cSPS.setLtRefPicPocLsbSps(k, 0);
+    m_cSPS.setUsedByCurrPicLtSPSFlag(k, 0);
+  }
+  if( getPictureTimingSEIEnabled() || getDecodingUnitInfoSEIEnabled() )
+  {
+#if SVC_EXTENSION
+    const UInt picWidth = m_cVPS.getPicWidthInLumaSamples(&m_cSPS, m_layerId);
+    const UInt picHeight= m_cVPS.getPicWidthInLumaSamples(&m_cSPS, m_layerId);
+#else
+    const UInt picWidth = m_cSPS.getPicWidthInLumaSamples();
+    const UInt picHeight= m_cSPS.getPicWidthInLumaSamples();
+#endif
+
+    const UInt frameWidthInCtus   = ( picWidth + g_uiMaxCUWidth -1 ) / g_uiMaxCUWidth;
+    const UInt frameHeightInCtus  = ( picHeight + g_uiMaxCUHeight - 1 ) / g_uiMaxCUHeight;
+    const UInt numCtusInFrame = frameWidthInCtus * frameHeightInCtus;
+
+    UInt maxCU = getSliceArgument();
+    UInt numDU = ( getSliceMode() == FIXED_NUMBER_OF_CTU ) ? ( numCtusInFrame / maxCU ) : ( 0 );
+    if( numCtusInFrame % maxCU != 0 || numDU == 0 )
+    {
+      numDU ++;
+    }
+    m_cSPS.getVuiParameters()->getHrdParameters()->setNumDU( numDU );
+    m_cSPS.setHrdParameters( getFrameRate(), numDU, getTargetBitrate(), ( getIntraPeriod() > 0 ) );
+  }
+  if( getBufferingPeriodSEIEnabled() || getPictureTimingSEIEnabled() || getDecodingUnitInfoSEIEnabled() )
+  {
+    m_cSPS.getVuiParameters()->setHrdParametersPresentFlag( true );
+  }
+
 }
 
@@ -892 +1030 @@
   }
 
-  if (m_costMode==COST_SEQUENCE_LEVEL_LOSSLESS || m_costMode==COST_LOSSLESS_CODING) bUseDQP=false;
-
-  if(bUseDQP)
+  if (m_costMode==COST_SEQUENCE_LEVEL_LOSSLESS || m_costMode==COST_LOSSLESS_CODING)
+  {
+    bUseDQP=false;
+  }
+
+
+  if ( m_RCEnableRateControl )
+  {
+    m_cPPS.setUseDQP(true);
+    m_cPPS.setMaxCuDQPDepth( 0 );
+  }
+  else if(bUseDQP)
   {
     m_cPPS.setUseDQP(true);
     m_cPPS.setMaxCuDQPDepth( m_iMaxCuDQPDepth );
-    m_cPPS.setMinCuDQPSize( m_cPPS.getSPS()->getMaxCUWidth() >> ( m_cPPS.getMaxCuDQPDepth()) );
   }
   else
@@ -904 +1050 @@
     m_cPPS.setUseDQP(false);
     m_cPPS.setMaxCuDQPDepth( 0 );
-    m_cPPS.setMinCuDQPSize( m_cPPS.getSPS()->getMaxCUWidth() >> ( m_cPPS.getMaxCuDQPDepth()) );
   }
 
@@ -919 +1064 @@
   }
 
-  if ( m_RCEnableRateControl )
-  {
-    m_cPPS.setUseDQP(true);
-    m_cPPS.setMaxCuDQPDepth( 0 );
-    m_cPPS.setMinCuDQPSize( m_cPPS.getSPS()->getMaxCUWidth() >> ( m_cPPS.getMaxCuDQPDepth()) );
-  }
-
-  m_cPPS.setMinCuChromaQpAdjSize( m_cPPS.getSPS()->getMaxCUWidth() >> ( m_cPPS.getMaxCuChromaQpAdjDepth()) );
-
   m_cPPS.setQpOffset(COMPONENT_Cb, m_chromaCbQpOffset );
   m_cPPS.setQpOffset(COMPONENT_Cr, m_chromaCrQpOffset );
 
-  m_cPPS.setNumSubstreams(m_iWaveFrontSubstreams);
   m_cPPS.setEntropyCodingSyncEnabledFlag( m_iWaveFrontSynchro > 0 );
   m_cPPS.setTilesEnabledFlag( (m_iNumColumnsMinus1 > 0 || m_iNumRowsMinus1 > 0) );
@@ -952 +1087 @@
   {
     m_cPPS.setDeblockingFilterControlPresentFlag (m_DeblockingFilterControlPresent );
+
+    if (m_cPPS.getDeblockingFilterControlPresentFlag())
+    {
+      m_cPPS.setDeblockingFilterOverrideEnabledFlag( !getLoopFilterOffsetInPPS() );
+      m_cPPS.setPicDisableDeblockingFilterFlag( getLoopFilterDisable() );
+    }
+  }
+
+  if (m_cPPS.getDeblockingFilterControlPresentFlag() && ! m_cPPS.getPicDisableDeblockingFilterFlag())
+  {
+    m_cPPS.setDeblockingFilterBetaOffsetDiv2( getLoopFilterBetaOffset() );
+    m_cPPS.setDeblockingFilterTcOffsetDiv2( getLoopFilterTcOffset() );
   }
   m_cPPS.setLog2ParallelMergeLevelMinus2   (m_log2ParallelMergeLevelMinus2 );
@@ -1076 +1223 @@
     rps->setInterRPSPrediction(ge.m_interRPSPrediction > 0);  // not very clean, converting anything > 0 to true.
     rps->setDeltaRIdxMinus1(0);                               // index to the Reference RPS is always the previous one.
-    TComReferencePictureSet*     RPSRef = rpsList->getReferencePictureSet(i-1);  // get the reference RPS
+    TComReferencePictureSet*     RPSRef = i>0 ? rpsList->getReferencePictureSet(i-1): NULL;  // get the reference RPS
 
     if (ge.m_interRPSPrediction == 2)  // Automatic generation of the inter RPS idc based on the RIdx provided.
     {
+      assert (RPSRef!=NULL);
       Int deltaRPS = getGOPEntry(i-1).m_POC - ge.m_POC;  // the ref POC - current POC
       Int numRefDeltaPOC = RPSRef->getNumberOfPictures();
@@ -1108 +1256 @@
     else if (ge.m_interRPSPrediction == 1)  // inter RPS idc based on the RefIdc values provided in config file.
     {
+      assert (RPSRef!=NULL);
       rps->setDeltaRPS(ge.m_deltaRPS);
       rps->setNumRefIdc(ge.m_numRefIdc);
@@ -1266 +1415 @@
   }
 
-  slice->setRPS(getSPS()->getRPSList()->getReferencePictureSet(slice->getRPSidx()));
+  TComReferencePictureSet *rps=slice->getLocalRPS();
+  (*rps) = *(slice->getSPS()->getRPSList()->getReferencePictureSet(slice->getRPSidx()));
+  slice->setRPS(rps);
   slice->getRPS()->setNumberOfPictures(slice->getRPS()->getNumberOfNegativePictures()+slice->getRPS()->getNumberOfPositivePictures());
 }
@@ -1313 +1464 @@
 
   // # substreams is "per tile" when tiles are independent.
-  if (m_iWaveFrontSynchro )
-  {
-    m_cPPS.setNumSubstreams(m_iWaveFrontSubstreams * (m_iNumColumnsMinus1+1));
-  }
-  else
-  {
-    m_cPPS.setNumSubstreams((m_iNumRowsMinus1+1) * (m_iNumColumnsMinus1+1));
-  }
 }
 
@@ -1404 +1547 @@
   picHeight   = repFormat->getPicHeightVpsInLumaSamples();
   
-  if(m_layerId > 0)
+  if( m_layerId > 0 )
   {
     g_bitDepth[CHANNEL_TYPE_LUMA]   = bitDepthY;
@@ -1413 +1556 @@
     g_uiAddCUDepth  = max (0, m_cSPS.getLog2MinCodingBlockSize() - (Int)m_cSPS.getQuadtreeTULog2MinSize() );
 
-    Int  numReorderPics[MAX_TLAYER];
-    Window &conformanceWindow = repFormat->getConformanceWindowVps();
-    Window defaultDisplayWindow = m_cSPS.getVuiParametersPresentFlag() ? m_cSPS.getVuiParameters()->getDefaultDisplayWindow() : Window();
-
     if (m_cIlpPic[0] == NULL)
     {
@@ -1422 +1561 @@
       {
         m_cIlpPic[j] = new TComPic;
-#if AUXILIARY_PICTURES
-        m_cIlpPic[j]->create(picWidth, picHeight, m_chromaFormatIDC, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, &m_cSPS, true);
-#else
-        m_cIlpPic[j]->create(picWidth, picHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, &m_cSPS, true);
-#endif
+        m_cIlpPic[j]->create(m_cVPS, m_cSPS, m_cPPS, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, true, m_layerId);
         for (Int i=0; i<m_cIlpPic[j]->getPicSym()->getNumberOfCtusInFrame(); i++)
         {
@@ -1462 +1597 @@
 }
 
-Window& TEncTop::getScaledRefLayerWindowForLayer(Int layerId)
-{
-  static Window win;
-
+Window TEncTop::getScaledRefLayerWindowForLayer(Int layerId)
+{
   for (Int i = 0; i < m_numRefLayerLocationOffsets; i++)
   {
@@ -1474 +1607 @@
   }
 
-  win.resetWindow();  // scaled reference layer offsets are inferred to be zero when not present
-  return win;
-}
-
-Window& TEncTop::getRefLayerWindowForLayer(Int layerId)
-{
-  static Window win;
-
+  return Window();
+}
+
+Window TEncTop::getRefLayerWindowForLayer(Int layerId)
+{
   for (Int i = 0; i < m_numRefLayerLocationOffsets; i++)
   {
@@ -1490 +1620 @@
   }
 
-  win.resetWindow();  // reference offsets are inferred to be zero when not present
-  return win;
+  return Window();
 }
 #endif //SVC_EXTENSION

branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.h

@@ -93 +93 @@
   TEncCu                  m_cCuEncoder;                   ///< CU encoder
   // SPS
-  TComSPS                 m_cSPS;                         ///< SPS
-  TComPPS                 m_cPPS;                         ///< PPS
+  TComSPS                 m_cSPS;                         ///< SPS. This is the base value. This is copied to TComPicSym
+  TComPPS                 m_cPPS;                         ///< PPS. This is the base value. This is copied to TComPicSym
   // RD cost computation
   TComRdCost              m_cRdCost;                      ///< RD cost computation class
@@ -110 +110 @@
   TEncPreanalyzer         m_cPreanalyzer;                 ///< image characteristics analyzer for TM5-step3-like adaptive QP
 
-  TComScalingList         m_scalingList;                 ///< quantization matrix information
   TEncRateCtrl            m_cRateCtrl;                    ///< Rate control class
   
@@ -148 +147 @@
 protected:
   Void  xGetNewPicBuffer  ( TComPic*& rpcPic );           ///< get picture buffer which will be processed
+  Void  xInitVPS          ();                             ///< initialize VPS from encoder options
   Void  xInitSPS          ();                             ///< initialize SPS from encoder options
   Void  xInitPPS          ();                             ///< initialize PPS from encoder options
+  Void  xInitScalingLists();                              ///< initialize scaling lists
 
   Void  xInitPPSforTiles  ();
@@ -187 +188 @@
   TEncSbac*               getRDGoOnSbacCoder    () { return  &m_cRDGoOnSbacCoder;     }
   TEncRateCtrl*           getRateCtrl           () { return &m_cRateCtrl;             }
-  TComSPS*                getSPS                () { return  &m_cSPS;                 }
-  TComPPS*                getPPS                () { return  &m_cPPS;                 }
   Void selectReferencePictureSet(TComSlice* slice, Int POCCurr, Int GOPid );
   Int getReferencePictureSetIdxForSOP(TComSlice* slice, Int POCCurr, Int GOPid );
-  TComScalingList*        getScalingList        () { return  &m_scalingList;         }
   // -------------------------------------------------------------------------------------------------------------------
   // encoder function
@@ -198 +196 @@
   /// encode several number of pictures until end-of-sequence
 #if SVC_EXTENSION
+  TComSPS*  getSPS()                                          { return &m_cSPS;                    }
+#if CGS_3D_ASYMLUT
+  TComPPS*  getPPS()                                          { return &m_cPPS;                    }
+#endif
   Void      setLayerEnc(TEncTop** p)                          { m_ppcTEncTop = p;                  }
   TEncTop** getLayerEnc()                                     { return m_ppcTEncTop;               }
@@ -203 +205 @@
   Int       getNumPicRcvd()                                   { return m_iNumPicRcvd;              }
   Void      setNumPicRcvd( Int num )                          { m_iNumPicRcvd = num;               }
-  Void      setNumRefLayerLocationOffsets(Int x)              { m_numRefLayerLocationOffsets = x;    }
-  UInt      getNumRefLayerLocationOffsets()                   { return m_numRefLayerLocationOffsets; }
+  Void      setNumRefLayerLocationOffsets(Int x)              { m_numRefLayerLocationOffsets = x;     }
+  UInt      getNumRefLayerLocationOffsets()                   { return m_numRefLayerLocationOffsets;  }
   Void      setRefLocationOffsetLayerId(Int x, UInt id)       { m_refLocationOffsetLayerId[x] = id;   }
   UInt      getRefLocationOffsetLayerId(Int x)                { return m_refLocationOffsetLayerId[x]; }
-  Window&   getScaledRefLayerWindowForLayer(Int layerId);
+  Window    getScaledRefLayerWindowForLayer(Int layerId);
   Window&   getScaledRefLayerWindow(Int x)                    { return m_scaledRefLayerWindow[x];  }
   Void      setNumRefLayerOffsets(Int x)                      { m_numRefLayerOffsets = x;          }
@@ -213 +215 @@
   Void      setRefLayerId(Int layerIdx, UInt layerId)         { m_refLayerId[layerIdx] = layerId;  }
   UInt      getRefLayerId(Int layerIdx)                       { return m_refLayerId[layerIdx];     }
-  Window&   getRefLayerWindowForLayer(Int layerId);
-  Window&   getRefLayerWindow(Int x)                          { return m_refLayerWindow[x]; }
+  Window    getRefLayerWindowForLayer(Int layerId);
+  Window&   getRefLayerWindow(Int x)                          { return m_refLayerWindow[x];                  }
   Bool      getScaledRefLayerOffsetPresentFlag(Int x)         { return m_scaledRefLayerOffsetPresentFlag[x]; }
-  Void      setScaledRefLayerOffsetPresentFlag(Int x, Bool b) { m_scaledRefLayerOffsetPresentFlag[x] = b; }
-  Bool      getRefRegionOffsetPresentFlag(Int x)              { return m_refRegionOffsetPresentFlag[x]; }
-  Void      setRefRegionOffsetPresentFlag(Int x, Bool b)      { m_refRegionOffsetPresentFlag[x] = b; }
-  Int       getPhaseHorLuma(Int x)                            { return m_phaseHorLuma[x]; }
-  Int       getPhaseVerLuma(Int x)                            { return m_phaseVerLuma[x]; }
-  Int       getPhaseHorChroma(Int x)                          { return m_phaseHorChroma[x]; }
-  Int       getPhaseVerChroma(Int x)                          { return m_phaseVerChroma[x]; }
-  Void      setPhaseHorLuma(Int x, Int val)                   { m_phaseHorLuma[x] = val; }
-  Void      setPhaseVerLuma(Int x, Int val)                   { m_phaseVerLuma[x] = val; }
-  Void      setPhaseHorChroma(Int x, Int val)                 { m_phaseHorChroma[x] = val; }
-  Void      setPhaseVerChroma(Int x, Int val)                 { m_phaseVerChroma[x] = val; }
+  Void      setScaledRefLayerOffsetPresentFlag(Int x, Bool b) { m_scaledRefLayerOffsetPresentFlag[x] = b;    }
+  Bool      getRefRegionOffsetPresentFlag(Int x)              { return m_refRegionOffsetPresentFlag[x];      }
+  Void      setRefRegionOffsetPresentFlag(Int x, Bool b)      { m_refRegionOffsetPresentFlag[x] = b;         }
+  Int       getPhaseHorLuma(Int x)                            { return m_phaseHorLuma[x];           }
+  Int       getPhaseVerLuma(Int x)                            { return m_phaseVerLuma[x];           }
+  Int       getPhaseHorChroma(Int x)                          { return m_phaseHorChroma[x];         }
+  Int       getPhaseVerChroma(Int x)                          { return m_phaseVerChroma[x];         }
+  Void      setPhaseHorLuma(Int x, Int val)                   { m_phaseHorLuma[x] = val;            }
+  Void      setPhaseVerLuma(Int x, Int val)                   { m_phaseVerLuma[x] = val;            }
+  Void      setPhaseHorChroma(Int x, Int val)                 { m_phaseHorChroma[x] = val;          }
+  Void      setPhaseVerChroma(Int x, Int val)                 { m_phaseVerChroma[x] = val;          }
   Bool      getResamplePhaseSetPresentFlag(Int x)             { return m_resamplePhaseSetPresentFlag[x]; }
-  Void      setResamplePhaseSetPresentFlag(Int x, Bool b)     { m_resamplePhaseSetPresentFlag[x] = b; }
-
-  TComPic** getIlpList()                                      { return m_cIlpPic; }
-  Void      setMFMEnabledFlag(Bool flag)                      { m_bMFMEnabledFlag = flag; }
-  Bool      getMFMEnabledFlag()                               { return m_bMFMEnabledFlag; }    
+  Void      setResamplePhaseSetPresentFlag(Int x, Bool b)     { m_resamplePhaseSetPresentFlag[x] = b;    }
+
+  TComPic** getIlpList()                                      { return m_cIlpPic;                    }
+  Void      setMFMEnabledFlag(Bool flag)                      { m_bMFMEnabledFlag = flag;            }
+  Bool      getMFMEnabledFlag()                               { return m_bMFMEnabledFlag;            }    
   Void      setInterLayerWeightedPredFlag(Bool flag)          { m_interLayerWeightedPredFlag = flag; }
   Bool      getInterLayerWeightedPredFlag()                   { return m_interLayerWeightedPredFlag; }

branches/SHM-dev/source/Lib/TLibEncoder/WeightPredAnalysis.cpp

@@ -47 +47 @@
 WeightPredAnalysis::WeightPredAnalysis()
 {
-  m_weighted_pred_flag = false;
-  m_weighted_bipred_flag = false;
-
   for ( UInt lst =0 ; lst<NUM_REF_PIC_LIST_01 ; lst++ )
   {
@@ -121 +118 @@
 }
 
-
-/** store weighted_pred_flag and weighted_bipred_idc values
- * \param weighted_pred_flag
- * \param weighted_bipred_idc
- * \returns Void
- */
-Void  WeightPredAnalysis::xStoreWPparam(const Bool weighted_pred_flag, const Bool weighted_bipred_flag)
-{
-  m_weighted_pred_flag   = weighted_pred_flag;
-  m_weighted_bipred_flag = weighted_bipred_flag;
-}
-
-
-/** restore weighted_pred_flag and weighted_bipred_idc values
- * \param TComSlice *slice
- * \returns Void
- */
-Void  WeightPredAnalysis::xRestoreWPparam(TComSlice *const slice)
-{
-  slice->getPPS()->setUseWP   (m_weighted_pred_flag);
-  slice->getPPS()->setWPBiPred(m_weighted_bipred_flag);
-}
-
-
 /** check weighted pred or non-weighted pred
  * \param TComSlice *slice
@@ -168 +141 @@
   if(iPresentCnt==0)
   {
-    slice->getPPS()->setUseWP(false);
-    slice->getPPS()->setWPBiPred(false);
+    slice->setTestWeightPred(false);
+    slice->setTestWeightBiPred(false);
 
     for ( UInt lst=0 ; lst<NUM_REF_PIC_LIST_01 ; lst++ )
@@ -188 +161 @@
     slice->setWpScaling( m_wp );
   }
+  else
+  {
+    slice->setTestWeightPred(slice->getPPS()->getUseWP());
+    slice->setTestWeightBiPred(slice->getPPS()->getWPBiPred());
+  }
 }
 
@@ -213 +191 @@
   } while (validRangeFlag == false);
 
-  // selecting whether WP is used, or not
+  // selecting whether WP is used, or not (fast search)
+  // NOTE: This is not operating on a slice, but the entire picture.
   xSelectWP(slice, iDenom);
 

branches/SHM-dev/source/Lib/TLibEncoder/WeightPredAnalysis.h

@@ -46 +46 @@
 private:
 
-  // member variables
-  Bool            m_weighted_pred_flag;
-  Bool            m_weighted_bipred_flag;
+  // member variables  
   WPScalingParam  m_wp[NUM_REF_PIC_LIST_01][MAX_NUM_REF][MAX_NUM_COMPONENT];
 
@@ -75 +73 @@
   Void  xCalcACDCParamSlice  (TComSlice *const slice);
   Void  xEstimateWPParamSlice(TComSlice *const slice);
-  Void  xStoreWPparam        (const Bool weighted_pred_flag, const Bool weighted_bipred_flag);
-  Void  xRestoreWPparam      (TComSlice *const slice);
   Void  xCheckWPEnable       (TComSlice *const slice);
 };