Changeset 670 in SHVCSoftware for branches/SHM-6-dev

Timestamp:

11 Apr 2014, 20:17:11 (11 years ago)

Author:

seregin

Message:

fix for the ticket #23, patch was provided by Danny Hong <danny@…>

Location:

branches/SHM-6-dev/source/Lib/TLibDecoder

Files:

• TDecCAVLC.cpp (modified) (5 diffs)
• TDecCAVLC.h (modified) (1 diff)

branches/SHM-6-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1469 +1469 @@
   {
     // Read rep_format_structures
-    parseRepFormat( vps->getVpsRepFormat(i) );
+    parseRepFormat( vps->getVpsRepFormat(i), i > 0 ? vps->getVpsRepFormat(i-1) : 0 );
   }
 
@@ -1537 +1537 @@
   {
     // Read rep_format_structures
-    parseRepFormat( vps->getVpsRepFormat(i) );
+    parseRepFormat( vps->getVpsRepFormat(i), i > 0 ? vps->getVpsRepFormat(i-1) : 0 );
   }
 
@@ -1705 +1705 @@
 #endif
 #if REPN_FORMAT_IN_VPS
-Void  TDecCavlc::parseRepFormat( RepFormat *repFormat )
+Void  TDecCavlc::parseRepFormat( RepFormat *repFormat, RepFormat *repFormatPrev )
 {
   UInt uiCode;
@@ -1713 +1713 @@
   READ_FLAG( uiCode, "chroma_and_bit_depth_vps_present_flag" );    repFormat->setChromaAndBitDepthVpsPresentFlag( uiCode ? true : false ); 
 
+  if( !repFormatPrev )
+  {
+    // The value of chroma_and_bit_depth_vps_present_flag of the first rep_format( ) syntax structure in the VPS shall be equal to 1
+    assert( repFormat->getChromaAndBitDepthVpsPresentFlag() );
+  }
+
   if( repFormat->getChromaAndBitDepthVpsPresentFlag() )
   {
@@ -1729 +1735 @@
     READ_CODE( 4, uiCode, "bit_depth_vps_luma_minus8" );           repFormat->setBitDepthVpsLuma  ( uiCode + 8 );
     READ_CODE( 4, uiCode, "bit_depth_vps_chroma_minus8" );         repFormat->setBitDepthVpsChroma( uiCode + 8 );
+  }
+  else if( repFormatPrev )
+  {
+    // chroma_and_bit_depth_vps_present_flag equal to 0 specifies that the syntax elements, chroma_format_vps_idc, separate_colour_plane_vps_flag, bit_depth_vps_luma_minus8, and 
+    // bit_depth_vps_chroma_minus8 are not present and inferred from the previous rep_format( ) syntax structure in the VPS.
+
+    repFormat->setChromaFormatVpsIdc        ( repFormatPrev->getChromaFormatVpsIdc() );
+    repFormat->setSeparateColourPlaneVpsFlag( repFormatPrev->getSeparateColourPlaneVpsFlag() );
+    repFormat->setBitDepthVpsLuma           ( repFormatPrev->getBitDepthVpsLuma() );
+    repFormat->setBitDepthVpsChroma         ( repFormatPrev->getBitDepthVpsChroma() );
   }
 #else 

branches/SHM-6-dev/source/Lib/TLibDecoder/TDecCAVLC.h

@@ -81 +81 @@
 #endif 
 #if REPN_FORMAT_IN_VPS
-  Void  parseRepFormat      ( RepFormat *repFormat );
+  Void  parseRepFormat      ( RepFormat *repFormat, RepFormat *repFormatPrev );
 #endif
 #if VPS_DPB_SIZE_TABLE