Skip to content
GitLab
Commit 1f14bbb6 authored by Dmitry Kovalev's avatar Dmitry Kovalev Committed by Gerrit Code Review
Browse files

Merge "Fixing vp9_get_pred_context_comp_ref_p function."

parents 42907098 31a68bcd
v1.14.0-linphone 1.4.X experimental feature/update_to_v1.9.0-linphone feature/uwp_nuget forest frame_parallel highbitdepth indianrunnerduck javanwhistlingduck khakicampbell linphone linphone-android linphone-old longtailedduck m31-baseline m49-2623 m52-2743 m54-2840 m56-2924 m66-3359 m68-3440 mandarinduck mcw mcw2 nextgen nextgenv2 pcs-2013 playground sandbox/Jingning/experimental sandbox/Jingning/transcode sandbox/Jingning/vpx sandbox/aconverse@google.com/ansbench sandbox/debargha/playground sandbox/hkuang/frame_parallel sandbox/hkuang@google.com/decode sandbox/jimbankoski@google.com/proposed-aom sandbox/jingning@google.com/decoder_test_suite sandbox/jingning@google.com/experimental sandbox/jzern@google.com/test sandbox/wangch@google.com/vp9 sandbox/yaowu@google.com/mergeaom stable-vp9-decoder v1.12.0-linphone v1.6.1_linphone v1.7.0-linphone v1.9.0-linphone v1.9.0 v1.9.0-rc1 v1.8.2 v1.8.1 v1.8.0 v1.7.0 v1.6.1 v1.6.0 v1.5.0 v1.4.0 v1.3.0
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 902 additions and 614 deletions
test/test-data.sha1
+ 398
− 270
View file @ 1f14bbb6
This diff is collapsed.
test/test.mk
+ 398
− 270
View file @ 1f14bbb6
This diff is collapsed.
test/test_vector_test.cc
+ 100
− 68
View file @ 1f14bbb6
...@@ -60,74 +60,106 @@ const char *kVP8TestVectors[] = { ...@@ -60,74 +60,106 @@ const char *kVP8TestVectors[] = {
#endif #endif
#if CONFIG_VP9_DECODER #if CONFIG_VP9_DECODER
const char *kVP9TestVectors[] = { const char *kVP9TestVectors[] = {
"vp90-00-quantizer-00.webm", "vp90-00-quantizer-01.webm", "vp90-2-00-quantizer-00.webm", "vp90-2-00-quantizer-01.webm",
"vp90-00-quantizer-02.webm", "vp90-00-quantizer-03.webm", "vp90-2-00-quantizer-02.webm", "vp90-2-00-quantizer-03.webm",
"vp90-00-quantizer-04.webm", "vp90-00-quantizer-05.webm", "vp90-2-00-quantizer-04.webm", "vp90-2-00-quantizer-05.webm",
"vp90-00-quantizer-06.webm", "vp90-00-quantizer-07.webm", "vp90-2-00-quantizer-06.webm", "vp90-2-00-quantizer-07.webm",
"vp90-00-quantizer-08.webm", "vp90-00-quantizer-09.webm", "vp90-2-00-quantizer-08.webm", "vp90-2-00-quantizer-09.webm",
"vp90-00-quantizer-10.webm", "vp90-00-quantizer-11.webm", "vp90-2-00-quantizer-10.webm", "vp90-2-00-quantizer-11.webm",
"vp90-00-quantizer-12.webm", "vp90-00-quantizer-13.webm", "vp90-2-00-quantizer-12.webm", "vp90-2-00-quantizer-13.webm",
"vp90-00-quantizer-14.webm", "vp90-00-quantizer-15.webm", "vp90-2-00-quantizer-14.webm", "vp90-2-00-quantizer-15.webm",
"vp90-00-quantizer-16.webm", "vp90-00-quantizer-17.webm", "vp90-2-00-quantizer-16.webm", "vp90-2-00-quantizer-17.webm",
"vp90-00-quantizer-18.webm", "vp90-00-quantizer-19.webm", "vp90-2-00-quantizer-18.webm", "vp90-2-00-quantizer-19.webm",
"vp90-00-quantizer-20.webm", "vp90-00-quantizer-21.webm", "vp90-2-00-quantizer-20.webm", "vp90-2-00-quantizer-21.webm",
"vp90-00-quantizer-22.webm", "vp90-00-quantizer-23.webm", "vp90-2-00-quantizer-22.webm", "vp90-2-00-quantizer-23.webm",
"vp90-00-quantizer-24.webm", "vp90-00-quantizer-25.webm", "vp90-2-00-quantizer-24.webm", "vp90-2-00-quantizer-25.webm",
"vp90-00-quantizer-26.webm", "vp90-00-quantizer-27.webm", "vp90-2-00-quantizer-26.webm", "vp90-2-00-quantizer-27.webm",
"vp90-00-quantizer-28.webm", "vp90-00-quantizer-29.webm", "vp90-2-00-quantizer-28.webm", "vp90-2-00-quantizer-29.webm",
"vp90-00-quantizer-30.webm", "vp90-00-quantizer-31.webm", "vp90-2-00-quantizer-30.webm", "vp90-2-00-quantizer-31.webm",
"vp90-00-quantizer-32.webm", "vp90-00-quantizer-33.webm", "vp90-2-00-quantizer-32.webm", "vp90-2-00-quantizer-33.webm",
"vp90-00-quantizer-34.webm", "vp90-00-quantizer-35.webm", "vp90-2-00-quantizer-34.webm", "vp90-2-00-quantizer-35.webm",
"vp90-00-quantizer-36.webm", "vp90-00-quantizer-37.webm", "vp90-2-00-quantizer-36.webm", "vp90-2-00-quantizer-37.webm",
"vp90-00-quantizer-38.webm", "vp90-00-quantizer-39.webm", "vp90-2-00-quantizer-38.webm", "vp90-2-00-quantizer-39.webm",
"vp90-00-quantizer-40.webm", "vp90-00-quantizer-41.webm", "vp90-2-00-quantizer-40.webm", "vp90-2-00-quantizer-41.webm",
"vp90-00-quantizer-42.webm", "vp90-00-quantizer-43.webm", "vp90-2-00-quantizer-42.webm", "vp90-2-00-quantizer-43.webm",
"vp90-00-quantizer-44.webm", "vp90-00-quantizer-45.webm", "vp90-2-00-quantizer-44.webm", "vp90-2-00-quantizer-45.webm",
"vp90-00-quantizer-46.webm", "vp90-00-quantizer-47.webm", "vp90-2-00-quantizer-46.webm", "vp90-2-00-quantizer-47.webm",
"vp90-00-quantizer-48.webm", "vp90-00-quantizer-49.webm", "vp90-2-00-quantizer-48.webm", "vp90-2-00-quantizer-49.webm",
"vp90-00-quantizer-50.webm", "vp90-00-quantizer-51.webm", "vp90-2-00-quantizer-50.webm", "vp90-2-00-quantizer-51.webm",
"vp90-00-quantizer-52.webm", "vp90-00-quantizer-53.webm", "vp90-2-00-quantizer-52.webm", "vp90-2-00-quantizer-53.webm",
"vp90-00-quantizer-54.webm", "vp90-00-quantizer-55.webm", "vp90-2-00-quantizer-54.webm", "vp90-2-00-quantizer-55.webm",
"vp90-00-quantizer-56.webm", "vp90-00-quantizer-57.webm", "vp90-2-00-quantizer-56.webm", "vp90-2-00-quantizer-57.webm",
"vp90-00-quantizer-58.webm", "vp90-00-quantizer-59.webm", "vp90-2-00-quantizer-58.webm", "vp90-2-00-quantizer-59.webm",
"vp90-00-quantizer-60.webm", "vp90-00-quantizer-61.webm", "vp90-2-00-quantizer-60.webm", "vp90-2-00-quantizer-61.webm",
"vp90-00-quantizer-62.webm", "vp90-00-quantizer-63.webm", "vp90-2-00-quantizer-62.webm", "vp90-2-00-quantizer-63.webm",
"vp90-01-sharpness-1.webm", "vp90-01-sharpness-2.webm", "vp90-2-01-sharpness-1.webm", "vp90-2-01-sharpness-2.webm",
"vp90-01-sharpness-3.webm", "vp90-01-sharpness-4.webm", "vp90-2-01-sharpness-3.webm", "vp90-2-01-sharpness-4.webm",
"vp90-01-sharpness-5.webm", "vp90-01-sharpness-6.webm", "vp90-2-01-sharpness-5.webm", "vp90-2-01-sharpness-6.webm",
"vp90-01-sharpness-7.webm", "vp90-02-1-size-08x08.webm", "vp90-2-01-sharpness-7.webm", "vp90-2-02-size-08x08.webm",
"vp90-02-1-size-08x10.webm", "vp90-02-1-size-08x16.webm", "vp90-2-02-size-08x10.webm", "vp90-2-02-size-08x16.webm",
"vp90-02-1-size-08x18.webm", "vp90-02-1-size-08x32.webm", "vp90-2-02-size-08x18.webm", "vp90-2-02-size-08x32.webm",
"vp90-02-1-size-08x34.webm", "vp90-02-1-size-08x64.webm", "vp90-2-02-size-08x34.webm", "vp90-2-02-size-08x64.webm",
"vp90-02-1-size-08x66.webm", "vp90-02-1-size-10x08.webm", "vp90-2-02-size-08x66.webm", "vp90-2-02-size-10x08.webm",
"vp90-02-1-size-10x10.webm", "vp90-02-1-size-10x16.webm", "vp90-2-02-size-10x10.webm", "vp90-2-02-size-10x16.webm",
"vp90-02-1-size-10x18.webm", "vp90-02-1-size-10x32.webm", "vp90-2-02-size-10x18.webm", "vp90-2-02-size-10x32.webm",
"vp90-02-1-size-10x34.webm", "vp90-02-1-size-10x64.webm", "vp90-2-02-size-10x34.webm", "vp90-2-02-size-10x64.webm",
"vp90-02-1-size-10x66.webm", "vp90-02-1-size-16x08.webm", "vp90-2-02-size-10x66.webm", "vp90-2-02-size-16x08.webm",
"vp90-02-1-size-16x10.webm", "vp90-02-1-size-16x16.webm", "vp90-2-02-size-16x10.webm", "vp90-2-02-size-16x16.webm",
"vp90-02-1-size-16x18.webm", "vp90-02-1-size-16x32.webm", "vp90-2-02-size-16x18.webm", "vp90-2-02-size-16x32.webm",
"vp90-02-1-size-16x34.webm", "vp90-02-1-size-16x64.webm", "vp90-2-02-size-16x34.webm", "vp90-2-02-size-16x64.webm",
"vp90-02-1-size-16x66.webm", "vp90-02-1-size-18x08.webm", "vp90-2-02-size-16x66.webm", "vp90-2-02-size-18x08.webm",
"vp90-02-1-size-18x10.webm", "vp90-02-1-size-18x16.webm", "vp90-2-02-size-18x10.webm", "vp90-2-02-size-18x16.webm",
"vp90-02-1-size-18x18.webm", "vp90-02-1-size-18x32.webm", "vp90-2-02-size-18x18.webm", "vp90-2-02-size-18x32.webm",
"vp90-02-1-size-18x34.webm", "vp90-02-1-size-18x64.webm", "vp90-2-02-size-18x34.webm", "vp90-2-02-size-18x64.webm",
"vp90-02-1-size-18x66.webm", "vp90-02-1-size-32x08.webm", "vp90-2-02-size-18x66.webm", "vp90-2-02-size-32x08.webm",
"vp90-02-1-size-32x10.webm", "vp90-02-1-size-32x16.webm", "vp90-2-02-size-32x10.webm", "vp90-2-02-size-32x16.webm",
"vp90-02-1-size-32x18.webm", "vp90-02-1-size-32x32.webm", "vp90-2-02-size-32x18.webm", "vp90-2-02-size-32x32.webm",
"vp90-02-1-size-32x34.webm", "vp90-02-1-size-32x64.webm", "vp90-2-02-size-32x34.webm", "vp90-2-02-size-32x64.webm",
"vp90-02-1-size-32x66.webm", "vp90-02-1-size-34x08.webm", "vp90-2-02-size-32x66.webm", "vp90-2-02-size-34x08.webm",
"vp90-02-1-size-34x10.webm", "vp90-02-1-size-34x16.webm", "vp90-2-02-size-34x10.webm", "vp90-2-02-size-34x16.webm",
"vp90-02-1-size-34x18.webm", "vp90-02-1-size-34x32.webm", "vp90-2-02-size-34x18.webm", "vp90-2-02-size-34x32.webm",
"vp90-02-1-size-34x34.webm", "vp90-02-1-size-34x64.webm", "vp90-2-02-size-34x34.webm", "vp90-2-02-size-34x64.webm",
"vp90-02-1-size-34x66.webm", "vp90-02-1-size-64x08.webm", "vp90-2-02-size-34x66.webm", "vp90-2-02-size-64x08.webm",
"vp90-02-1-size-64x10.webm", "vp90-02-1-size-64x16.webm", "vp90-2-02-size-64x10.webm", "vp90-2-02-size-64x16.webm",
"vp90-02-1-size-64x18.webm", "vp90-02-1-size-64x32.webm", "vp90-2-02-size-64x18.webm", "vp90-2-02-size-64x32.webm",
"vp90-02-1-size-64x34.webm", "vp90-02-1-size-64x64.webm", "vp90-2-02-size-64x34.webm", "vp90-2-02-size-64x64.webm",
"vp90-02-1-size-64x66.webm", "vp90-02-1-size-66x08.webm", "vp90-2-02-size-64x66.webm", "vp90-2-02-size-66x08.webm",
"vp90-02-1-size-66x10.webm", "vp90-02-1-size-66x16.webm", "vp90-2-02-size-66x10.webm", "vp90-2-02-size-66x16.webm",
"vp90-02-1-size-66x18.webm", "vp90-02-1-size-66x32.webm", "vp90-2-02-size-66x18.webm", "vp90-2-02-size-66x32.webm",
"vp90-02-1-size-66x34.webm", "vp90-02-1-size-66x64.webm", "vp90-2-02-size-66x34.webm", "vp90-2-02-size-66x64.webm",
"vp90-02-1-size-66x66.webm", "vp90-2-02-size-66x66.webm", "vp90-2-03-size-196x196.webm",
"vp90-2-03-size-196x198.webm", "vp90-2-03-size-196x200.webm",
"vp90-2-03-size-196x202.webm", "vp90-2-03-size-196x208.webm",
"vp90-2-03-size-196x210.webm", "vp90-2-03-size-196x224.webm",
"vp90-2-03-size-196x226.webm", "vp90-2-03-size-198x196.webm",
"vp90-2-03-size-198x198.webm", "vp90-2-03-size-198x200.webm",
"vp90-2-03-size-198x202.webm", "vp90-2-03-size-198x208.webm",
"vp90-2-03-size-198x210.webm", "vp90-2-03-size-198x224.webm",
"vp90-2-03-size-198x226.webm", "vp90-2-03-size-200x196.webm",
"vp90-2-03-size-200x198.webm", "vp90-2-03-size-200x200.webm",
"vp90-2-03-size-200x202.webm", "vp90-2-03-size-200x208.webm",
"vp90-2-03-size-200x210.webm", "vp90-2-03-size-200x224.webm",
"vp90-2-03-size-200x226.webm", "vp90-2-03-size-202x196.webm",
"vp90-2-03-size-202x198.webm", "vp90-2-03-size-202x200.webm",
"vp90-2-03-size-202x202.webm", "vp90-2-03-size-202x208.webm",
"vp90-2-03-size-202x210.webm", "vp90-2-03-size-202x224.webm",
"vp90-2-03-size-202x226.webm", "vp90-2-03-size-208x196.webm",
"vp90-2-03-size-208x198.webm", "vp90-2-03-size-208x200.webm",
"vp90-2-03-size-208x202.webm", "vp90-2-03-size-208x208.webm",
"vp90-2-03-size-208x210.webm", "vp90-2-03-size-208x224.webm",
"vp90-2-03-size-208x226.webm", "vp90-2-03-size-210x196.webm",
"vp90-2-03-size-210x198.webm", "vp90-2-03-size-210x200.webm",
"vp90-2-03-size-210x202.webm", "vp90-2-03-size-210x208.webm",
"vp90-2-03-size-210x210.webm", "vp90-2-03-size-210x224.webm",
"vp90-2-03-size-210x226.webm", "vp90-2-03-size-224x196.webm",
"vp90-2-03-size-224x198.webm", "vp90-2-03-size-224x200.webm",
"vp90-2-03-size-224x202.webm", "vp90-2-03-size-224x208.webm",
"vp90-2-03-size-224x210.webm", "vp90-2-03-size-224x224.webm",
"vp90-2-03-size-224x226.webm", "vp90-2-03-size-226x196.webm",
"vp90-2-03-size-226x198.webm", "vp90-2-03-size-226x200.webm",
"vp90-2-03-size-226x202.webm", "vp90-2-03-size-226x208.webm",
"vp90-2-03-size-226x210.webm", "vp90-2-03-size-226x224.webm",
"vp90-2-03-size-226x226.webm"
}; };
#endif #endif
......
vp9/common/vp9_pred_common.c
+ 6
− 6
View file @ 1f14bbb6
...@@ -172,10 +172,10 @@ unsigned char vp9_get_pred_context_comp_ref_p(const VP9_COMMON *cm, ...@@ -172,10 +172,10 @@ unsigned char vp9_get_pred_context_comp_ref_p(const VP9_COMMON *cm,
left_mbmi : above_mbmi; left_mbmi : above_mbmi;
if (edge_mbmi->ref_frame[1] <= INTRA_FRAME) // single pred (1/3) if (edge_mbmi->ref_frame[1] <= INTRA_FRAME) // single pred (1/3)
pred_context = 1 + 2 * edge_mbmi->ref_frame[0] != cm->comp_var_ref[1]; pred_context = 1 + 2 * (edge_mbmi->ref_frame[0] != cm->comp_var_ref[1]);
else // comp pred (1/3) else // comp pred (1/3)
pred_context = 1 + 2 * edge_mbmi->ref_frame[var_ref_idx] pred_context = 1 + 2 * (edge_mbmi->ref_frame[var_ref_idx]
!= cm->comp_var_ref[1]; != cm->comp_var_ref[1]);
} else { // inter/inter } else { // inter/inter
int l_sg = left_mbmi->ref_frame[1] <= INTRA_FRAME; int l_sg = left_mbmi->ref_frame[1] <= INTRA_FRAME;
int a_sg = above_mbmi->ref_frame[1] <= INTRA_FRAME; int a_sg = above_mbmi->ref_frame[1] <= INTRA_FRAME;
...@@ -215,10 +215,10 @@ unsigned char vp9_get_pred_context_comp_ref_p(const VP9_COMMON *cm, ...@@ -215,10 +215,10 @@ unsigned char vp9_get_pred_context_comp_ref_p(const VP9_COMMON *cm,
if (edge_mbmi->ref_frame[0] == INTRA_FRAME) if (edge_mbmi->ref_frame[0] == INTRA_FRAME)
pred_context = 2; pred_context = 2;
else if (edge_mbmi->ref_frame[1] > INTRA_FRAME) else if (edge_mbmi->ref_frame[1] > INTRA_FRAME)
pred_context = 4 * edge_mbmi->ref_frame[var_ref_idx] pred_context = 4 * (edge_mbmi->ref_frame[var_ref_idx]
!= cm->comp_var_ref[1]; != cm->comp_var_ref[1]);
else else
pred_context = 3 * edge_mbmi->ref_frame[0] != cm->comp_var_ref[1]; pred_context = 3 * (edge_mbmi->ref_frame[0] != cm->comp_var_ref[1]);
} else { // no edges available (2) } else { // no edges available (2)
pred_context = 2; pred_context = 2;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment