Changeset 1332 in 3DVCSoftware for branches

Timestamp:

21 Sep 2015, 02:24:51 (9 years ago)

Author:

tech

Message:

Fixes.

Location:

branches/HTM-15.1-dev0-Vidyo

Files:

• cfg/SEI/layersNotPresentSei.cfg (modified) (2 diffs)
• source/Lib/TLibCommon/SEI.cpp (modified) (2 diffs)
• source/Lib/TLibCommon/SEI.h (modified) (2 diffs)
• source/Lib/TLibDecoder/SEIread.cpp (modified) (2 diffs)

branches/HTM-15.1-dev0-Vidyo/cfg/SEI/layersNotPresentSei.cfg

@@ -1 +1 @@
 
-PayloadType                     : TBD
+PayloadType                     : 160
 
 #======== Applicability  ==========    ( SEI is only send for pictures in intersection )
-ApplicableLayerIds              : TBD                            # LayerIds      of layers   to which the SEI is added. (all when empty)
-ApplicablePocs                  : TBD                            # POCs          of pictures to which the SEI is added. (all when empty)
-ApplicableTids                  : TBD                            # Tids          of pictures to which the SEI is added. (all when empty)
-ApplicableVclNaluTypes          : TBD                            # NaluUnitTypes of picture  to which the SEI is added. (all when empty)
+ApplicableLayerIds              : 0                              # LayerIds      of layers   to which the SEI is added. (all when empty)
+ApplicablePocs                  : 0                              # POCs          of pictures to which the SEI is added. (all when empty)
+ApplicableTids                  : 0                              # Tids          of pictures to which the SEI is added. (all when empty)
+ApplicableVclNaluTypes          : 19 20                          # NaluUnitTypes of picture  to which the SEI is added. (all when empty)
 
 #======== Position in bit stream  ============
@@ -13 +13 @@
 
 #======== Payload modification =============
-ModifyByEncoder                 : TBD                            #  0: Use payload as specified in cfg file   1: Modify SEI by encoder.
+ModifyByEncoder                 : 0                               #  0: Use payload as specified in cfg file   1: Modify SEI by encoder.
 
 #======== Payload specification =============
 LnpSeiActiveVpsId               : 0
-LayerNotPresentFlag             : 0
+LayerNotPresentFlag             : 0 0 0                           # All layers present

branches/HTM-15.1-dev0-Vidyo/source/Lib/TLibCommon/SEI.cpp

@@ -350 +350 @@
   // TBD: Add default values for which layers, POCS, Tids or Nalu types the SEI should be send. 
   // This SEI message doesn't need to be added by default to any Layer / POC / NAL Unit / T Layer. Not sure if empty is right.
-  defAppLayerIds     empty( );      //push_back( TBD );
-  defAppPocs         empty( );      //push_back( TBD );
-  defAppTids         empty( );      //push_back( TBD );
-  defAppVclNaluTypes.empty( );      //push_back( TBD );
-
-  Int      defSeiNaluId                  = 0; 
+  defAppLayerIds    .empty( );
+  defAppPocs        .empty( );
+  defAppTids        .empty( );
+  defAppVclNaluTypes.empty( );
+
+  Int      defSeiNaluId                  = 0;
   Int      defPositionInSeiNalu          = 0; 
   Bool     defModifyByEncoder            = false;   //0: Use payload as specified in cfg file   1: Modify SEI by encoder
@@ -378 +378 @@
   Bool SEILayersNotPresent::checkCfg( const TComSlice* slice )
   { 
-//  // Check config values
-//  Bool wrongConfig = false; 
+  // Check config values
+    Bool wrongConfig = false; 
 //
+    const TComVPS* vps = slice->getVPS(); 
 //  // TBD: Add constraints on presence of SEI here. 
-//  xCheckCfg     ( wrongConfig, TBD , "TBD" );
-//  xCheckCfg     ( wrongConfig, TBD , "TBD" );
-//
-//  // TBD: Modify constraints according to the SEI semantics. 
-//  xCheckCfgRange( wrongConfig, m_lnpSeiActiveVpsId              , MINVAL , MAXVAL, "lnp_sei_active_vps_id"            );
-//  xCheckCfgRange( wrongConfig, m_layerNotPresentFlag[i]         , MINVAL , MAXVAL, "layer_not_present_flag"           );
-//
-//  return wrongConfig; 
-      return false;
+    xCheckCfg     ( wrongConfig, m_lnpSeiActiveVpsId == vps->getVPSId(), "The value of lnp_sei_active_vps_id shall be equal to the value of vps_video_parameter_set_id of the active VPS for the VCL NAL units of the access unit containing the SEI message." );
+
+
+    for (Int i = 0; i < vps->getMaxLayersMinus1(); i++)
+    {
+      if ( m_layerNotPresentFlag[ i ] && i < vps->getMaxLayersMinus1() )
+      {
+        for (Int j = 0; j < vps->getNumPredictedLayers( vps->getLayerIdInNuh( j ) - 1 ); j++ )
+        {
+          xCheckCfg     ( wrongConfig, m_layerNotPresentFlag[ vps->getLayerIdInVps( vps->getIdPredictedLayer( vps->getLayerIdInNuh(i),j) )], "When layer_not_present_flag[ i ] is equal to 1 and i is less than MaxLayersMinus1, layer_not_present_flag[ LayerIdxInVps[ IdPredictedLayer[ layer_id_in_nuh[ i ] ][ j ] ] ] shall be equal to 1 for all values of j in the range of 0 to NumPredictedLayers[ layer_id_in_nuh[ i ] ] - 1, inclusive." );
+        }
+      }
+    }
+
+      return wrongConfig; 
   };
-//
-//Void SEILayersNotPresent::setupFromSlice  ( const TComSlice* slice )
-//{
-//  sei.m_lnpSeiActiveVpsId =  TBD ;
-//  for( Int i = 0; i  <=  MaxLayersMinus1; i++ )
-//  {
-//    sei.m_layerNotPresentFlag[i] =  TBD ;
-//  }
-//};
 #endif
 

branches/HTM-15.1-dev0-Vidyo/source/Lib/TLibCommon/SEI.h

@@ -670 +670 @@
 
   Void setupFromCfgFile( const Char*      cfgFile );
-  //Void setupFromSlice  ( const TComSlice* slice   );
   Bool checkCfg        ( const TComSlice* slice   );
 
@@ -677 +676 @@
   BoolAry1d m_layerNotPresentFlag;
 
-  void resizeDimI( Int sizeDimI )
+  Void resizeDimI( Int sizeDimI )
   {
     m_layerNotPresentFlag.resize( sizeDimI );

branches/HTM-15.1-dev0-Vidyo/source/Lib/TLibDecoder/SEIread.cpp

@@ -1217 +1217 @@
 {
   UInt code;
-  UInt i = 0;
 
   output_sei_message_header(sei, pDecodedMessageOutputStream, payloadSize);
@@ -1225 +1224 @@
   sei.m_lnpSeiMaxLayers = vps->getMaxLayersMinus1() + 1;
   sei.resizeDimI(sei.m_lnpSeiMaxLayers);
-  for (; i < sei.m_lnpSeiMaxLayers; i++)
+  for (Int i = 0; i < sei.m_lnpSeiMaxLayers; i++)
   {
     sei_read_flag( pDecodedMessageOutputStream, code, "layer_not_present_flag" );