Ticket #1121: num_reorder_pics.patch

App/TAppDecoder/TAppDecTop.cpp

@@ -193 +193 @@
       // write reconstruction to file
       if(bNewPicture)
       {
-        xWriteOutput( pcListPic, nalu.m_temporalId );
+        xWriteOutput( pcListPic );
       }
     }
   }
@@ -237 +237 @@
 /** \param pcListPic list of pictures to be written to file
     \todo            DYN_REF_FREE should be revised
  */
-Void TAppDecTop::xWriteOutput( TComList<TComPic*>* pcListPic, UInt tId )
+Void TAppDecTop::xWriteOutput( TComList<TComPic*>* pcListPic )
 {
   TComList<TComPic*>::iterator iterPic   = pcListPic->begin();
   Int not_displayed = 0;
@@ -257 +257 @@
   {
     TComPic* pcPic = *(iterPic);
     
-    if ( pcPic->getOutputMark() && (not_displayed >  pcPic->getNumReorderPics(tId) && pcPic->getPOC() > m_iPOCLastDisplay))
+    if ( pcPic->getOutputMark() && (not_displayed >  pcPic->getNumReorderPics( ) && pcPic->getPOC() > m_iPOCLastDisplay))
     {
       // write to file
        not_displayed--;

App/TAppDecoder/TAppDecTop.h

@@ -80 +80 @@
   Void  xDestroyDecLib    (); ///< destroy internal classes
   Void  xInitDecLib       (); ///< initialize decoder class
   
-  Void  xWriteOutput      ( TComList<TComPic*>* pcListPic , UInt tId); ///< write YUV to file
+  Void  xWriteOutput      ( TComList<TComPic*>* pcListPic ); ///< write YUV to file
   Void  xFlushOutput      ( TComList<TComPic*>* pcListPic ); ///< flush all remaining decoded pictures to file
   Bool  isNaluWithinTargetDecLayerIdSet ( InputNALUnit* nalu ); ///< check whether given Nalu is within targetDecLayerIdSet
 };

Lib/TLibCommon/TComPic.cpp

@@ -73 +73 @@
 }
 
 Void TComPic::create( Int iWidth, Int iHeight, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, Window &conformanceWindow, Window &defaultDisplayWindow,
-                      Int *numReorderPics, Bool bIsVirtual)
+                      Int numReorderPics, Bool bIsVirtual)
 
 {
   m_apcPicSym     = new TComPicSym;  m_apcPicSym   ->create( iWidth, iHeight, uiMaxWidth, uiMaxHeight, uiMaxDepth );
@@ -96 +96 @@
   /* store display window parameters with picture */
   m_defaultDisplayWindow = defaultDisplayWindow;
 
-  /* store number of reorder pics with picture */
-  memcpy(m_numReorderPics, numReorderPics, MAX_TLAYER*sizeof(Int));
+  /* store maximum number of reorder pics for highest temporal ID with picture */
+  m_numReorderPics = numReorderPics;
 
   return;
 }

Lib/TLibCommon/TComPic.h

@@ -77 +77 @@
   TComPicYuv*           m_pNDBFilterYuvTmp;    //!< temporary picture buffer when non-cross slice/tile boundary in-loop filtering is enabled
   Bool                  m_bCheckLTMSB;
   
-  Int                   m_numReorderPics[MAX_TLAYER];
+  Int                   m_numReorderPics;      // maximum number of reorder pictures for highest temporal ID
   Window                m_conformanceWindow;
   Window                m_defaultDisplayWindow;
 
@@ -90 +90 @@
   virtual ~TComPic();
   
   Void          create( Int iWidth, Int iHeight, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, Window &conformanceWindow, Window &defaultDisplayWindow, 
-                        Int *numReorderPics, Bool bIsVirtual = false );
+                        Int numReorderPics, Bool bIsVirtual = false );
                         
   virtual Void  destroy();
   
@@ -137 +137 @@
   Void          setOutputMark (Bool b) { m_bNeededForOutput = b;     }
   Bool          getOutputMark ()       { return m_bNeededForOutput;  }
  
