Ticket #81: IdrFix_rev1026.patch

Lib/TLibCommon/TComSlice.cpp

@@ -79 +79 @@
 , m_colFromL0Flag                 ( 1 )
 #if SETTING_NO_OUT_PIC_PRIOR
 , m_noOutputPriorPicsFlag         ( false )
+#if IDR_FIX
+, m_firstSliceInPic               ( false )
+#endif
 , m_noRaslOutputFlag              ( false )
 , m_handleCraAsBlaFlag            ( false )
 #endif

Lib/TLibCommon/TComSlice.h

@@ -2258 +2258 @@
   TComTrQuant* m_pcTrQuant;
 #endif  
   UInt        m_colFromL0Flag;  // collocated picture from List0 flag
-  
+#if IDR_FIX 
+  Bool        m_firstSliceInPic;
+#endif
 #if SETTING_NO_OUT_PIC_PRIOR
   Bool        m_noOutputPriorPicsFlag;
   Bool        m_noRaslOutputFlag;
@@ -2545 +2547 @@
   Void setMaxNumMergeCand               (UInt val )         { m_maxNumMergeCand = val;                    }
   UInt getMaxNumMergeCand               ()                  { return m_maxNumMergeCand;                   }
 
+#if IDR_FIX
+  Void setFirstSliceInPic               ( Bool val )        { m_firstSliceInPic = val;                    }
+  Bool getFirstSliceInPic               ()                  { return m_firstSliceInPic;                   }
+#endif
+
 #if SETTING_NO_OUT_PIC_PRIOR
   Void setNoOutputPriorPicsFlag         ( Bool val )        { m_noOutputPriorPicsFlag = val;                    }
   Bool getNoOutputPriorPicsFlag         ()                  { return m_noOutputPriorPicsFlag;                   }

Lib/TLibCommon/TypeDef.h

@@ -164 +164 @@
 #endif
 
 #define P0297_VPS_POC_LSB_ALIGNED_FLAG   1      ///< JCTVC-P0297: vps_poc_lsb_aligned_flag for cross-layer POC anchor picture derivation
-
+#define IDR_FIX                          1
 #define VPS_EXTN_MASK_AND_DIM_INFO       1      ///< Include avc_base_layer_flag, splitting_flag, scalability mask and dimension related info
 #if VPS_EXTN_MASK_AND_DIM_INFO
 #define MAX_VPS_NUM_SCALABILITY_TYPES    16

Lib/TLibDecoder/TDecCAVLC.cpp

@@ -3067 +3067 @@
 
   UInt firstSliceSegmentInPic;
   READ_FLAG( firstSliceSegmentInPic, "first_slice_segment_in_pic_flag" );
+#if IDR_FIX
+  rpcSlice->setFirstSliceInPic(firstSliceSegmentInPic);
+#endif
   if( rpcSlice->getRapPicFlag())
   {
     READ_FLAG( uiCode, "no_output_of_prior_pics_flag" );  //ignored -- updated already

Lib/TLibDecoder/TDecTop.cpp

@@ -1176 +1176 @@
 
   // exit when a new picture is found
 #if SVC_EXTENSION
+#if IDR_FIX
+  bNewPOC = (m_apcSlicePilot->getPOC()!= m_prevPOC || (m_apcSlicePilot->getPOC()== m_prevPOC && m_apcSlicePilot->getFirstSliceInPic() && m_parseIdc == -1));
+#else
   bNewPOC = (m_apcSlicePilot->getPOC()!= m_prevPOC);
-
+#endif
 #if NO_OUTPUT_OF_PRIOR_PICS
 #if NO_CLRAS_OUTPUT_FLAG
 #if R0235_SMALLEST_LAYER_ID