]> granicus.if.org Git - libvpx/commitdiff
Merge "Allow sub8x8 intra modes test for alt frame coding"
authorJingning Han <jingning@google.com>
Thu, 10 Oct 2013 16:00:08 +0000 (09:00 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 10 Oct 2013 16:00:08 +0000 (09:00 -0700)
1  2 
vp9/encoder/vp9_onyx_if.c

index ff1d17945f586bdceca5d27e35f7546ecc6a0c5d,8b51242485f3ac363723652a53b6298df0888ff3..7339f42ae14f3f22ba5ecd4a4ac1af45057d3418
@@@ -770,13 -786,13 +770,14 @@@ void vp9_set_speed_features(VP9_COMP *c
        if (speed == 1) {
          sf->use_square_partition_only = !(cpi->common.frame_type == KEY_FRAME ||
                                            cpi->common.intra_only);
 -        sf->tx_size_search_method = ((cpi->common.frame_type == KEY_FRAME ||
 -                                      cpi->common.intra_only)
 -                                     ? USE_FULL_RD : USE_LARGESTALL);
 +        sf->less_rectangular_check  = 1;
 +        sf->tx_size_search_method = (cpi->common.frame_type == KEY_FRAME ||
 +                                     cpi->common.intra_only)
 +                                     ? USE_FULL_RD : USE_LARGESTALL;
  
          if (MIN(cpi->common.width, cpi->common.height) >= 720)
-           sf->disable_split_mask = DISABLE_ALL_SPLIT;
+           sf->disable_split_mask = cpi->common.show_frame ?
+               DISABLE_ALL_SPLIT : DISABLE_ALL_INTER_SPLIT;
          else
            sf->disable_split_mask = DISABLE_COMPOUND_SPLIT;