Changeset 402 in SHVCSoftware for branches

Timestamp:

20 Sep 2013, 18:42:44 (11 years ago)

Author:

seregin

Message:

fix compiler warnings

Location:

branches/SHM-3.1-dev/source

Files:

• App/TAppEncoder/TAppEncCfg.cpp (modified) (1 diff)
• App/TAppEncoder/TAppEncCfg.h (modified) (1 diff)
• Lib/TLibDecoder/TDecCAVLC.cpp (modified) (3 diffs)
• Lib/TLibEncoder/TEncCavlc.cpp (modified) (2 diffs)

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

@@ -69 +69 @@
 , m_avcBaseLayerFlag(0)
 #endif
+#if N0120_MAX_TID_REF_CFG
+, m_maxTidRefPresentFlag(1)
+#endif 
 , m_pColumnWidth()
 , m_pRowHeight()
 , m_scalingListFile()
 , m_elRapSliceBEnabled(0)
-#if N0120_MAX_TID_REF_CFG
-, m_maxTidRefPresentFlag(1)
-#endif 
 {
   for(UInt layer=0; layer<MAX_LAYERS; layer++)

branches/SHM-3.1-dev/source/App/TAppEncoder/TAppEncCfg.h

@@ -68 +68 @@
   Int       m_framesToBeEncoded;                              ///< number of encoded frames
 #if AVC_BASE
-  Int       m_avcBaseLayerFlag;                               ///< AVC_BASElayer_flag
+  Int       m_avcBaseLayerFlag;                               ///< avc_baselayer_flag
 #endif
 #if AVC_SYNTAX

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

@@ -1155 +1155 @@
     vps->setVpsNumRepFormats( vps->getMaxLayers() );
   }
-  for(Int i = 0; i < vps->getVpsNumRepFormats(); i++)
+  for(i = 0; i < vps->getVpsNumRepFormats(); i++)
   {
     // Read rep_format_structures
@@ -1165 +1165 @@
   if( vps->getRepFormatIdxPresentFlag() )
   {
-    for(Int i = 1; i < vps->getMaxLayers(); i++)
+    for(i = 1; i < vps->getMaxLayers(); i++)
     {
       if( vps->getVpsNumRepFormats() > 1 )
@@ -1182 +1182 @@
   {
     // default assignment - each layer assigned each rep_format() structure in the order signaled
-    for(Int i = 1; i < vps->getMaxLayers(); i++)
+    for(i = 1; i < vps->getMaxLayers(); i++)
     {
       vps->setVpsRepFormatIdx( i, i );

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

@@ -890 +890 @@
     WRITE_CODE( vps->getVpsNumRepFormats() - 1, 4, "vps_num_rep_formats_minus1" );
   }
-  for(Int i = 0; i < vps->getVpsNumRepFormats(); i++)
+  for(i = 0; i < vps->getVpsNumRepFormats(); i++)
   {
     // Read rep_format_structures
@@ -898 +898 @@
   if( vps->getRepFormatIdxPresentFlag() )
   {
-    for(Int i = 1; i < vps->getMaxLayers(); i++)
+    for(i = 1; i < vps->getMaxLayers(); i++)
     {
       if( vps->getVpsNumRepFormats() > 1 )