Changeset 550 in SHVCSoftware for branches/SHM-5.0-dev/source/App/TAppEncoder

Timestamp:

21 Jan 2014, 18:47:46 (11 years ago)

Author:

seregin

Message:

merge from trunk

Location:

branches/SHM-5.0-dev/source

Files:

• . (modified) (1 prop)
• App/TAppEncoder/TAppEncCfg.cpp (modified) (1 diff)
• App/TAppEncoder/TAppEncTop.cpp (modified) (1 diff)

branches/SHM-5.0-dev/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -2579 +2579 @@
   printf("ENCODER_FAST_MODE: %d ", ENCODER_FAST_MODE);
   printf("REF_IDX_MFM: %d ", REF_IDX_MFM);
-#else
-  printf("RecalQP:%d", m_recalculateQPAccordingToLambda ? 1 : 0 );
-#endif
   printf("O0194_DIFFERENT_BITDEPTH_EL_BL: %d ", O0194_DIFFERENT_BITDEPTH_EL_BL);
   printf("O0194_JOINT_US_BITSHIFT: %d ", O0194_JOINT_US_BITSHIFT);
   printf("O0194_WEIGHTED_PREDICTION_CGS: %d ",O0194_WEIGHTED_PREDICTION_CGS);
+#else
+  printf("RecalQP:%d", m_recalculateQPAccordingToLambda ? 1 : 0 );
+#endif
   printf("\n\n");
   

branches/SHM-5.0-dev/source/App/TAppEncoder/TAppEncTop.cpp

@@ -1171 +1171 @@
   vps->setNumOutputLayerSets(vps->getNumLayerSets());
   vps->setNumProfileTierLevel(vps->getNumLayerSets());
+#if O0109_DEFAULT_ONE_OUT_LAYER_IDC
+  vps->setDefaultOneTargetOutputLayerIdc(1);
+#else
   vps->setDefaultOneTargetOutputLayerFlag(true);
+#endif
   for(i = 1; i < vps->getNumLayerSets(); i++)
   {