Changeset 1206 in SHVCSoftware

Timestamp:

8 Jul 2015, 21:08:20 (9 years ago)

Author:

seregin

Message:

macro cleanup: ALIGN_IRAP_BUGFIX

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (2 diffs)
• TLibEncoder/TEncGOP.cpp (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

@@ -72 +72 @@
 #define POC_RESET_IDC_ENCODER            1      ///< JCTVC-P0041: Include support of enabling POC reset at the encoder
 #define POC_RESET_IDC_DECODER            1      ///< JCTVC-P0041: Include support of enabling POC reset at the decoder
-#define ALIGN_IRAP_BUGFIX                1
-#define UNAVAILABLE_PIC_BUGFIX           1
 #endif
 #define POC_RESET_INFO_INFERENCE         1      ///< JCTVC-Q0146: Infer the value of poc_reset_info_present_flag when not present
@@ -80 +78 @@
 #define AVC_BASE                         1      ///< YUV BL reading for AVC base SVC
 #define SVC_POC                          1      ///< POC signalling and reset
+#define UNAVAILABLE_PIC_BUGFIX           1
 
 #define REF_IDX_MFM                      1      ///< JCTVC-L0336: motion vector mapping of inter-layer reference picture

branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -1479 +1479 @@
             pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_CRA);
           }
-        }
-        else
-        {
-#if !ALIGN_IRAP_BUGFIX
-          pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_CRA);
-#endif
-        }
+        }        
       }