Ticket #23: ref_format.diff

TLibDecoder/TDecCAVLC.cpp

@@ -1455 +1472 @@
   for(i = 0; i < vps->getVpsNumRepFormats(); i++)
   {
     // Read rep_format_structures
+#if 1 // danny@vidyo.com - fix for parsing of ref_format()
+    parseRepFormat( vps->getVpsRepFormat(i), i > 0 ? vps->getVpsRepFormat(i-1) : 0 );
+#else
     parseRepFormat( vps->getVpsRepFormat(i) );
+#endif
   }
 
   // Default assignment for layer 0
@@ -1619 +1640 @@
     parseVPSVUI(vps);
 #endif
   }
 }
 #endif
 #if REPN_FORMAT_IN_VPS
+#if 1 // danny@vidyo.com - fix for parsing of ref_format()
+Void  TDecCavlc::parseRepFormat      ( RepFormat *repFormat, RepFormat *repFormatPrev )
+#else
 Void  TDecCavlc::parseRepFormat      ( RepFormat *repFormat )
+#endif
 {
   UInt uiCode;
 #if REPN_FORMAT_CONTROL_FLAG
@@ -1647 +1678 @@
     READ_CODE( 4, uiCode, "bit_depth_luma_minus8" );           repFormat->setBitDepthVpsLuma  ( uiCode + 8 );
     READ_CODE( 4, uiCode, "bit_depth_chroma_minus8" );         repFormat->setBitDepthVpsChroma( uiCode + 8 );
   }
+#if 1 // danny@vidyo.com - fix for parsing of ref_format()
+  else if( repFormatPrev ) {
+    repFormat->setChromaFormatVpsIdc( repFormatPrev->getChromaFormatVpsIdc() );
+    repFormat->setBitDepthVpsLuma( repFormatPrev->getBitDepthVpsLuma() );
+    repFormat->setBitDepthVpsChroma( repFormatPrev->getBitDepthVpsChroma() );
+  }
+#endif
 #else 
 #if AUXILIARY_PICTURES
   READ_CODE( 2, uiCode, "chroma_format_idc" );               repFormat->setChromaFormatVpsIdc( ChromaFormat(uiCode) );

TLibDecoder/TDecCAVLC.h

@@ -80 +80 @@
   Void  parseVPSVUI   ( TComVPS* pcVPS );
 #endif 
 #if REPN_FORMAT_IN_VPS
+#if 1 // danny@vidyo.com - fix for parsing of ref_format()
+  Void  parseRepFormat      ( RepFormat *repFormat, RepFormat *repFormatPrev );
+#else
   Void  parseRepFormat      ( RepFormat *repFormat );
 #endif
+#endif
 #if VPS_DPB_SIZE_TABLE
   Void  parseVpsDpbSizeTable( TComVPS *vps );
 #endif