Changeset 1371 in 3DVCSoftware

Timestamp:

29 Oct 2015, 15:51:06 (9 years ago)

Author:

tech

Message:

Further fixes.

Location:

branches/HTM-15.2-dev/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (12 diffs)
• TLibVideoIO/TVideoIOYuv.cpp (modified) (1 diff)

branches/HTM-15.2-dev/source/Lib/TLibCommon/TypeDef.h

@@ -53 +53 @@
 */
 #ifndef HEVC_EXT
-#define HEVC_EXT                    2
+#define HEVC_EXT                    1
 #endif
 #if ( HEVC_EXT < 0 )||( HEVC_EXT > 2 )
@@ -375 +375 @@
 #define T0196_SELECTIVE_RDOQ                              1 ///< selective RDOQ
 #define U0040_MODIFIED_WEIGHTEDPREDICTION_WITH_BIPRED_AND_CLIPPING 1
-
 // ====================================================================================================================
 // Tool Switches
@@ -392 +391 @@
 #define MATRIX_MULT                                       0 ///< Brute force matrix multiplication instead of partial butterfly
 #define O0043_BEST_EFFORT_DECODING                        0 ///< 0 (default) = disable code related to best effort decoding, 1 = enable code relating to best effort decoding [ decode-side only ].
-
 #define ME_ENABLE_ROUNDING_OF_MVS                         1 ///< 0 (default) = disables rounding of motion vectors when right shifted,  1 = enables rounding
-
 #define RDOQ_CHROMA_LAMBDA                                1 ///< F386: weighting of chroma for RDOQ
 // This can be enabled by the makefile
@@ -400 +397 @@
 #define RExt__HIGH_BIT_DEPTH_SUPPORT                                           0 ///< 0 (default) use data type definitions for 8-10 bit video, 1 = use larger data types to allow for up to 16-bit video (originally developed as part of N0188)
 #endif
-
 #define U0132_TARGET_BITS_SATURATION                      1 ///< Rate control with target bits saturation method
-
 // ====================================================================================================================
 // Derived macros
@@ -452 +447 @@
 typedef       void                Void;
 typedef       bool                Bool;
-
 typedef       char                TChar; // Used for text/characters
 typedef       signed char         SChar; // Signed 8-bit values
@@ -584 +578 @@
   NUMBER_INPUT_COLOUR_SPACE_CONVERSIONS = 4
 };
-
 enum MATRIX_COEFFICIENTS // Table E.5 (Matrix coefficients)
 {
@@ -599 +592 @@
   MATRIX_COEFFICIENTS_BT2020_CONSTANT_LUMINANCE     = 10,
 };
-
 enum DeblockEdgeDir
 {
@@ -787 +779 @@
   NUMBER_OF_SLICE_CONSTRAINT_MODES = 4
 };
-
 // For use with decoded picture hash SEI messages, generated by encoder.
 enum HashType
@@ -797 +788 @@
   NUMBER_OF_HASHTYPES      = 4
 };
-
 enum SAOMode //mode
 {
@@ -898 +888 @@
   COST_MIXED_LOSSLESS_LOSSY_CODING = 3
 };
-
 enum WeightedPredictionMethod
 {
@@ -907 +896 @@
   WP_PER_PICTURE_WITH_HISTOGRAM_AND_PER_COMPONENT_AND_CLIPPING_AND_EXTENSION=4
 };
-
 enum FastInterSearchMode
 {
@@ -915 +903 @@
   FASTINTERSEARCH_MODE3    = 3
 };
-
 enum SPSExtensionFlagIndex
 {

branches/HTM-15.2-dev/source/Lib/TLibVideoIO/TVideoIOYuv.cpp

@@ -815 +815 @@
   }
 
+#if NH_3D
+  for(UInt comp=0; retval && comp< ::getNumberValidComponents(format); comp++)
+#else
   for(UInt comp=0; retval && comp<dstPicYuv->getNumberValidComponents(); comp++)
+#endif
   {
     const ComponentID compID = ComponentID(comp);