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

Timestamp:

11 Apr 2014, 02:47:47 (11 years ago)

Author:

seregin

Message:

bring back m_noClrasOutputFlag

Location:

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

Files:

• TDecTop.cpp (modified) (1 diff)
• TDecTop.h (modified) (2 diffs)

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

@@ -85 +85 @@
   m_isNoOutputPriorPics = false;
 #endif
-#if NO_CLRAS_OUTPUT_FLAG  
+#if NO_CLRAS_OUTPUT_FLAG
+  m_noClrasOutputFlag          = false;
   m_layerInitializedFlag       = false;
   m_firstPicInLayerDecodedFlag = false;  

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

@@ -143 +143 @@
 
 #if NO_CLRAS_OUTPUT_FLAG  
+  Bool                    m_noClrasOutputFlag;
   Bool                    m_layerInitializedFlag;
   Bool                    m_firstPicInLayerDecodedFlag;
@@ -272 +273 @@
 
 #if NO_CLRAS_OUTPUT_FLAG
-  Int  getNoClrasOutputFlag()                { return m_craNoRaslOutputFlag;}
-  Void setNoClrasOutputFlag(Bool x)          { m_craNoRaslOutputFlag = x;   }
+  Int  getNoClrasOutputFlag()                { return m_noClrasOutputFlag;}
+  Void setNoClrasOutputFlag(Bool x)          { m_noClrasOutputFlag = x;   }
   Int  getLayerInitializedFlag()             { return m_layerInitializedFlag;}
   Void setLayerInitializedFlag(Bool x)       { m_layerInitializedFlag = x;   }