Commits

nandaku2  committed 2786f9e Merge

Merge from stable

  • Participants
  • Parent commits 833d78a, 87dc694

Comments (0)

Files changed (2)

File source/common/common.cpp

     param->bframes = 4;
     param->lookaheadDepth = 20;
     param->bFrameAdaptive = X265_B_ADAPT_TRELLIS;
-    param->bpyramid = 2;
+    param->bpyramid = 1;
     param->scenecutThreshold = 40; /* Magic number pulled in from x264 */
 
     /* Intra Coding Tools */
             param->maxCUSize = 32;
             param->searchRange = 28;
             param->bFrameAdaptive = 0;
-            param->bpyramid = 1;
             param->subpelRefine = 0;
             param->maxNumMergeCand = 2;
             param->searchMethod = X265_DIA_SEARCH;
             param->maxCUSize = 32;
             param->searchRange = 44;
             param->bFrameAdaptive = 0;
-            param->bpyramid = 1;
             param->subpelRefine = 1;
             param->bEnableRectInter = 0;
             param->bEnableAMP = 0;
             param->lookaheadDepth = 15;
             param->maxCUSize = 32;
             param->bFrameAdaptive = 0;
-            param->bpyramid = 1;
             param->subpelRefine = 1;
             param->bEnableRectInter = 0;
             param->bEnableAMP = 0;
         {
             param->lookaheadDepth = 15;
             param->bFrameAdaptive = 0;
-            param->bpyramid = 1;
             param->bEnableRectInter = 0;
             param->bEnableAMP = 0;
             param->bEnableEarlySkip = 1;
         else if (!strcmp(preset, "fast"))
         {
             param->lookaheadDepth = 15;
-            param->bpyramid = 1;
             param->bEnableRectInter = 0;
             param->bEnableAMP = 0;
         }
         {
             param->lookaheadDepth = 25;
             param->bframes = 4;
-            param->bpyramid = 1;
             param->rdLevel = 1;
             param->subpelRefine = 3;
             param->maxNumMergeCand = 3;

File source/encoder/encoder.cpp

         else
             fprintf(m_csvfpt, " -, -, -, -,");
         if (param.bEnableSsim)
-            fprintf(m_csvfpt, " %.2f,", stats.globalSsim);
+            fprintf(m_csvfpt, " %.3f,", stats.globalSsim);
         else
             fprintf(m_csvfpt, " -,");