generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improved LAST3's single ref prob context design a little

Browse Source 
On derflr testset, using 12-bit HightBitDepth mode, this CL obtained a
small gain of +0.031% by turning on LAST2+LAST3.

Change-Id: Ib6c9d595e56269634bf29d684eabcd806fc08cc9
This commit is contained in:
Zoe Liu 2015-09-21 12:17:33 -07:00
parent 9144967ca8
commit 411c490bc3
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vp9/common/vp9_pred_common.c
View File

@ -797,7 +797,7 @@ int vp9_get_pred_context_single_ref_p2(const MACROBLOCKD *xd) {
} else if (above_intra || left_intra) { // intra/inter or inter/intra
const MB_MODE_INFO *edge_mbmi = above_intra ? left_mbmi : above_mbmi;
if (!has_second_ref(edge_mbmi)) {
if (CHECK_LAST_OR_LAST2(edge_mbmi->ref_frame[0]))
if (CHECK_LAST_LAST2_LAST3(edge_mbmi->ref_frame[0]))
pred_context = 3;
else
pred_context = 4 * (edge_mbmi->ref_frame[0] == GOLDEN_FRAME);
@ -833,11 +833,12 @@ int vp9_get_pred_context_single_ref_p2(const MACROBLOCKD *xd) {
else
pred_context = 1 + 2 * (crf1 == GOLDEN_FRAME || crf2 == GOLDEN_FRAME);
} else {
if (CHECK_LAST_OR_LAST2(above0) && CHECK_LAST_OR_LAST2(left0)) {
if (CHECK_LAST_LAST2_LAST3(above0) && CHECK_LAST_LAST2_LAST3(left0)) {
pred_context = 2 + (above0 == left0);
} else if (CHECK_LAST_OR_LAST2(above0) || CHECK_LAST_OR_LAST2(left0)) {
const MV_REFERENCE_FRAME edge0 = CHECK_LAST_OR_LAST2(above0) ? left0
: above0;
} else if (CHECK_LAST_LAST2_LAST3(above0) ||
CHECK_LAST_LAST2_LAST3(left0)) {
const MV_REFERENCE_FRAME edge0 =
CHECK_LAST_LAST2_LAST3(above0) ? left0 : above0;
pred_context = 4 * (edge0 == GOLDEN_FRAME);
} else {
pred_context = 2 * (above0 == GOLDEN_FRAME) +
@ -849,7 +850,7 @@ int vp9_get_pred_context_single_ref_p2(const MACROBLOCKD *xd) {
const MB_MODE_INFO *edge_mbmi = has_above ? above_mbmi : left_mbmi;
if (!is_inter_block(edge_mbmi) ||
(CHECK_LAST_OR_LAST2(edge_mbmi->ref_frame[0]) &&
(CHECK_LAST_LAST2_LAST3(edge_mbmi->ref_frame[0]) &&
!has_second_ref(edge_mbmi)))
pred_context = 2;
else if (!has_second_ref(edge_mbmi))