diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2016-07-11 22:31:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-07-11 22:31:06 +0000 |
| commit | 2e93fcf89343c4d9a38e9fcd06760fe7a32013c9 (patch) | |
| tree | 1ffc2a0518bb3daa7f5eeabfeae5f23234f4093d /vp9/encoder/vp9_encodeframe.c | |
| parent | 5adb43b8bea52f308c2a8c113cffcf840672dfda (diff) | |
| parent | ed7786869aaa5b191450c674ddbf410aa5803c5b (diff) | |
| download | libvpx-2e93fcf89343c4d9a38e9fcd06760fe7a32013c9.tar libvpx-2e93fcf89343c4d9a38e9fcd06760fe7a32013c9.tar.gz libvpx-2e93fcf89343c4d9a38e9fcd06760fe7a32013c9.tar.bz2 libvpx-2e93fcf89343c4d9a38e9fcd06760fe7a32013c9.zip | |
Merge "vp9_rd_pick_intra_mode_sb(): set interp_filter to"
Diffstat (limited to 'vp9/encoder/vp9_encodeframe.c')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index f660eee5b..69628669d 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -2773,6 +2773,12 @@ static void rd_pick_partition(VP9_COMP *cpi, ThreadData *td, if (cpi->sf.adaptive_motion_search) store_pred_mv(x, ctx); + // If the interp_filter is marked as SWITCHABLE_FILTERS, it was for an + // intra block and used for context purposes. + if (ctx->mic.interp_filter == SWITCHABLE_FILTERS) { + ctx->mic.interp_filter = EIGHTTAP; + } + // PARTITION_SPLIT // TODO(jingning): use the motion vectors given by the above search as // the starting point of motion search in the following partition type check. |