Changeset 860 in SHVCSoftware for branches/SHM-dev/source/App/TAppEncoder/TAppEncLayerCfg.cpp

Timestamp:

11 Aug 2014, 23:24:03 (10 years ago)

Author:

qualcomm

Message:

Bugfix and fix to compiler warnings in CRI SEI patch.

From: Adarsh K. Ramasubramonian <aramasub@…>

File:

• branches/SHM-dev/source/App/TAppEncoder/TAppEncLayerCfg.cpp (modified) (2 diffs)

branches/SHM-dev/source/App/TAppEncoder/TAppEncLayerCfg.cpp

@@ -228 +228 @@
     }
 
+    Int tempCode;
     retval = fscanf( fic, "%d", &m_colourRemapSEIId );
-    retval = fscanf( fic, "%d", &m_colourRemapSEICancelFlag );
+    retval = fscanf( fic, "%d", &tempCode );m_colourRemapSEICancelFlag = tempCode ? 1 : 0; 
     if( !m_colourRemapSEICancelFlag )
     {
-      retval = fscanf( fic, "%d", &m_colourRemapSEIPersistenceFlag );
-      retval = fscanf( fic, "%d", &m_colourRemapSEIVideoSignalTypePresentFlag);
+      retval = fscanf( fic, "%d", &tempCode );m_colourRemapSEIPersistenceFlag = tempCode ? 1 : 0; 
+      retval = fscanf( fic, "%d", &tempCode );m_colourRemapSEIVideoSignalTypePresentFlag = tempCode ? 1 : 0; 
       if( m_colourRemapSEIVideoSignalTypePresentFlag )
       {
-        retval = fscanf( fic, "%d", &m_colourRemapSEIVideoFullRangeFlag  );
+        retval = fscanf( fic, "%d", &tempCode );m_colourRemapSEIVideoFullRangeFlag = tempCode ? 1 : 0; 
         retval = fscanf( fic, "%d", &m_colourRemapSEIPrimaries );
         retval = fscanf( fic, "%d", &m_colourRemapSEITransferCharacteristics );
@@ -260 +261 @@
       }
 
-      retval = fscanf( fic, "%d", &m_colourRemapSEIMatrixPresentFlag );
+      retval = fscanf( fic, "%d", &tempCode );m_colourRemapSEIMatrixPresentFlag = tempCode ? 1 : 0; 
       if( m_colourRemapSEIMatrixPresentFlag )
       {