Changeset 918 in SHVCSoftware for branches/SHM-upgrade/source/App

Timestamp:

12 Nov 2014, 20:27:23 (10 years ago)

Author:

seregin

Message:

update make file, add TAppDecoderAnalyser and TLibDecoderAnalyser

Location:

branches/SHM-upgrade/source/App

Files:

• TAppDecoder/TAppDecTop.cpp (modified) (1 diff)
• TAppEncoder/TAppEncCfg.cpp (modified) (1 diff)
• TAppEncoder/TAppEncTop.cpp (modified) (5 diffs)

branches/SHM-upgrade/source/App/TAppDecoder/TAppDecTop.cpp

@@ -254 +254 @@
 
 #if POC_RESET_IDC_DECODER
-    if ( (bNewPicture && m_acTDecTop[nalu.m_layerId].getParseIdc() == 3) || (m_acTDecTop[nalu.m_layerId].getParseIdc() == 0) || !bitstreamFile || nalu.m_nalUnitType == NAL_UNIT_EOS &&
+    if ( ( (bNewPicture && m_acTDecTop[nalu.m_layerId].getParseIdc() == 3) || m_acTDecTop[nalu.m_layerId].getParseIdc() == 0 || !bitstreamFile || nalu.m_nalUnitType == NAL_UNIT_EOS ) && 
         !m_acTDecTop[nalu.m_layerId].getFirstSliceInSequence() )
 #else
-    if (bNewPicture || !bitstreamFile || nalu.m_nalUnitType == NAL_UNIT_EOS &&
+    if ( (bNewPicture || !bitstreamFile || nalu.m_nalUnitType == NAL_UNIT_EOS) &&
         !m_acTDecTop[nalu.m_layerId].getFirstSliceInSequence() )
 #endif

branches/SHM-upgrade/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -3835 +3835 @@
     for(UInt layer=0; layer<m_numLayers; layer++)
     {
-      Int m_iIntraPeriod = m_acLayerCfg[layer].m_iIntraPeriod;
-      if ( (m_iIntraPeriod != 1) && !m_loopFilterOffsetInPPS && m_DeblockingFilterControlPresent && (!m_bLoopFilterDisable) )
+      if ( (m_acLayerCfg[layer].m_iIntraPeriod != 1) && !m_loopFilterOffsetInPPS && m_DeblockingFilterControlPresent && (!m_bLoopFilterDisable) )
       {
         for(Int i=0; i<m_iGOPSize; i++)

branches/SHM-upgrade/source/App/TAppEncoder/TAppEncTop.cpp

@@ -1122 +1122 @@
 #if O0194_DIFFERENT_BITDEPTH_EL_BL
     //2
-    for (UInt channelTypeIndex = 0; channelTypeIndex < MAX_NUM_CHANNEL_TYPE; channelTypeIndex++)for (UInt channelTypeIndex = 0; channelTypeIndex < MAX_NUM_CHANNEL_TYPE; channelTypeIndex++)
+    for( UInt channelTypeIndex = 0; channelTypeIndex < MAX_NUM_CHANNEL_TYPE; channelTypeIndex++)
     {
       g_bitDepth[channelTypeIndex]    = m_acLayerCfg[layer].m_internalBitDepth[channelTypeIndex];
@@ -1206 +1206 @@
 #if O0194_DIFFERENT_BITDEPTH_EL_BL
     //3
-    for (UInt channelTypeIndex = 0; channelTypeIndex < MAX_NUM_CHANNEL_TYPE; channelTypeIndex++)for (UInt channelTypeIndex = 0; channelTypeIndex < MAX_NUM_CHANNEL_TYPE; channelTypeIndex++)
+    for (UInt channelTypeIndex = 0; channelTypeIndex < MAX_NUM_CHANNEL_TYPE; channelTypeIndex++)
     {
       g_bitDepth[channelTypeIndex]    = m_acLayerCfg[layer].m_internalBitDepth[channelTypeIndex];
@@ -2070 +2070 @@
 #if O0194_DIFFERENT_BITDEPTH_EL_BL
         //6
-        for (UInt channelTypeIndex = 0; channelTypeIndex < MAX_NUM_CHANNEL_TYPE; channelTypeIndex++)for (UInt channelTypeIndex = 0; channelTypeIndex < MAX_NUM_CHANNEL_TYPE; channelTypeIndex++)
+        for (UInt channelTypeIndex = 0; channelTypeIndex < MAX_NUM_CHANNEL_TYPE; channelTypeIndex++)
         {
           g_bitDepth[channelTypeIndex]    = m_acLayerCfg[layer].m_internalBitDepth[channelTypeIndex];
@@ -2164 +2164 @@
 #if O0194_DIFFERENT_BITDEPTH_EL_BL
         //7
-        for (UInt channelTypeIndex = 0; channelTypeIndex < MAX_NUM_CHANNEL_TYPE; channelTypeIndex++)for (UInt channelTypeIndex = 0; channelTypeIndex < MAX_NUM_CHANNEL_TYPE; channelTypeIndex++)
+        for (UInt channelTypeIndex = 0; channelTypeIndex < MAX_NUM_CHANNEL_TYPE; channelTypeIndex++)
         {
           g_bitDepth[channelTypeIndex]    = m_acLayerCfg[layer].m_internalBitDepth[channelTypeIndex];
@@ -2229 +2229 @@
 #if O0194_DIFFERENT_BITDEPTH_EL_BL
       //8
-      for (UInt channelTypeIndex = 0; channelTypeIndex < MAX_NUM_CHANNEL_TYPE; channelTypeIndex++)for (UInt channelTypeIndex = 0; channelTypeIndex < MAX_NUM_CHANNEL_TYPE; channelTypeIndex++)
-      {
-        g_bitDepth[channelTypeIndex]      = m_acLayerCfg[layer].m_internalBitDepth[channelTypeIndex];
+      for (UInt channelTypeIndex = 0; channelTypeIndex < MAX_NUM_CHANNEL_TYPE; channelTypeIndex++)
+      {
+        g_bitDepth[channelTypeIndex]    = m_acLayerCfg[layer].m_internalBitDepth[channelTypeIndex];
         g_PCMBitDepth[channelTypeIndex] = m_bPCMInputBitDepthFlag ? m_acLayerCfg[layer].m_inputBitDepth[channelTypeIndex] : m_acLayerCfg[layer].m_internalBitDepth[channelTypeIndex];
       }