-  Void          setNumReorderPics(Int i, UInt tlayer) { m_numReorderPics[tlayer] = i;    }
-  Int           getNumReorderPics(UInt tlayer)        { return m_numReorderPics[tlayer]; }
+  Void          setNumReorderPics(Int i) { m_numReorderPics = i;    }
+  Int           getNumReorderPics()      { return m_numReorderPics; }
 
   Void          compressMotion(); 
   UInt          getCurrSliceIdx()            { return m_uiCurrSliceIdx;                }

Lib/TLibDecoder/TDecTop.cpp

@@ -130 +130 @@
     rpcPic = new TComPic();
     
     rpcPic->create ( pcSlice->getSPS()->getPicWidthInLumaSamples(), pcSlice->getSPS()->getPicHeightInLumaSamples(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, 
-                     conformanceWindow, defaultDisplayWindow, numReorderPics, true);
+                     conformanceWindow, defaultDisplayWindow, pcSlice->getSPS()->getNumReorderPics(pcSlice->getSPS()->getMaxTLayers()-1), true);
     rpcPic->getPicSym()->allocSaoParam(&m_cSAO);
     m_cListPic.pushBack( rpcPic );
     
@@ -168 +168 @@
   }
   rpcPic->destroy();
   rpcPic->create ( pcSlice->getSPS()->getPicWidthInLumaSamples(), pcSlice->getSPS()->getPicHeightInLumaSamples(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
-                   conformanceWindow, defaultDisplayWindow, numReorderPics, true);
+                   conformanceWindow, defaultDisplayWindow, pcSlice->getSPS()->getNumReorderPics(pcSlice->getSPS()->getMaxTLayers()-1), true);
   rpcPic->getPicSym()->allocSaoParam(&m_cSAO);
 }
 

Lib/TLibEncoder/TEncPic.cpp

@@ -122 +122 @@
  * \param uiMaxHeight Maximum CU height
  * \param uiMaxDepth Maximum CU depth
  * \param uiMaxAQDepth Maximum depth of unit block for assigning QP adaptive to local image characteristics
+ * \param conformanceWindow Conformance window parameters
+ * \param defaultDisplayWindow Display window parameters
+ * \param numReorderPics Maximum number of reorder pictures for highest temporal ID
  * \param bIsVirtual
  * \return Void
  */
 Void TEncPic::create( Int iWidth, Int iHeight, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, UInt uiMaxAQDepth,  
-                      Window &conformanceWindow, Window &defaultDisplayWindow, Int *numReorderPics, Bool bIsVirtual )
+                      Window &conformanceWindow, Window &defaultDisplayWindow, Int numReorderPics, Bool bIsVirtual )
 {
   TComPic::create( iWidth, iHeight, uiMaxWidth, uiMaxHeight, uiMaxDepth,  
                    conformanceWindow, defaultDisplayWindow, numReorderPics, bIsVirtual );

Lib/TLibEncoder/TEncPic.h

@@ -103 +103 @@
   virtual ~TEncPic();
 
   Void          create( Int iWidth, Int iHeight, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, UInt uiMaxAQDepth,   
-                        Window &conformanceWindow, Window &defaultDisplayWindow, Int *numReorderPics, Bool bIsVirtual = false );
+                        Window &conformanceWindow, Window &defaultDisplayWindow, Int numReorderPics, Bool bIsVirtual = false );
   virtual Void  destroy();
 
   TEncPicQPAdaptationLayer* getAQLayer( UInt uiDepth )  { return &m_acAQLayer[uiDepth]; }

Lib/TLibEncoder/TEncTop.cpp

@@ -419 +419 @@
     {
       TEncPic* pcEPic = new TEncPic;
       pcEPic->create( m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, m_cPPS.getMaxCuDQPDepth()+1 ,
-                      m_conformanceWindow, m_defaultDisplayWindow, m_numReorderPics);
+                      m_conformanceWindow, m_defaultDisplayWindow, m_numReorderPics[m_maxTempLayer-1]);
       rpcPic = pcEPic;
     }
     else
@@ -427 +427 @@
       rpcPic = new TComPic;
 
       rpcPic->create( m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, 
-                      m_conformanceWindow, m_defaultDisplayWindow, m_numReorderPics);
+                      m_conformanceWindow, m_defaultDisplayWindow, m_numReorderPics[m_maxTempLayer-1]);
     }
     if (getUseSAO())
     {