Changeset 690 in SHVCSoftware for branches/SHM-6-dev/source/Lib

Timestamp:

17 Apr 2014, 18:23:01 (11 years ago)

Author:

seregin

Message:

temporally disable Q0200_CONFORMANCE_BL_SIZE to avoid compiler errors, will be enabled back after the fix

File:

• branches/SHM-6-dev/source/Lib/TLibCommon/TypeDef.h (modified) (2 diffs)

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

@@ -42 +42 @@
 
 #define SYNTAX_BYTES                     10      ///< number of bytes taken by syntaxes per 4x4 block [RefIdxL0(1byte), RefIdxL1(1byte), MVxL0(2bytes), MVyL0(2bytes), MVxL1(2bytes), MVyL1(2bytes)]
-#define Q0200_CONFORMANCE_BL_SIZE        1       ///< JCTVC-Q0200; use conformance picture size in re-sampling processs
 #if SVC_EXTENSION
 #define MAX_LAYERS                       8      ///< max number of layers the codec is supposed to handle
@@ -50 +49 @@
 #define O0137_MAX_LAYERID                1      ///< JCTVC-O0137, JCTVC-O0200, JCTVC-O0223: restrict nuh_layer_id and vps_max_layers_minus1
 
+#define Q0200_CONFORMANCE_BL_SIZE        0       ///< JCTVC-Q0200; use conformance picture size in re-sampling processs
 #define P0312_VERT_PHASE_ADJ             1      ///< JCTVC-P0312: vertical phase adjustment in re-sampling process (BoG report)
 #if P0312_VERT_PHASE_ADJ