Changeset 648 in SHVCSoftware for branches/SHM-5.1-dev/source

Timestamp:

26 Mar 2014, 01:40:32 (11 years ago)

Author:

seregin

Message:

set VPS VUI parameters for AVC BL

Location:

branches/SHM-5.1-dev/source

Files:

• App/TAppEncoder/TAppEncCfg.cpp (modified) (1 diff)
• App/TAppEncoder/TAppEncTop.cpp (modified) (1 diff)
• Lib/TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)
• Lib/TLibEncoder/TEncCavlc.cpp (modified) (1 diff)

branches/SHM-5.1-dev/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -1761 +1761 @@
   m_numLayers = m_numLayers > MAX_LAYERS ? MAX_LAYERS : m_numLayers;
 
+  
+  // it can be updated after AVC BL support will be added to the WD
+  if( m_avcBaseLayerFlag )
+  {
+    m_crossLayerIrapAlignFlag = false;
+    m_crossLayerPictureTypeAlignFlag = false;
+    m_crossLayerAlignedIdrOnlyFlag = false;
+  }
+
   // verify layer configuration parameters
   for(UInt layer=0; layer<m_numLayers; layer++)

branches/SHM-5.1-dev/source/App/TAppEncoder/TAppEncTop.cpp

@@ -1336 +1336 @@
       }
     }
-
-    if( vps->getAvcBaseLayerFlag() )
-    {
-      vps->setCrossLayerIrapAlignFlag(false);
-    }
 #endif
 #if M0040_ADAPTIVE_RESOLUTION_CHANGE

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

@@ -1796 +1796 @@
     if (uiCode)
     {
-      READ_FLAG(uiCode, "only_idr_for_IRAP_across_layers" );
+      READ_FLAG(uiCode, "all_layers_idr_aligned_flag" );
       vps->setCrossLayerIrapAlignFlag(uiCode);
     }

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

@@ -1356 +1356 @@
     if(vps->getCrossLayerIrapAlignFlag())
     {
-       WRITE_FLAG(vps->getCrossLayerAlignedIdrOnlyFlag(), "only_idr_for_IRAP_across_layers");
+       WRITE_FLAG(vps->getCrossLayerAlignedIdrOnlyFlag(), "all_layers_idr_aligned_flag");
     }
 #endif